diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-10 12:13:27 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-10 12:13:27 +0200 |
commit | 55a5c128d4f51a4d72358514b12715e78471c22b (patch) | |
tree | 4aa2c64bd8ae29f2daa6f85d070c5b612db05345 /pkgs/tools/misc | |
parent | f2198c46b2902a9fe15b052544d87feea57046f7 (diff) | |
parent | 1ab03c3a76dd142a44c27951018f145ff78fb57e (diff) | |
download | nixlib-55a5c128d4f51a4d72358514b12715e78471c22b.tar nixlib-55a5c128d4f51a4d72358514b12715e78471c22b.tar.gz nixlib-55a5c128d4f51a4d72358514b12715e78471c22b.tar.bz2 nixlib-55a5c128d4f51a4d72358514b12715e78471c22b.tar.lz nixlib-55a5c128d4f51a4d72358514b12715e78471c22b.tar.xz nixlib-55a5c128d4f51a4d72358514b12715e78471c22b.tar.zst nixlib-55a5c128d4f51a4d72358514b12715e78471c22b.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/tools/misc')
26 files changed, 104 insertions, 56 deletions
diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/pkgs/tools/misc/3llo/Gemfile.lock index 0696ba341651..45a37b5e1ca6 100644 --- a/pkgs/tools/misc/3llo/Gemfile.lock +++ b/pkgs/tools/misc/3llo/Gemfile.lock @@ -24,4 +24,4 @@ DEPENDENCIES 3llo (= 0.3.0) BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 7b869d66d1c3..c92c0821092c 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -8,6 +8,7 @@ , gtk2 , gst_all_1 , gnome2 +, gnome-icon-theme , libnotify , libxml2 , libunique @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { gtk2 gst_all_1.gstreamer gnome2.GConf - gnome2.gnome_icon_theme + gnome-icon-theme libnotify libxml2 libunique diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix index deb88f70eb50..15154f73a699 100644 --- a/pkgs/tools/misc/bdf2sfd/default.nix +++ b/pkgs/tools/misc/bdf2sfd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bdf2sfd"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "fcambus"; repo = pname; rev = version; - sha256 = "130kaw2485qhb2171w2i9kpl1lhbkfwdz3j19cy63xk63fhyd8kb"; + sha256 = "02dzvrgwpgbd0wgfnlpiv2qlwvspwl7a0qh8cg363lpnxv8akw9q"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index fa7457b417e5..1320f28ede24 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -6,11 +6,11 @@ assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { - name = "brltty-6.0"; + name = "brltty-6.1"; src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; - sha256 = "0lmp9ab8gp4yv8m3qx4gxns3prrh7kvh8sfcd6vc45h40cgcsjxg"; + sha256 = "0nk54chr7z2w579vyiak9xk2avhnvrx7x2l5sk8nyw2zplchkx9q"; }; nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It drives the braille display, and provides complete screen review functionality. Some speech capability has also been incorporated. ''; - homepage = http://www.brltty.com/; + homepage = "http://www.brltty.com/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bramd ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index e3cc8c938ead..e63ad0e42af5 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec{ - version = "1.2.2"; + version = "1.4.0"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "10in960wzvmb25biifi480dz87c034vwb8mcshclssl7gmzgpzdn"; + sha256 = "0vf658dd9sb2d3yh65c8nals9z0z7rykqqigmxq2h92x2ysjbg6x"; }; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 04b55a6a6b47..2940ff0a5738 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.119"; + version = "1.0.123"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz"; - sha256 = "1q5kw5mm5cnm97j0iz8hfbmjrpdc3n3pcw7f9as1n6h0xp0bmgp6"; + sha256 = "0a53dhfwa74vdhqd6kbl7zlm7iic37c6wkdclppf0syxxi3q2njy"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/docker-sync/Gemfile.lock b/pkgs/tools/misc/docker-sync/Gemfile.lock index ff7aa6b3f9fc..4f14b77d0ef0 100644 --- a/pkgs/tools/misc/docker-sync/Gemfile.lock +++ b/pkgs/tools/misc/docker-sync/Gemfile.lock @@ -26,4 +26,4 @@ DEPENDENCIES docker-sync! BUNDLED WITH - 1.16.2 + 2.1.4 diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 765c7777f0f3..2dea0f179a1e 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.3.8"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "0ql74z24qp68m3ivzmxdijafrhpwjgs462chrxd021n9nl7mqhss"; + sha256 = "1r94fcygp9mmg457dkksx3mjdxfddzfzl6n0rmxasiinsz0hak4c"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0c0d9qi7v3s7vf1rzd467w56i9zdh8fqqrmkkk6xxyh5xhkqx0kd"; + cargoSha256 = "15a4hari3my59xvmkll2jlvb1jyf8gg8alp91nvh3bagpajpvdx6"; doCheck = false; diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock index e86371aed3ba..c3e3cb24e83a 100644 --- a/pkgs/tools/misc/fluentd/Gemfile.lock +++ b/pkgs/tools/misc/fluentd/Gemfile.lock @@ -129,4 +129,4 @@ DEPENDENCIES fluentd BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index b18ac1093829..153a74f94567 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1hqqwk5hbqgrxfqlcbgk6rv3a71k65psxcqa6hw41y9jymnm3dp3"; + sha256 = "1wjyn3fkc2zgj0xrd73kidrg1d1wqmil278ak36wf87685w4n0b1"; }; dontConfigure = true; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform benchmark"; - homepage = https://geekbench.com/; + homepage = "https://geekbench.com/"; license = licenses.unfree; maintainers = [ maintainers.michalrus ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/homesick/Gemfile.lock b/pkgs/tools/misc/homesick/Gemfile.lock index 42ab916db3e3..accc917e240f 100644 --- a/pkgs/tools/misc/homesick/Gemfile.lock +++ b/pkgs/tools/misc/homesick/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES homesick BUNDLED WITH - 1.14.6 + 2.1.4 diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 615eea5a7831..c3ff0fd210fe 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -34,4 +34,4 @@ DEPENDENCIES html-proofer BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock index ed48cc5921b0..e01cf81c61e8 100644 --- a/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES lolcat BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 24006e5cbd95..4e2b3a91a069 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -1,31 +1,31 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv +, fetchFromGitHub +, rustPlatform +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "Peltoche"; repo = pname; rev = version; - sha256 = "0fh5rz6slyjzz03bpjcl9gplk36vm7qcc0i0gvhsikwvw0cf3hym"; + sha256 = "1vyww54fl4yfvszr0dh8ym2jd9gilrccmwkvl7rbx70sfqzsgaai"; }; - cargoSha256 = "1z7sg9b7qsjw1hhc7dkvxz8xgf4k8jddr7gbnjr4d2569g97jf3f"; + cargoSha256 = "13g0p6zh2b1z005lszll098d4lv62dzsxwhl76bianzrydif61lr"; - preFixup = '' - install -Dm644 -t $out/share/zsh/site-functions/ target/release/build/lsd-*/out/_lsd - install -Dm644 -t $out/share/fish/vendor_completions.d/ target/release/build/lsd-*/out/lsd.fish - install -Dm644 -t $out/share/bash-completion/completions/ target/release/build/lsd-*/out/lsd.bash + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion target/release/build/lsd-*/out/{_lsd,lsd.{bash,fish}} ''; - # Some tests fail, but Travis ensures a proper build - doCheck = false; - meta = with stdenv.lib; { homepage = https://github.com/Peltoche/lsd; description = "The next gen ls command"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ filalex77 marsam ]; }; } diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix index 71409b1c3a8b..9f029ee5ded3 100644 --- a/pkgs/tools/misc/memtest86-efi/default.nix +++ b/pkgs/tools/misc/memtest86-efi/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "memtest86-efi"; - version = "8.2"; + version = "8.3"; src = fetchzip { - # TODO: The latest version of memtest86 is actually 8.2, but the + # TODO: We're using the previous version of memtest86 because the # company developing memtest86 has stopped providing a versioned download # link for the latest version: # @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # 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 = "1x1wjssr4nnbnfan0pi7ni2dfwnm3288kq584hkfqcyza8xdx03i"; + sha256 = "0aldz7rvnfnzb4h447q10k9c9p5ghwzdyn7f6g5lrxiv5vxf3x96"; stripRoot = false; }; diff --git a/pkgs/tools/misc/page/default.nix b/pkgs/tools/misc/page/default.nix new file mode 100644 index 000000000000..07109515c5c3 --- /dev/null +++ b/pkgs/tools/misc/page/default.nix @@ -0,0 +1,32 @@ +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "page"; + version = "2.3.4"; + + src = fetchFromGitHub { + owner = "I60R"; + repo = pname; + rev = "v${version}"; + sha256 = "0xcbnl8fbdfdmcbv5d7v830aa3vfhg7nlf768rbrfd5a0970pllh"; + }; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + completions_dir=$(find "target" -name "shell_completions" -type d -printf "%T+\t%p\n" | sort | awk 'NR==1{print $2}') + + installShellCompletion --bash $completions_dir/page.bash + installShellCompletion --fish $completions_dir/page.fish + installShellCompletion --zsh $completions_dir/_page + ''; + + cargoSha256 = "0ckfmqi6jvbvj99vbdp798mmy6gc54254n32br0ri842b04i26qf"; + + meta = with lib; { + description = "Use neovim as pager"; + homepage = "https://github.com/I60R/page"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.s1341 ]; + }; +} diff --git a/pkgs/tools/misc/pws/Gemfile.lock b/pkgs/tools/misc/pws/Gemfile.lock index c9cf6a3157c1..cad7909e406d 100644 --- a/pkgs/tools/misc/pws/Gemfile.lock +++ b/pkgs/tools/misc/pws/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES pws BUNDLED WITH - 1.11.2 + 2.1.4 diff --git a/pkgs/tools/misc/riemann-tools/Gemfile.lock b/pkgs/tools/misc/riemann-tools/Gemfile.lock index 881b8aefcdf8..a3e1ea62a8c5 100644 --- a/pkgs/tools/misc/riemann-tools/Gemfile.lock +++ b/pkgs/tools/misc/riemann-tools/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES riemann-tools BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 232949b7dace..06a6c27d7c5e 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libusb1 , qtbase, qttools, makeWrapper, qmake -, withEspeak ? false, espeak ? null }: +, withEspeak ? false, espeak ? null, qt5 }: let inherit (stdenv.lib) getDev; in @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 qtbase qttools ] ++ stdenv.lib.optional withEspeak espeak; - nativeBuildInputs = [ makeWrapper pkgconfig qmake ]; + nativeBuildInputs = [ makeWrapper pkgconfig qmake qt5.wrapQtAppsHook ]; postPatch = '' sed -i rbutil/rbutilqt/rbutilqt.pro \ diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index fd090767a302..a464ea638bda 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "shadowenv"; - version = "1.3.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = version; - sha256 = "1yapplqy7wmmjh8r5m43na9n2p100k80s7nkaswndyp5ljr9m20l"; + sha256 = "1fjqm4qr85wb0i3vazp0w74izfzvkycdii7dlpdp5zs8jgb35pdh"; }; - cargoSha256 = "1pnfd461i65jd7s8dpfpys4k620w86bv56gkdsyx5lcvhqw1krnr"; + cargoSha256 = "1n8qh730nhdmpm08mm2ppcl3nkcgm50cyz9q5h6dlzq4bv4rijp4"; + + nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' + installManPage man/man1/shadowenv.1 + installManPage man/man5/shadowlisp.5 + ''; + meta = with stdenv.lib; { homepage = "https://shopify.github.io/shadowenv/"; description = "reversible directory-local environment variable manipulations"; diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 7c906ecddf9d..fca2d35e37cc 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "skim"; @@ -15,7 +15,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "14p4ppbl2mak21jvxpbd1b28jaw2629bc8kv7875cdzy3ksxyji3"; - patchPhase = '' + patches = [ + # Fix bash completion. Remove with the next release + (fetchpatch { + url = "https://github.com/lotabout/skim/commit/60ca3484090c2e73a1de396500c73a6ad6e0bde9.patch"; + sha256 = "07nibr13vmxscbwavrckhcbsvxwkpan4a6ml0qfr1ny36xbc6y3p"; + }) + ]; + + postPatch = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim ''; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 152db99660c8..01aec4aabb76 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.38.1"; + version = "0.39.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0qp3y2wcpj1r07v1r2y42zrzkl13j0vlinjx05gfmrmapcls41gi"; + sha256 = "13phic9898wjc4b000nkwhy24yczn3dyhw8pqcaqhyzxdaj3gwmw"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "11492fv2isw2prfcgxq0wrbln1n6xdi9209cifjf25nnw2aq2csn"; + cargoSha256 = "0ds19sjy0fd7psmqkw64scjf3ysi408i7c1qk9zvqkl4ghz8wymg"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/t/Gemfile.lock b/pkgs/tools/misc/t/Gemfile.lock index 0aa9ef4e6da8..9555e08f9715 100644 --- a/pkgs/tools/misc/t/Gemfile.lock +++ b/pkgs/tools/misc/t/Gemfile.lock @@ -62,4 +62,4 @@ DEPENDENCIES twitter (~> 6.1.0) BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/td/Gemfile.lock b/pkgs/tools/misc/td/Gemfile.lock index 5726611b9af7..b777a8b411aa 100644 --- a/pkgs/tools/misc/td/Gemfile.lock +++ b/pkgs/tools/misc/td/Gemfile.lock @@ -37,4 +37,4 @@ DEPENDENCIES td BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/tools/misc/teamocil/Gemfile.lock b/pkgs/tools/misc/teamocil/Gemfile.lock index 419c2ae49d31..aeca8cadf869 100644 --- a/pkgs/tools/misc/teamocil/Gemfile.lock +++ b/pkgs/tools/misc/teamocil/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES teamocil BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index d6b1b423ae2f..d00d737c17ce 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "5.0"; + version = "6.0"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "07rd61hvilsxxrj7lf8c9k0a8glj07s48m7ya8d45030r90g3lvc"; + sha256 = "07myjv0g0iwgclc6q9wkj25myhlc86ahy2lqma8vgv9i3rgy03p7"; }; configureFlags = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/yad-dialog/; + homepage = "https://sourceforge.net/projects/yad-dialog/"; description = "GUI dialog tool for shell scripts"; longDescription = '' Yad (yet another dialog) is a GUI dialog tool for shell scripts. It is a |