diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/dust/default.nix | 16 | ||||
-rw-r--r-- | pkgs/tools/misc/fluent-bit/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/kepubify/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/lorri/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/miniserve/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/peruse/default.nix | 60 | ||||
-rw-r--r-- | pkgs/tools/misc/phoronix-test-suite/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/plantuml/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/starship/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/tensorman/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/wakatime/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/wob/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/misc/yad/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 7 |
15 files changed, 77 insertions, 68 deletions
diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index c0aa9180aedb..7fa9ac9c9712 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -2,25 +2,27 @@ rustPlatform.buildRustPackage rec { pname = "dust"; - version = "0.4.4"; + version = "0.5.1"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "1qbh9vgdh0xmh4c78fm0rd1sgb01n656p3cr4my7ymsy81ypx9y7"; + sha256 = "1l5fh7yl8mbgahvzfa251cyp8j5awqdl66jblz565b1wb536kig7"; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + extraPostFetch = '' + rm -rf $out/src/test_dir3/ + ''; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "07ynz6y1z3rz84662d4rfl2sw1sx46a3k48z8dckr0b3fqs2zj6a"; + cargoSha256 = "1sjzcawyg1xsi4xrx2zwnj8yavzph8k1wgxsffgp55wghzypafwl"; doCheck = false; meta = with stdenv.lib; { description = "du + rust = dust. Like du but more intuitive"; - homepage = https://github.com/bootandy/dust; + homepage = "https://github.com/bootandy/dust"; license = licenses.asl20; maintainers = [ maintainers.infinisil ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index f25c095dade9..a593805b651e 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.3.8"; + version = "1.3.9"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1b14hm809zy4idg8p2ah1sg4pgzqyy459mlf7rfc2msvf716sicr"; + sha256 = "1ly6afq4badmvs1rsqcai5kyka66n0rzi8857893wjcscppja55a"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index faa5e9d85e81..207492a89449 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kepubify"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "geek1011"; repo = pname; rev = "v${version}"; - sha256 = "168n4xbhjrzwzlhvakmsd0nwqjwgibphkwzq5hcxrk9ywpqpxjad"; + sha256 = "17zhfq1nfdas4k5yzyr82zs3r3mm4n8f907ih1ckx081hy4g7a2p"; }; modSha256 = "18q9ywsjc2v1bsmw7307dpd4v5m7v80hbhijkfrkcyqzj34jrq43"; diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index c4175f77d055..7829a677b431 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -31,10 +31,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1kdpzbn3353yk7i65hll480fcy16wdvppdr6xgfh06x88xhim4mp"; + cargoSha256 = "1iwd0cad8dp8q5xz2mm7zn1wphr5brkw937dfygc88afj6bv3d68"; doCheck = false; BUILD_REV_COUNT = src.revCount or 1; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 0231d4df9239..603e24916d60 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "06cxkkf3sf84prba65dymr1hg7mwizmsax0dlljh0lcmvlcpzi08"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "046xxxqcf1sdsi9dlilsn0nk36gyca20ck1a70ihj1k9kl7yj8sn"; + cargoSha256 = "1v4rvk6h78797wshw3m0qabb7g4i4mbj1vs5d41izgb0swnzk4vy"; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 32db897ae0ff..6c334db1ede8 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200122"; + name = "parallel-20200222"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "070cv3b1ja8lmn2a5h1ry6b5y35jpm4z5r9yv9nb5kd5im11wvqi"; + sha256 = "077b72h2d191bmsb78fmzcynxj5mi5v3axmwwxz1d1q8xhv756r6"; }; nativeBuildInputs = [ makeWrapper ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { it possible to use output from GNU Parallel as input for other programs. ''; - homepage = https://www.gnu.org/software/parallel/; + homepage = "https://www.gnu.org/software/parallel/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ pSub vrthra ]; diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index a5ce018545a7..264631120068 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -1,33 +1,55 @@ -{ - mkDerivation, fetchFromGitHub, lib, - extra-cmake-modules, kdoctools, wrapGAppsHook, - baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami2, knewstuff, plasma-framework +{ mkDerivation +, fetchFromGitHub +, lib +, extra-cmake-modules +, kdoctools +, wrapGAppsHook +, baloo +, karchive +, kconfig +, kcrash +, kfilemetadata +, kinit +, kirigami2 +, knewstuff +, plasma-framework }: -let +mkDerivation rec { pname = "peruse"; - version = "1.2.20180816"; - -in mkDerivation { - name = "${pname}-${version}"; + version = "1.2.20200208"; # The last formal release from 2016 uses kirigami1 which is deprecated src = fetchFromGitHub { - owner = "KDE"; - repo = pname; - rev = "f50027c6c9c680c4e2ce1dba4ec43364e661e7a3"; - sha256 = "1217fa6w9ryh499agcc67mnp8k9dah4r0sw74qzsbk4p154jbgch"; + owner = "KDE"; + repo = pname; + rev = "4a1b3f954d2fe7e4919c0c5dbee1917776da582e"; + sha256 = "1s5yy240x4cvrk93acygnrp5m10xp7ln013gdfbm0r5xvd8xy19k"; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - - propagatedBuildInputs = [ baloo karchive kconfig kcrash kfilemetadata kinit kirigami2 knewstuff plasma-framework ]; - - pathsToLink = [ "/etc/xdg/peruse.knsrc"]; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + baloo + karchive + kconfig + kcrash + kfilemetadata + kinit + kirigami2 + knewstuff + plasma-framework + ]; + + pathsToLink = [ "/etc/xdg/peruse.knsrc" ]; meta = with lib; { - homepage = "https://peruse.kde.org"; description = "A comic book reader"; + homepage = "https://peruse.kde.org"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index bdb86cbb8020..b9a59dffae7a 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "9.2.1"; + version = "9.4.0"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "00c5xgyn34psj538zrzql16z16532c9444vc5asg7qhrcylpqpk7"; + sha256 = "108h3zs7p9vmb56dwlw7wicv9z4kxbndl82075sx4c12rzrmssi9"; }; buildInputs = [ php ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-Source, Automated Benchmarking"; - homepage = https://www.phoronix-test-suite.com/; + homepage = "https://www.phoronix-test-suite.com/"; maintainers = with maintainers; [ davidak ]; license = licenses.gpl3; platforms = with platforms; unix; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 34a6cb03d8bb..0e9df5350f90 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.1"; + version = "1.2020.2"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "02a55na86561fnxf6pk0cpg13mx8qr7pvigyp65rqks0f9ygj9ga"; + sha256 = "1wvlhy76h1bxwjj8r48ixypch1bj9m9721rbawayj8v0hpyr1an4"; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Draw UML diagrams using a simple and human readable text description"; - homepage = http://plantuml.sourceforge.net/; + homepage = "http://plantuml.sourceforge.net/"; # "plantuml -license" says GPLv3 or later license = licenses.gpl3Plus; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 338452e213cf..9d1fcb897891 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.36.1"; + version = "0.37.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "1ip6jfnlw0maabvihzbmmka453njnw1yf7hq3fd89l6dx57315m5"; + sha256 = "17jgb8fp6zarsnl1hm2y24h0xb0w2w6m61k8g3ww3r4fm8yj649v"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "16wsd8z4cfb5pplwfvwgi5qawwv8c0aa220wnvphplmgz8cpq35r"; + cargoSha256 = "01qzwk3q1f6pmyqsq5gnczdjm3157ja2zlrahw5bd5vmy929l5gq"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index 88d437e56af6..eca80cbcadf3 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ pkgconfig openssl ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1gh5w6zzrvjk60bqaf355fagijy723rvmqjh4laksd96pmzdfwn9"; + cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k"; meta = with stdenv.lib; { description = "Utility for easy management of Tensorflow containers"; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 68527ebebb47..4e0e9193fe7d 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { pname = "wakatime"; - version = "13.0.4"; + version = "13.0.7"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime"; rev = version; - sha256 = "11np3cc5ha785vlmknk7vr7spgk2nw0wls0li60vfpvggbv0r4j6"; + sha256 = "1rnapzaabg962wxrmfcq9lxz0yyqd3mxqbx3dq1ih4w33lf4fi8d"; }; # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/misc/wob/default.nix index e2c5bd744e53..d9ea0648ebe4 100644 --- a/pkgs/tools/misc/wob/default.nix +++ b/pkgs/tools/misc/wob/default.nix @@ -5,20 +5,15 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "1j3l4v9iqhidn1b6vx86px9hz5wbsbgj3zy2jzwf9204k5sfv715"; + sha256 = "0gzqc75wjm3yj81rm03zkp5lvsmlhhp79qlz85yyan1gcz5spdb6"; }; - postPatch = '' - substituteInPlace meson.build \ - --replace "version: '0.6'" "version: '${version}'" - ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; buildInputs = [ wayland-protocols ] ++ stdenv.lib.optional stdenv.isLinux libseccomp; diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 776b41ac1aaf..d6b1b423ae2f 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sed -i src/form.c -e '21i#include <stdlib.h>' # there is no point to bring in the whole netpbm package just for this file - install -Dm644 ${netpbm}/share/netpbm/misc/rgb.txt $out/share/yad/rgb.txt + install -Dm644 ${netpbm.out}/share/netpbm/misc/rgb.txt $out/share/yad/rgb.txt ''; postAutoreconf = '' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1fc8acdda2cd..151e520e5d1a 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.02.16"; + version = "2020.03.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1ip0p7gifwmkls8ppfvz89j1lh82dg60zmvabj8njnhj170ikkdb"; + sha256 = "01hk00nbxxa81yajkbv65nv5amwyavhjs127xkyqqcrq6ws3z92w"; }; nativeBuildInputs = [ makeWrapper ]; @@ -54,8 +54,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://rg3.github.io/youtube-dl/; - repositories.git = https://github.com/rg3/youtube-dl.git; + homepage = "https://rg3.github.io/youtube-dl/"; description = "Command-line tool to download videos from YouTube.com and other sites"; longDescription = '' youtube-dl is a small, Python-based command-line program |