diff options
Diffstat (limited to 'pkgs/tools')
33 files changed, 282 insertions, 124 deletions
diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 5cbf3cf3a8f..1d4786bd6ec 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xsecurelock-${version}"; - version = "1.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "google"; repo = "xsecurelock"; rev = "v${version}"; - sha256 = "1vaw2m3yyfazj1x7xdwppmm0ch075q399g5vzrmhhrkzdrs53r1x"; + sha256 = "17666b0ah5pfspxbfx9cw3lfmzx6b47r54bacwzzhfq6wbw6ci6k"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index ba07f75bb36..3ac9e3c0e94 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bubblewrap-${version}"; - version = "0.3.1"; + version = "0.3.3"; src = fetchurl { url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz"; - sha256 = "1y2bdlxnlr84xcbf31lzirc292c5ak9bd2wvcvh4ppsliih6pjny"; + sha256 = "1zsd6rxryg97dkkhibr0fvq16x3s75qj84rvhdv8p42ag58mz966"; }; nativeBuildInputs = [ libcap libxslt docbook_xsl ]; diff --git a/pkgs/tools/admin/oxidized/Gemfile b/pkgs/tools/admin/oxidized/Gemfile index 4ff04d4829c..bddfe1adee5 100644 --- a/pkgs/tools/admin/oxidized/Gemfile +++ b/pkgs/tools/admin/oxidized/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'oxidized', '0.26.2' +gem 'oxidized', '0.26.3' gem 'oxidized-web', '0.13.1' gem 'oxidized-script', '0.6.0' diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/tools/admin/oxidized/Gemfile.lock index 9946b35057d..89129ccb25f 100644 --- a/pkgs/tools/admin/oxidized/Gemfile.lock +++ b/pkgs/tools/admin/oxidized/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: asetus (0.3.0) - backports (3.12.0) + backports (3.14.0) charlock_holmes (0.7.6) emk-sinatra-url-for (0.2.1) sinatra (>= 0.9.1.1) @@ -13,9 +13,9 @@ GEM htmlentities (4.3.4) json (2.2.0) multi_json (1.13.1) - net-ssh (5.1.0) + net-ssh (5.2.0) net-telnet (0.1.1) - oxidized (0.26.2) + oxidized (0.26.3) asetus (~> 0.1) net-ssh (~> 5) net-telnet (~> 0.1.1) @@ -45,8 +45,8 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - rugged (0.28.0) - sass (3.7.3) + rugged (0.28.1) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -70,7 +70,7 @@ PLATFORMS ruby DEPENDENCIES - oxidized (= 0.26.2) + oxidized (= 0.26.3) oxidized-script (= 0.6.0) oxidized-web (= 0.13.1) diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/tools/admin/oxidized/gemset.nix index ba1a21c4a38..de7714aced8 100644 --- a/pkgs/tools/admin/oxidized/gemset.nix +++ b/pkgs/tools/admin/oxidized/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ba6n9l4kki56s2cszarps14zp2wlhw7nfawb8qwsxy3a57v4mw4"; + sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn"; type = "gem"; }; - version = "3.12.0"; + version = "3.14.0"; }; charlock_holmes = { groups = ["default"]; @@ -96,10 +96,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jglf8rxvlw6is5019r6kwsdhw38zm3z39jbghdbj449r6h7h77n"; + sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; net-telnet = { groups = ["default"]; @@ -117,10 +117,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "130h99wijfvv443wgdllxvlq880m0m31rxvrszq5wdii7ad977s5"; + sha256 = "07hpxmdjkfpkc00ln3hhh5qkj0lyhcmgbi0jza2c8cnjyy9sc73x"; type = "gem"; }; - version = "0.26.2"; + version = "0.26.3"; }; oxidized-script = { dependencies = ["oxidized" "slop"]; @@ -212,10 +212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; + sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6"; type = "gem"; }; - version = "0.28.0"; + version = "0.28.1"; }; sass = { dependencies = ["sass-listen"]; @@ -223,10 +223,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vll3bm1dllhqjxxj639nj3afsp12hlppgpysxrgcg24jb2xl2qn"; + sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; type = "gem"; }; - version = "3.7.3"; + version = "3.7.4"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 309604999ba..48b3a91b971 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -19,10 +19,7 @@ stdenv.mkDerivation rec { CPPFLAGS = with stdenv; "" + (lib.optionalString (!isi686 && !isx86_64) "-DNOJIT ") + "-Dunix"; - CXXFLAGS = with stdenv; "" - + (lib.optionalString isi686 "-march=i686 -mtune=generic ") - + (lib.optionalString isx86_64 "-march=nocona -mtune=generic ") - + "-O3 -DNDEBUG"; + CXXFLAGS = "-O3 -DNDEBUG"; in '' buildFlagsArray=( "CPPFLAGS=${CPPFLAGS}" "CXXFLAGS=${CXXFLAGS}" ) ''; diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 344f0889090..611654331c3 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -11,10 +11,8 @@ let sha256="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk"; }; - compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-mtune=generic" "-DNDEBUG" ] + compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ] ++ stdenv.lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread" - ++ stdenv.lib.optional (stdenv.hostPlatform.isi686) "-march=i686" - ++ stdenv.lib.optional (stdenv.hostPlatform.isx86_64) "-march=nocona" ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT"); in stdenv.mkDerivation { diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 05d8a717776..e2a9944bd48 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: stdenv.mkDerivation rec { - name = "bacula-9.4.2"; + name = "bacula-9.4.3"; src = fetchurl { url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "1878jk541b8gvqbh15f0k3bvki1mx02q8mxnxhn9fdc1qk9083d4"; + sha256 = "07ablpfc4q7yr6hmff21dssqpg8gvvq2xfnfs9s3danwc321rd2g"; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index b5accb3b82b..e14a62c8114 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "duplicity-${version}"; - version = "0.7.18.2"; + version = "0.7.19"; src = fetchurl { url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz"; - sha256 = "0j37dgyji36hvb5dbzlmh5rj83jwhni02yq16g6rd3hj8f7qhdn2"; + sha256 = "0ag9dknslxlasslwfjhqgcqbkb1mvzzx93ry7lch2lfzcdd91am6"; }; buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 7209afd8e7e..2947c5fc1b4 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,14 +1,14 @@ { stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { - version = "2.1.11"; + version = "2.1.15"; name = "grab-site-${version}"; src = fetchFromGitHub { rev = "${version}"; - owner = "ludios"; + owner = "ArchiveTeam"; repo = "grab-site"; - sha256 = "0w24ngr2b7nipqiwkxpql2467b5aq2vbknkb0sry6a457kb5ppsl"; + sha256 = "1h3ajsj1c2wlxji1san97vmjd9d97dv0rh0jw1p77irkcvhzfpj8"; }; propagatedBuildInputs = with python3Packages; [ @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Crawler for web archiving with WARC output"; - homepage = https://github.com/ludios/grab-site; + homepage = https://github.com/ArchiveTeam/grab-site; license = licenses.mit; maintainers = with maintainers; [ ivan ]; platforms = platforms.all; diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix new file mode 100644 index 00000000000..1d554b1faf6 --- /dev/null +++ b/pkgs/tools/graphics/viu/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "viu"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "atanunq"; + repo = "viu"; + rev = "v${version}"; + sha256 = "1j2sr8mhnbyzm168spzr4mk8gkjlfqh993b80sf2zv2sy83p8gfv"; + }; + + cargoSha256 = "14pf2xvkk9qqq9qj5agxmfl3npgy6my961yfzv7p977712kdakh3"; + + meta = with lib; { + description = "A command-line application to view images from the terminal written in Rust"; + homepage = "https://github.com/atanunq/viu"; + license = licenses.mit; + maintainers = with maintainers; [ petabyteboy ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 903b5b13f84..38041f0b32d 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cloc-${version}"; - version = "1.80"; + version = "1.82"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; - rev = "v${version}"; - sha256 = "0zmkjpv4dbdr29x95j4i585wz4rxwlrkp6ldfr5wiw83h90n0ilp"; + rev = version; + sha256 = "0fsz07z0slfg58512fmnlj8pnxkc360bgf7fclg60v9clvcjbjsw"; }; setSourceRoot = '' diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix new file mode 100644 index 00000000000..c839c1f5e6c --- /dev/null +++ b/pkgs/tools/misc/memtest86-efi/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, fetchurl, unzip, utillinux, libguestfs-with-appliance }: + +stdenv.mkDerivation rec { + pname = "memtest86-efi"; + version = "8.0"; + + src = fetchurl { + # TODO: The latest version of memtest86 is actually 8.1, but apparently the + # company has stopped distributing versioned binaries of memtest86: + # https://www.passmark.com/forum/memtest86/44494-version-8-1-distribution-file-is-not-versioned?p=44505#post44505 + # However, it does look like redistribution is okay, so if we had + # somewhere to host binaries that we make sure to version, then we could + # probably keep up with the latest versions released by the company. + url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip"; + sha256 = "147mnd7fnx2wvbzscw7pkg9ljiczhz05nb0cjpmww49a0ms4yknw"; + }; + + nativeBuildInputs = [ libguestfs-with-appliance unzip ]; + + unpackPhase = '' + unzip -q $src -d . + ''; + + installPhase = '' + mkdir -p $out + + # memtest86 is distributed as a bootable USB image. It contains the actual + # memtest86 EFI app. + # + # The following command uses libguestfs to extract the actual EFI app from the + # usb image so that it can be installed directly on the hard drive. This creates + # the ./BOOT/ directory with the memtest86 EFI app. + guestfish --ro --add ./memtest86-usb.img --mount /dev/sda1:/ copy-out /EFI/BOOT . + + cp -r BOOT/* $out/ + ''; + + meta = with lib; { + homepage = http://memtest86.com/; + downloadPage = "https://www.memtest86.com/download.htm"; + description = "A tool to detect memory errors, to be run from a bootloader"; + longDescription = '' + A UEFI app that is able to detect errors in RAM. It can be run from a + bootloader. Released under a proprietary freeware license. + ''; + # The Memtest86 License for the Free Edition states, + # "MemTest86 Free Edition is free to download with no restrictions on usage". + # However the source code for Memtest86 does not appear to be available. + # + # https://www.memtest86.com/license.htm + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ cdepillabout ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 435a5850920..195a31b63e5 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -1,15 +1,20 @@ { stdenv, fetchFromGitHub , qmake, qtbase, pkgconfig, taglib, libbass, libbass_fx }: +# TODO: get rid of (unfree) libbass +# issue:https://github.com/UltraStar-Deluxe/UltraStar-Creator/issues/3 +# there’s a WIP branch here: +# https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed + stdenv.mkDerivation rec { name = "ultrastar-creator-${version}"; - version = "2017-04-12"; + version = "2019-04-23"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "UltraStar-Creator"; - rev = "ac519a003f8283bfbe5e2d8e9cdff3a3faf97001"; - sha256 = "00idr8a178gvmylq722n13bli59kpxlsy5d8hlplqn7fih48mnzi"; + rev = "36583b4e482b68f6aa949e77ef2744776aa587b1"; + sha256 = "1rzz04l7s7pxj74xam0cxlq569lfpgig35kpbsplq531d4007pc9"; }; postPatch = with stdenv.lib; '' diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index d9739f7846b..3ab404d0207 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -2,9 +2,9 @@ , qtbase, qtmultimedia, taglib, libmediainfo, libzen, libbass }: let - version = "2017-05-24"; - rev = "eed5dc41c849ab29b2dee37d97852fffdb45e390"; - sha256 = "1ymdgaffazndg9vhh47qqjr5873ld7j066hycp670r08bm519ysg"; + version = "2019-04-23"; + rev = "ef4524e2239ddbb60f26e05bfba1f4f28cb7b54f"; + sha256 = "0dl2qp686vbs160b3i9qypb7sv37phy2wn21kgzljbk3wnci3yv4"; buildInputs = [ qtbase qtmultimedia taglib libmediainfo libzen libbass ]; plugins = [ diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index c5054382507..12a97a2e8e4 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -3,14 +3,14 @@ , wxGTK30 }: stdenv.mkDerivation rec { - version = "3.2.12"; + version = "3.3.0"; name = "woeusb-${version}"; src = fetchFromGitHub { owner = "slacka"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "14arz0g95favbl5vsngxm3xznva223x67a9as5n2mpf5bbkd9zx5"; + sha256 = "1w3m3qbjn0igydsbpf22w29lzf1pkxv7dlny5mbyrb6j0q6wlx0b"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index b0102a557c2..65d4d368b10 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix - name = "dhcpcd-7.2.1"; + name = "dhcpcd-7.2.2"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "1s2gli943v9vblp553h76xd8y0hmfps3fj0k75kibhk3ymrjcw97"; + sha256 = "17m0ig9n4p6m98j8wp4dwnl2cfg2rg3v6vqpsahls9x9rccgzdrx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/hue-cli/Gemfile.lock b/pkgs/tools/networking/hue-cli/Gemfile.lock index 3b1f6570700..8109cd96ac2 100644 --- a/pkgs/tools/networking/hue-cli/Gemfile.lock +++ b/pkgs/tools/networking/hue-cli/Gemfile.lock @@ -6,7 +6,7 @@ GEM json hue-lib (0.7.4) json - json (2.1.0) + json (2.2.0) PLATFORMS ruby @@ -15,4 +15,4 @@ DEPENDENCIES hue-cli BUNDLED WITH - 1.15.1 + 1.17.2 diff --git a/pkgs/tools/networking/hue-cli/default.nix b/pkgs/tools/networking/hue-cli/default.nix index 4f8d1039e5e..ae51bb69bda 100644 --- a/pkgs/tools/networking/hue-cli/default.nix +++ b/pkgs/tools/networking/hue-cli/default.nix @@ -1,10 +1,15 @@ -{ bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv rec { - name = "hue-cli-${version}"; - - version = (import gemset).hue-cli.version; - inherit ruby; +bundlerApp { + pname = "hue-cli"; gemdir = ./.; - gemset = ./gemset.nix; + exes = [ "hue" ]; + + meta = with lib; { + description = "Command line interface for controlling Philips Hue system's lights and bridge"; + homepage = https://github.com/birkirb/hue-cli; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ manveru ]; + }; } diff --git a/pkgs/tools/networking/hue-cli/gemset.nix b/pkgs/tools/networking/hue-cli/gemset.nix index d1af93ff154..69d12f25a80 100644 --- a/pkgs/tools/networking/hue-cli/gemset.nix +++ b/pkgs/tools/networking/hue-cli/gemset.nix @@ -1,6 +1,8 @@ { hue-cli = { dependencies = ["hue-lib" "json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10gjf59pamfy2m17fs271d9ffrg1194b1m6vxzn6p7smzry52h9z"; @@ -10,6 +12,8 @@ }; hue-lib = { dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pyl8g8gisdhl79gbzvnddqrsbq0lmflzg7n6yi6xrp5b5290shz"; @@ -18,11 +22,13 @@ version = "0.7.4"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; } \ No newline at end of file diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 6e13d7fb94c..acc6893d0cd 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { version = "9.3.1"; nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = (with python2Packages; [ + pythonPath = (with python2Packages; [ requests ]) ++ [ gettext ]; diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 2b5669e3f31..af7c4401dae 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "nzbget-${version}"; - version = "20.0"; + version = "21.0"; src = fetchurl { url = "https://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; - sha256 = "0vyhmjg3ipjlv41il6kklys3m6rhqifdkv25a7ak772l6ba3dp04"; + sha256 = "0lwd0pfrs4a5ms193hgz2qiyf7grrc925dw6y0nfc0gkp27db9b5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index 367405f552f..43e261b106b 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "1hichipf02yz9n2n1fnky5rm9wxwcd04xlr0y05y78ixw8xb5ah0"; + sha256 = "19x0wbb8annmzi67r79112j9kjzz99n3qd6adh80iqx2dh47pk5g"; }; makeWrapperArgs = [ diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index 39c0c02890b..44282d5f964 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -1,27 +1,22 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "aws-iam-authenticator-${version}"; - # This is meant to be a stable release, but since the rename from - # heptio, there has been no release. Please pin this to an actual - # release once that happens. - version = "2018-07-29"; - rev = "01dd27d77ec1e2ec640a010970f00b2f8074b0b5"; + pname = "aws-iam-authenticator"; + version = "0.4.0"; goPackagePath = "github.com/kubernetes-sigs/aws-iam-authenticator"; - src = fetchgit { - inherit rev; - url = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; - sha256 = "1n7khd2qvl527x3ac6f89smf12za92g08d9v2j393i7n9l1rgw38"; + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = pname; + rev = "v${version}"; + sha256 = "1ghl2vms9wmvczdl2raqhy0gffxmk24h158gjb5mlw7rggzvb7bg"; }; - meta = { + meta = with stdenv.lib; { homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; description = "AWS IAM credentials for Kubernetes authentication"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.srhb ]; + license = licenses.asl20; + maintainers = [ maintainers.srhb ]; }; } diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/pkgs/tools/security/phrasendrescher/default.nix index 294e296ba6e..93dc75c1f32 100644 --- a/pkgs/tools/security/phrasendrescher/default.nix +++ b/pkgs/tools/security/phrasendrescher/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl, openssl, libssh2, gpgme }: stdenv.mkDerivation rec { - name = "phrasendrescher-${version}"; - version = "1.0"; + pname = "phrasendrescher"; + version = "1.2.2c"; src = fetchurl { - url = "http://leidecker.info/projects/phrasendrescher/${name}.tar.gz"; - sha256 = "1r0j7ms3i324p6if9cg8i0q900zqfjpvfr8pwj181x8ascysbbf2"; + url = "http://leidecker.info/projects/${pname}/${pname}-${version}.tar.gz"; + sha256 = "18vg6h294219v14x5zqm8ddmq5amxlbz7pw81lcmpz8v678kwyph"; }; - buildInputs = [ openssl ]; + postPatch = '' + substituteInPlace configure \ + --replace 'SSL_LIB="ssl"' 'SSL_LIB="crypto"' + ''; + + buildInputs = [ openssl libssh2 gpgme ]; + + configureFlags = "--with-plugins"; meta = with stdenv.lib; { - description = "Cracking tool that finds passphrases of SSH keys"; - homepage = http://leidecker.info/projects/phrasendrescher.shtml; + description = "A modular and multi processing pass phrase cracking tool"; + homepage = "http://leidecker.info/projects/phrasendrescher/index.shtml"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/tools/security/wpscan/Gemfile b/pkgs/tools/security/wpscan/Gemfile index 3b5e4282ab5..5d76cd24f3e 100644 --- a/pkgs/tools/security/wpscan/Gemfile +++ b/pkgs/tools/security/wpscan/Gemfile @@ -1,2 +1,2 @@ source 'https://rubygems.org' -gem 'wpscan', '= 3.4.3' +gem 'wpscan' diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock index 877e3f4b53b..bf03aba1418 100644 --- a/pkgs/tools/security/wpscan/Gemfile.lock +++ b/pkgs/tools/security/wpscan/Gemfile.lock @@ -1,34 +1,34 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.2) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) - cms_scanner (0.0.41.3) + cms_scanner (0.5.1) nokogiri (~> 1.10.0) - opt_parse_validator (~> 0.0.16.6) + opt_parse_validator (~> 1.7.2) public_suffix (~> 3.0.0) ruby-progressbar (~> 1.10.0) typhoeus (~> 1.3.0) xmlrpc (~> 0.3) yajl-ruby (~> 1.4.1) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) ethon (0.12.0) ffi (>= 1.3.0) ffi (1.10.0) - i18n (1.5.2) + i18n (1.6.0) concurrent-ruby (~> 1.0) mini_portile2 (2.4.0) minitest (5.11.3) - nokogiri (1.10.1) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) - opt_parse_validator (0.0.16.6) + opt_parse_validator (1.7.2) activesupport (>= 4.2, < 5.3.0) - addressable (~> 2.5.0) + addressable (>= 2.5, < 2.7) public_suffix (3.0.3) ruby-progressbar (1.10.0) thread_safe (0.3.6) @@ -36,8 +36,8 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - wpscan (3.4.3) - cms_scanner (~> 0.0.41.2) + wpscan (3.5.3) + cms_scanner (~> 0.5.0) xmlrpc (0.3.0) yajl-ruby (1.4.1) @@ -45,7 +45,7 @@ PLATFORMS ruby DEPENDENCIES - wpscan (= 3.4.3) + wpscan BUNDLED WITH - 1.16.3 + 1.17.2 diff --git a/pkgs/tools/security/wpscan/default.nix b/pkgs/tools/security/wpscan/default.nix index 9049318c249..85455325f69 100644 --- a/pkgs/tools/security/wpscan/default.nix +++ b/pkgs/tools/security/wpscan/default.nix @@ -15,7 +15,7 @@ bundlerApp { description = "Black box WordPress vulnerability scanner"; homepage = https://wpscan.org/; license = licenses.unfreeRedistributable; - maintainers = [ maintainers.nyanloutre ]; + maintainers = with maintainers; [ nyanloutre manveru ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/wpscan/gemset.nix b/pkgs/tools/security/wpscan/gemset.nix index 6377f05607f..c0ad80bd99b 100644 --- a/pkgs/tools/security/wpscan/gemset.nix +++ b/pkgs/tools/security/wpscan/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz"; + sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; }; cms_scanner = { dependencies = ["nokogiri" "opt_parse_validator" "public_suffix" "ruby-progressbar" "typhoeus" "xmlrpc" "yajl-ruby"]; @@ -27,20 +27,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m09dlyd4c51nd81dp09nddjpp81n1y0k8g36jf4d78nlgsc83s6"; + sha256 = "03hvvqq0s35a6l7lx9zpagv0gcdzhw7jvhzssiaiy6y81cx4z9pn"; type = "gem"; }; - version = "0.0.41.3"; + version = "0.5.1"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.1.4"; + version = "1.1.5"; }; ethon = { dependencies = ["ffi"]; @@ -69,10 +69,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "088xnnpi7hq243n44fmgqvjr0m86ivk8r87k9b3ddq3b7nl6nyf9"; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; }; mini_portile2 = { groups = ["default"]; @@ -100,10 +100,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; + sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; type = "gem"; }; - version = "1.10.1"; + version = "1.10.3"; }; opt_parse_validator = { dependencies = ["activesupport" "addressable"]; @@ -111,10 +111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "127qxgf6kvv4fnnn5bxx8ivfknjf3ydz3vkxrxj26mva4ijwnkl4"; + sha256 = "14zp0260x652pf75maq9ydvqsqgv8ji9w85gjk8f0vwjykf1151n"; type = "gem"; }; - version = "0.0.16.6"; + version = "1.7.2"; }; public_suffix = { groups = ["default"]; @@ -174,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13wmgmkh7n2jkgf46q9755nsvj34fag1gnns7rlbynkk1277ng6x"; + sha256 = "0j4v24iwy35q7qy3l8zr5r8mjn7nc7ahdiq13dpgjwrprvrw1jk2"; type = "gem"; }; - version = "3.4.3"; + version = "3.5.3"; }; xmlrpc = { groups = ["default"]; diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix new file mode 100644 index 00000000000..697fc77d090 --- /dev/null +++ b/pkgs/tools/system/jump/default.nix @@ -0,0 +1,40 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "jump"; + version = "0.23.0"; + + src = fetchFromGitHub { + owner = "gsamokovarov"; + repo = pname; + rev = "v${version}"; + sha256 = "1acpvg3adcjnxnz9vx7q99cvnkkvkxfdjkbh2rb6iwakx7ksaakv"; + }; + + modSha256 = "1fzsm85c31vkdw80kijxmjhk8jyhjz8b21npgks2qrnizhm6iaf8"; + + outputs = [ "out" "man"]; + postInstall = '' + install -D --mode=444 man/j.1 man/jump.1 -t $man/man/man1/ + + # generate completion scripts for jump + export HOME="$NIX_BUILD_TOP" + mkdir -p $out/share/{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + $out/bin/jump shell bash > "$out/share/bash-completion/completions/jump" + $out/bin/jump shell fish > $out/share/fish/vendor_completions.d/jump.fish + $out/bin/jump shell zsh > $out/share/zsh/site-functions/_jump + ''; + + meta = with lib; { + description = "Jump helps you navigate faster by learning your habits."; + longDescription = '' + Jump integrates with the shell and learns about your + navigational habits by keeping track of the directories you visit. It + strives to give you the best directory for the shortest search term. + ''; + homepage = https://github.com/gsamokovarov/jump; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ sondr3 ]; + }; +} diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix new file mode 100644 index 00000000000..c8f380739a6 --- /dev/null +++ b/pkgs/tools/text/amber/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "amber"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = pname; + rev = "v${version}"; + sha256 = "0jwrkd6qhxj2mqsfmhk687k15f7gf36gjyxnynj0yh8db2db6mjc"; + }; + + cargoSha256 = "0iv8zvglwaihcc89dk9kkhchbj1g3v8wq8jcbrgcbclcsyymmplc"; + + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + + meta = with stdenv.lib; { + description = "A code search-and-replace tool"; + homepage = https://github.com/dalance/amber; + license = with licenses; [ mit ]; + maintainers = [ maintainers.bdesham ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index 20f1bc845cd..69924bb234b 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gtranslator"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dqigah7x6h3afw5jcs3lw3h9y0acj72arcgxr89l6galvknr2xa"; + sha256 = "1nmlj41wm02lbgrxdlpqpcgdab5cxsvggvqnk43v6kk86q27pcz1"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 9988bcc3585..d98064df5aa 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "amazon-ecs-cli-${version}"; - version = "1.13.1"; + version = "1.14.0"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "0wiq32szmy2vk7yjjrcfisl9wrydcyiw986vhk0haidxkgw0gkv0"; + sha256 = "1m0vj98sy06bx8wryy9zgsl8pm1zwmlwhi52mzd00fqdfq0haggl"; }; unpackPhase = ":"; |