diff options
Diffstat (limited to 'pkgs/tools/misc')
21 files changed, 135 insertions, 60 deletions
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 20beacf2b4f0..9a62f8c3fbf7 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.6"; + version = "1.7"; in stdenv.mkDerivation { name = "autorandr-${version}"; @@ -48,7 +48,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = "${version}"; - sha256 = "0m4lqqinr1mqf536gll7qyrnz86ca322pf99lagj00x0r8yj9liy"; + sha256 = "0wpiimc5xai813h7gywwp20svkn35pkw99bnjflmpwz7x8fn8dfz"; }; meta = { diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 3d1c7145698c..582f8d8f05f9 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -16,11 +16,11 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with lib; stdenv.mkDerivation rec { - name = "coreutils-8.29"; + name = "coreutils-8.30"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j"; + sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8"; }; patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh + sed '2i print "Skipping env -S test"; exit 0;' -i ./tests/misc/env-S.pl substituteInPlace ./tests/install/install-C.sh \ --replace 'mode3=2755' 'mode3=1755' ''; diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index 9b52d3fd3608..e33376243bd6 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -1,14 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, autoreconfHook, tzdata }: stdenv.mkDerivation rec { - version = "0.4.4"; + version = "0.4.5"; name = "dateutils-${version}"; src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz"; - sha256 = "0ky8177is4swgxfqczc78d7yjc13w626k515qw517086n7xjxk59"; + sha256 = "1pnbc186mnvmyb5rndm0ym50sjihsy6m6crz62xxsjbxggza1mhn"; }; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ tzdata ]; # needed for datezone + enableParallelBuilding = true; + + doCheck = true; + meta = with stdenv.lib; { description = "A bunch of tools that revolve around fiddling with dates and times in the command line"; homepage = http://www.fresse.org/dateutils/; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 7e98b7d64d2d..f5091ac9720a 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "duc-${version}"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "zevv"; repo = "duc"; rev = "${version}"; - sha256 = "1h7vll8a78ijan9bmnimmsviywmc39x8h9iikx8vm98kwyxi4xif"; + sha256 = "1i7ry25xzy027g6ysv6qlf09ax04q4vy0kikl8h0aq5jbxsl9q52"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix new file mode 100644 index 000000000000..86f78af25603 --- /dev/null +++ b/pkgs/tools/misc/envsubst/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "envsubst-${version}"; + version = "1.1.0"; + + goPackagePath = "github.com/a8m/envsubst"; + src = fetchFromGitHub { + owner = "a8m"; + repo = "envsubst"; + rev = "v${version}"; + sha256 = "1d6nipagjn40n6iw1p3r489l2km5xjd5db9gbh1vc5sxc617l7yk"; + }; + + meta = with lib; { + description = "Environment variables substitution for Go"; + homepage = https://github.com/a8m/envsubst; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ nicknovitski ]; + }; +} diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index d6eca100411b..d19117d4dcda 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -10,7 +10,14 @@ stdenv.mkDerivation rec { sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y"; }; - patches = [ ./memory-leak.patch ./no-install-statedir.patch ]; + patches = [ + ./memory-leak.patch + ./no-install-statedir.patch + + # Prevent tests from failing on old kernels (2.6x) + # getdtablesize reports incorrect values if getrlimit() fails + ./disable-getdtablesize-test.patch + ]; buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort diff --git a/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch b/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch new file mode 100644 index 000000000000..611df364b687 --- /dev/null +++ b/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch @@ -0,0 +1,25 @@ +diff --git a/tests/test-dup2.c b/tests/test-dup2.c +--- a/tests/test-dup2.c ++++ b/tests/test-dup2.c +@@ -157,8 +157,6 @@ main (void) + ASSERT (close (255) == 0); + ASSERT (close (256) == 0); + } +- ASSERT (dup2 (fd, bad_fd - 1) == bad_fd - 1); +- ASSERT (close (bad_fd - 1) == 0); + errno = 0; + ASSERT (dup2 (fd, bad_fd) == -1); + ASSERT (errno == EBADF); +diff --git a/tests/test-getdtablesize.c b/tests/test-getdtablesize.c +index a0325af..a83f8ec 100644 +--- a/tests/test-getdtablesize.c ++++ b/tests/test-getdtablesize.c +@@ -29,8 +29,6 @@ int + main (int argc, char *argv[]) + { + ASSERT (getdtablesize () >= 3); +- ASSERT (dup2 (0, getdtablesize() - 1) == getdtablesize () - 1); +- ASSERT (dup2 (0, getdtablesize()) == -1); + + return 0; + } diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 12c199801c71..b7ce52f49b36 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; - homepage = http://goaccess.prosoftcorp.com; + homepage = https://goaccess.io; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ ederoyd46 garbas ]; diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index d9c255d2a7a8..339c8dea4606 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform +, Security +}: rustPlatform.buildRustPackage rec { name = "hyperfine-${version}"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "hyperfine"; rev = "refs/tags/v${version}"; - sha256 = "13h43sjp059yq3bmdbb9i1082fkx5yzmhrkf5kpkxhnyn67xbdsg"; + sha256 = "06kghk3gmi47c8g28n8srpb578yym104fa30s4m33ajb60fvwlld"; }; - cargoSha256 = "0saf0hl21ba2ckqbsw64908nvs0x1rjrnm73ackzpmv5pi9j567s"; + cargoSha256 = "1rwh8kyrkk5jza4lx7sf1pln68ljwsv4ccyfvzcvc140y7ya8ps0"; + + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { description = "Command-line benchmarking tool"; diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 4d7c27a39445..85e4ecd3229b 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tstack"; repo = "lnav"; rev = "v${meta.version}"; - sha256 = "0hq9ri6a18z682gihxlbh1rndka0v6brkdqsyfsgh4c2fgib4fb7"; + sha256 = "0wzzny0sgrq1ga9qw9nr8ly4j3vy4agszma73902dsw2rwf17j6y"; inherit name; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.3"; + version = "0.8.4"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 7af5e12081b6..11a9cd4ff87a 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0jjs7fpvdjjb5v0j39a6k7hq9h5ap3db1j7vg1r2dq4swk23h9bm"; }; - nativeBuildInputs = [ makeWrapper perl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl procps ]; postInstall = '' wrapProgram $out/bin/parallel \ - --prefix PATH : "${procps}/bin" \ - --prefix PATH : "${perl}/bin" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ procps perl ]}" ''; doCheck = true; diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index b4cfe7b26c0e..74d24db574ff 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "phraseapp-client-${version}"; - version = "1.6.0"; + version = "1.11.0"; goPackagePath = "github.com/phrase/phraseapp-client"; subPackages = [ "." ]; @@ -11,9 +11,13 @@ buildGoPackage rec { owner = "phrase"; repo = "phraseapp-client"; rev = version; - sha256 = "0rgwl0rgkci045hg36s0q8jwkni1hzapqpi0mc0gk3rl7nagw622"; + sha256 = "0lfx0wv95hgczi74qnkw2cripwgvl53z2gi5i6nyflisy4r7vvkr"; }; + postInstall = '' + ln -s $bin/bin/phraseapp-client $bin/bin/phraseapp + ''; + meta = with stdenv.lib; { homepage = http://docs.phraseapp.com; description = "PhraseApp API v2 Command Line Client"; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 08df665aede6..b3ceb41191de 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchurl, jre, graphviz }: +{ stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2018.10"; + version = "1.2018.11"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "19s3zrfri388nfykcs67sfk0dhmiw0rcv0dvj1j4c0fkyhl41bjs"; + sha256 = "006bpxz6zsjypxscxbnz3b7icg47bfwcq1v7rvijflchw12hq9nm"; }; - # It's only a .jar file and a shell wrapper - phases = [ "installPhase" ]; + nativeBuildInputs = [ makeWrapper ]; - installPhase = '' - mkdir -p "$out/bin" - mkdir -p "$out/lib" + buildCommand = '' + install -Dm644 $src $out/lib/plantuml.jar - cp "$src" "$out/lib/plantuml.jar" + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/plantuml \ + --argv0 plantuml \ + --set GRAPHVIZ_DOT ${graphviz}/bin/dot \ + --add-flags "-jar $out/lib/plantuml.jar" - cat > "$out/bin/plantuml" << EOF - #!${stdenv.shell} - export GRAPHVIZ_DOT="${graphviz}/bin/dot" - exec "${jre}/bin/java" -jar "$out/lib/plantuml.jar" "\$@" - EOF - chmod a+x "$out/bin/plantuml" + $out/bin/plantuml -help ''; meta = with stdenv.lib; { description = "Draw UML diagrams using a simple and human readable text description"; homepage = http://plantuml.sourceforge.net/; - # "java -jar plantuml.jar -license" says GPLv3 or later + # "plantuml -license" says GPLv3 or later license = licenses.gpl3Plus; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index c1b99b315677..cfc13b0e108e 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,15 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, utillinux}: stdenv.mkDerivation rec { - version = "5.53"; + version = "6.33"; name = "profile-sync-daemon-${version}"; src = fetchurl { url = "http://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "0m7h9l7dndqgb5k3grpc00f6dpg73p6h4q5sgkf8bvyzvcbdafwx"; + sha256 = "0dzs51xbszzmcg82n2dil6nljj4gn0aw9rqjmhyi4a5frc8g6xmb"; }; - installPhase = "PREFIX=\"\" DESTDIR=$out make install-systemd-all"; + installPhase = '' + PREFIX=\"\" DESTDIR=$out make install + substituteInPlace $out/bin/profile-sync-daemon \ + --replace "/usr/" "$out/" \ + --replace "sudo " "/run/wrappers/bin/sudo " + # $HOME detection fails (and is unnecessary) + sed -i '/^HOME/d' $out/bin/profile-sync-daemon + substituteInPlace $out/bin/psd-overlay-helper \ + --replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin" + ''; preferLocalBuild = true; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 21d81507dee0..60851b467ed1 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pspg-${version}"; - version = "1.4.2"; + version = "1.6.2"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = "${version}"; - sha256 = "0hmx9p5pbydnf8sil4vqpmly5mq2rvcj8a33s9fvfisnxxsqz73v"; + sha256 = "0gg94isnmng1qigghc2lrk4mvim20clbfhacwlxnd237ypv4mn2s"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index 72ea7f2ea0b0..484bb765c0db 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "recoverjpeg-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "https://www.rfc1149.net/download/recoverjpeg/${name}.tar.gz"; - sha256 = "01vayn2b3mqmyqz2ka2j3k4a93bjdvkhv5ry9207v04r83r7iwfp"; + sha256 = "009jgxi8lvdp00dwfj0n4x5yqrf64x00xdkpxpwgl2v8wcqn56fv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index dd0fb4de702e..fe31d324087c 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.4.0"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "1ghi6w0cfgs94zlz304q37h3lga2jalfm0hqi3g2060zfdnb96n7"; + sha256 = "087icp1n1qdf53f1314g5biz16sigrnpqr835xqlr6vj85imm2dm"; }; postPatch = '' diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 411e0324457a..70f304134d90 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" }: rustPlatform.buildRustPackage { - name = "uutils-coreutils-2018-02-09"; + name = "uutils-coreutils-2018-09-30"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; - rev = "f333ab26b03294a32a10c1c203a03c6b5cf8a89a"; - sha256 = "0nkggs5nqvc1mxzzgcsqm1ahchh4ll11xh0xqmcljrr5yg1rhhzf"; + rev = "a161b7e803aef08455ae0547dccd9210e38a4574"; + sha256 = "19j40cma7rz6yf5j6nyid8qslbcmrnxdk6by53hflal2qx3g555z"; }; # too many impure/platform-dependent tests doCheck = false; - cargoSha256 = "0qv2wz1bxhm5xhzbic7cqmn8jj8fyap0s18ylia4fbwpmv89nkc5"; + cargoSha256 = "1a9k7i4829plkxgsflmpji3mrw2i1vln6jsnhxmkl14h554yi5j4"; makeFlags = [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage { homepage = https://github.com/uutils/coreutils; maintainers = with maintainers; [ ma27 ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index e75baac669a3..0f0455fe0fe3 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.2"; + version = "3.2.9"; name = "woeusb-${version}"; src = fetchFromGitHub { owner = "slacka"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "08spc7r5zgn483y7jmnlqi5417p6h1v6izyx10jnk39md6lv8pb3"; + sha256 = "1h2msp45slcd2s5jgw7ma9r7pl7schrvifw3kp53skxfpyax4j35"; }; buildInputs = [ wxGTK30 autoreconfHook makeWrapper ]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7e79614c04ca..9de0f850d49b 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.09.18"; + version = "2018.10.05"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0mlsdmddmyy3xaqy366k48xds14g17l81al3kglndjkbrrji63sb"; + sha256 = "1iq02kwxdgh07bf0w0fvbsjbdshs4kja35gy8m70ji9cj10l1mbw"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index d0b7ebf3fc83..ab9eb5d001b2 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-1.6.1"; + name = "yubico-piv-tool-1.6.2"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "10xgdc51xvszkxmsvqnbjs8ixxz7rfnfahh3wn8glllynmszbhwi"; + sha256 = "06r3vxgj7qrk8si7khjy696sm45h3w9d0rrrj0hyswalqzavqqga"; }; nativeBuildInputs = [ pkgconfig ]; |