diff options
Diffstat (limited to 'pkgs/tools/misc')
102 files changed, 1460 insertions, 478 deletions
diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index d8ac90abf87..bf84502af2b 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -4,17 +4,17 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1cpa8dal4c27pnbmmrar4vqzcl4h0zf8x1zx1dlf0riavdg9n56y"; + sha256 = "1kaa6ps6v1wk9qs63h116k4pbz7y9mfbfxfbq7g89yjhzkjmh6xc"; fetchSubmodules = true; }; - cargoSha256 = "17xyb84axkn341nd5rm7jza1lrn8wcnl6jirhyv63r5k6mswy39i"; + cargoSha256 = "01l1y124gjh6gf9z1jkbpfzh0w92hrgwvsmqkqdw3a9pa4w5f6yg"; nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ]; @@ -23,8 +23,8 @@ rustPlatform.buildRustPackage rec { LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; postInstall = '' - installManPage doc/bat.1 - installShellCompletion assets/completions/bat.fish + installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 + installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.fish ''; # Insert Nix-built `less` into PATH because the system-provided one may be too old to behave as @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; - homepage = https://github.com/sharkdp/bat; + homepage = "https://github.com/sharkdp/bat"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir lilyball ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index 532d1155fbe..cc63dab9645 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -1,13 +1,25 @@ -{ python3Packages +{ python3 , lib }: -with python3Packages; +let + python = python3.override { + self = python; + packageOverrides = self: super : { + xstatic-bootstrap = super.xstatic-bootstrap.overridePythonAttrs(oldAttrs: rec { + version = "3.3.7.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0cgihyjb9rg6r2ddpzbjm31y0901vyc8m9h3v0zrhxydx1w9x50c"; + }; + }); + }; + }; #We need to use buildPythonPackage here to get the PYTHONPATH build correctly. #This is needed for services.bepasty #https://github.com/NixOS/nixpkgs/pull/38300 -buildPythonPackage rec { +in with python.pkgs; buildPythonPackage rec { pname = "bepasty"; version = "0.5.0"; @@ -36,6 +48,9 @@ buildPythonPackage rec { selenium ]; + # No tests in sdist + doCheck = false; + meta = { homepage = https://github.com/bepasty/bepasty-server; description = "Binary pastebin server"; diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix index 23bd7ed172c..1b860fc1b4d 100644 --- a/pkgs/tools/misc/blsd/default.nix +++ b/pkgs/tools/misc/blsd/default.nix @@ -24,5 +24,6 @@ buildGoPackage { license = licenses.mit; maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; + broken = true; # since 2020-02-08, libgit2 is incompatible upstream is dead. }; } diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 572bee3d262..b7e2fb00a14 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.13.1"; + version = "0.13.4"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "13b1w9g68aj3r70w9bmrmdc772y959n77ajbdm2cpjs5f4kgfpak"; + sha256 = "0xd7vsybv6w5llvb85g6bx6r33lr0ki077rwzdvwb9c8w64fvs2h"; }; - cargoSha256 = "0zrwpmsrzwnjml0964zky8w222zmlargha3z0n6hf8cfshx23s4k"; + cargoSha256 = "16qad0m2vygwrbz40ww0mb0ba5wn2wna1n78bc8nxh60x0qiigi9"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 89a5154adda..ad17c5edd6e 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python3, perl, textual-window-manager }: stdenv.mkDerivation rec { - version = "5.131"; + version = "5.133"; name = "byobu-" + version; src = fetchurl { url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; - sha256 = "0ljyk0fkpdjjyqpqsss6d26sd3vkr55vcr5cfw1kz3lxwwd7bb3p"; + sha256 = "0qvmmdnvwqbgbhn5c8asmrmjhclcl029py2d2zvmd7h5ij7s93jd"; }; doCheck = true; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ textual-window-manager ]; meta = { - homepage = https://launchpad.net/byobu/; + homepage = "https://launchpad.net/byobu/"; description = "Text-based window manager and terminal multiplexer"; longDescription = diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 5055ce67d30..e3cc8c938ea 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.1"; + version = "1.2.2"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "19dck47v4hd07q9742mgb928h7y1y9638qlh2rzsvqsfqvqmxh85"; + sha256 = "10in960wzvmb25biifi480dz87c034vwb8mcshclssl7gmzgpzdn"; }; nativeBuildInputs = [ autoconf @@ -37,7 +37,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "Terminal graphics for the 21st century."; - homepage = https://hpjansson.org/chafa/; + homepage = "https://hpjansson.org/chafa/"; license = licenses.lgpl3Plus; platforms = platforms.all; maintainers = [ maintainers.mog ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index da8f8c78918..979a658ac02 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -1,17 +1,19 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }: buildGoModule rec { pname = "chezmoi"; - version = "1.7.13"; + version = "1.7.16"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "1xqmr7sps5s3ib4q91z7drwlglp1av37gb2jm0zw7y3ijyp2c749"; + sha256 = "1fkjdpqal0yzm58l146pf5xpbhij9iq79933i9a77v2jihdbjn52"; }; - modSha256 = "07fglc3k3a5y70slly4ri3izwnyk4nwghmvkjwgc8lbw8m1zx0r8"; + modSha256 = "0gh314d3mspqmz2z3m05bgsp62mrhb48m4mwhfy5h62fs7aqymr8"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; buildFlagsArray = [ "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}" @@ -20,7 +22,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installShellCompletion --bash completions/chezmoi-completion.bash + installShellCompletion --bash --name chezmoi.bash completions/chezmoi-completion.bash installShellCompletion --fish completions/chezmoi.fish installShellCompletion --zsh completions/chezmoi.zsh ''; @@ -28,7 +30,7 @@ buildGoModule rec { subPackages = [ "." ]; meta = with stdenv.lib; { - homepage = https://github.com/twpayne/chezmoi; + homepage = "https://www.chezmoi.io/"; description = "Manage your dotfiles across multiple machines, securely"; license = licenses.mit; maintainers = with maintainers; [ jhillyerd ]; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 738430f561b..12c7f91f5ab 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -27,6 +27,7 @@ mkDerivation rec { "-DINSTALL_DIR_ANIMATIONS=libexec" "-DUDEV_RULE_DIRECTORY=lib/udev/rules.d" "-DFORCE_INIT_SYSTEM=systemd" + "-DDISABLE_UPDATER=1" ]; patches = [ diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix index 560dbecd4bf..3153c843025 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/misc/clipman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clipman"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "yory8"; repo = pname; rev = "v${version}"; - sha256 = "0b27rgyjwvdm9qjq824imda3yjbxxcwwyv8rzzk95ggvyayxw8an"; + sha256 = "0d5w94cylrzhwyb4zfgidh6rr1h82dx5y7cxfa37wx5xxcjyyja1"; }; - modSha256 = "0aw0ng8pk8qzn1iv79iw0v9zr8xdc8p9xnigr3ij86038f7aqdhv"; + modSha256 = "1sim3x794kj3wdw0g432zbgh1cimdmmg1hjgynh9jgm3y8w9q7ij"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/tools/misc/codebraid/default.nix new file mode 100644 index 00000000000..bc4a7084cdd --- /dev/null +++ b/pkgs/tools/misc/codebraid/default.nix @@ -0,0 +1,39 @@ +{ stdenv, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "codebraid"; + version = "0.5.0-unstable-2019-12-11"; + + src = fetchFromGitHub { + owner = "gpoore"; + repo = pname; + rev = "fac1b29"; + sha256 = "0ldfrkkip7i1fdyz1iydyik3mhm0xv0jvxnl37r7g707dl38vf3h"; + }; + + propagatedBuildInputs = with python3Packages; [ bespon ]; + # unfortunately upstream doesn't contain tests + checkPhase = '' + $out/bin/codebraid --help > /dev/null + ''; + meta = with stdenv.lib; { + homepage = "https://github.com/gpoore/codebraid"; + description = '' + Live code in Pandoc Markdown. + + Codebraid is a Python program that enables executable code in Pandoc + Markdown documents. Using Codebraid can be as simple as adding a class to + your code blocks' attributes, and then running codebraid rather than + pandoc to convert your document from Markdown to another format. + codebraid supports almost all of pandoc's options and passes them to + pandoc internally. + + Codebraid provides two options for executing code. It includes a built-in + code execution system that currently supports Python 3.5+, Julia, Rust, + R, Bash, and JavaScript. Code can also be executed using Jupyter kernels, + with support for rich output like plots. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ synthetica ]; + }; +} diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 54379ec08f0..c6dbcfdda02 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; homepage = https://www.freedesktop.org/software/colord/; license = licenses.lgpl2Plus; - maintainers = [ maintainers.marcweber ]; + maintainers = [ maintainers.marcweber ] ++ teams.freedesktop.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/colorz/default.nix b/pkgs/tools/misc/colorz/default.nix new file mode 100644 index 00000000000..aadd050dae2 --- /dev/null +++ b/pkgs/tools/misc/colorz/default.nix @@ -0,0 +1,24 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "colorz"; + version = "1.0.3"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0ghd90lgplf051fs5n5bb42zffd3fqpgzkbv6bhjw7r8jqwgcky0"; + }; + + propagatedBuildInputs = with python3Packages; [ pillow scipy ]; + + checkPhase = '' + $out/bin/colorz --help > /dev/null + ''; + + meta = with lib; { + description = "Color scheme generator"; + homepage = "https://github.com/metakirby5/colorz"; + license = licenses.mit; + maintainers = with maintainers; [ skykanin ]; + }; +} diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 3f6988f1f65..e769cb25a73 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: let - version = "4.10"; + version = "4.11"; meta = with stdenv.lib; { description = "Various coreboot-related tools"; @@ -16,7 +16,7 @@ let src = fetchurl { url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "1jsiz17afi2lqg1jv6lsl8s05w7vr7iwgg86y2qp369hcz6kcwfa"; + sha256 = "11xdm2c1blaqb32j98085sak78jldsw0xhrkzqs5b8ir9jdqbzcp"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index 18e80ab6e4a..f66f2b97d14 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "datamash"; - version = "1.5"; + version = "1.6"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1b91pbdarnfmbhid8aa2f50k0fln8n7pg62782b4y0jlzvaljqi2"; + sha256 = "1jvqxcyh0aghnqh3m2rk5av1x0038flcmfzd493vasv1k69vgfdr"; }; meta = with stdenv.lib; { description = "A command-line program which performs basic numeric,textual and statistical operations on input textual data files"; - homepage = https://www.gnu.org/software/datamash/; + homepage = "https://www.gnu.org/software/datamash/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ pSub vrthra ]; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index c016b857de3..04b55a6a6b4 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.117"; + version = "1.0.119"; 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 = "0rsdw1yjkx35jd1i45646l07glnwsn9gzd6k8sjccv2xvhcljq77"; + sha256 = "1q5kw5mm5cnm97j0iz8hfbmjrpdc3n3pcw7f9as1n6h0xp0bmgp6"; }; nativeBuildInputs = [ makeWrapper ]; @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to create a Debian system in a chroot"; - homepage = https://wiki.debian.org/Debootstrap; + homepage = "https://wiki.debian.org/Debootstrap"; license = licenses.mit; maintainers = with maintainers; [ marcweber ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 12e6e1af93a..9273d82455d 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "136"; + version = "137"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "0an9c63xgy1bvqnpnn9mfphsq1qx8ba69yk15nqa9p78iqq2hf4h"; + sha256 = "1qa508nlqvz0s0cd6jk5c8m43kqfx1h2mgx50iphy4y0spnyv946"; }; patches = [ @@ -69,9 +69,9 @@ python3Packages.buildPythonApplication rec { diffoscope is developed as part of the "reproducible builds" Debian project and was formerly known as "debbindiff". ''; - homepage = https://wiki.debian.org/ReproducibleBuilds; + homepage = "https://diffoscope.org/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dezgeg ]; + maintainers = with maintainers; [ dezgeg ma27 ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index e83d13249d2..e02811e03eb 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "07wsl1vw2aimgmrlri03pfcxv13klqxyvmmsbzgnq9sc9qzzy8gp"; + cargoSha256 = "0bivmjn7h4lfp5azbc6q0xiqq3fk68jdd4kwrwgbxiljg4xd2qy8"; meta = with stdenv.lib; { description = "A minimal, fast alternative to 'du -sh'"; diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index 66c0cfc82b1..c8f3dbf8009 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -1,21 +1,23 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "docui"; - version = "2.0.0"; + version = "2.0.4"; src = fetchFromGitHub { owner = "skanehira"; repo = "docui"; rev = version; - sha256 = "0rizl4rxmb3brzvqxw5llbgvq3rncix3h60pgq50djdf0jjnn5hs"; + sha256 = "0jya0wdp8scjmsr44krdbbb8q4gplf44gsng1nyn12a6ldqzayxl"; }; - modSha256 = "0asqz9nnx80g2wi7dzxrfmppcraywrwdqi9vzr66vaihwpfpfnwz"; + modSha256 = "1wyx05kk4f41mgvwnvfc9xk7vd3x96cbn5xb5ph7p443f70ydnak"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; meta = with stdenv.lib; { description = "TUI Client for Docker"; - homepage = https://github.com/skanehira/docui; + homepage = "https://github.com/skanehira/docui"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aethelz ]; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 3e5f12da0c3..765c7777f0f 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,19 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.1.11"; + version = "2.3.8"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "08zgi2yiynb20l1f9rhly4a7zgqnr7lq3cr5vkmh1jnfs6z27dv6"; + sha256 = "0ql74z24qp68m3ivzmxdijafrhpwjgs462chrxd021n9nl7mqhss"; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + extraPostFetch = '' + rm -r $out/tests/fixtures + ''; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; + cargoSha256 = "0c0d9qi7v3s7vf1rzd467w56i9zdh8fqqrmkkk6xxyh5xhkqx0kd"; - cargoSha256 = "0hd46h4wwh81hnida0in3142884y8n6ygk7qm09i5wj52g73bivv"; + doCheck = false; meta = with lib; { description = "A tool to conveniently learn about the disk usage of directories, fast!"; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index c0aa9180aed..53594494a83 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -1,26 +1,28 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - pname = "dust"; - version = "0.4.4"; + pname = "du-dust"; + 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 = "0s8z8cg9q0gfqm0ann8rkxwp5y25si97kgginh6b6lbnaai7y4fj"; 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/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix new file mode 100644 index 00000000000..49b6277faef --- /dev/null +++ b/pkgs/tools/misc/edid-generator/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromGitHub +, dos2unix +, edid-decode +, hexdump +, zsh +, modelines ? [] # Modeline "1280x800" 83.50 1280 1352 1480 1680 800 803 809 831 -hsync +vsync +}: +let + version = "unstable-2018-03-15"; +in stdenv.mkDerivation { + pname = "edid-generator"; + inherit version; + + src = fetchFromGitHub { + owner = "akatrevorjay"; + repo = "edid-generator"; + rev = "31a6f80784d289d2faa8c4ca4788409c83b3ea14"; + sha256 = "0j6wqzx5frca8b5i6812vvr5iwk7440fka70bmqn00k0vfhsc2x3"; + }; + + nativeBuildInputs = [ dos2unix edid-decode hexdump zsh ]; + + postPatch = '' + patchShebangs modeline2edid + ''; + + configurePhase = (stdenv.lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines); + + installPhase = '' + install -Dm 444 *.bin -t "$out/lib/firmware/edid" + ''; + + meta = { + description = "Hackerswork to generate an EDID blob from given Xorg Modelines"; + homepage = "https://github.com/akatrevorjay/edid-generator"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.flokli ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index c720361b9cd..dee181d95c2 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -4,10 +4,7 @@ rustPlatform.buildRustPackage rec { pname = "eva"; version = "0.2.7"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0n3xvlmp4l925nbz8lx6dr9yrrfh6z7b9z8wd6sli3a1dq26d6bg"; + cargoSha256 = "1lycjw5i169xx73qw8gknbakrxikdbr65fmqx7xq2mafc0hb1zyn"; src = fetchFromGitHub { owner = "NerdyPepper"; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index f012aa120eb..060e1c3fcdf 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -1,33 +1,29 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "fd"; - version = "7.4.0"; + version = "7.5.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "108p1p9bxhg4qzwfs6wqcakcvlpqw3w498jkz1vhmg6jp1mbmgdr"; + sha256 = "029xr7l751dy167hfzrd030llkaiy8j585h1d4l6391fgrsvnav7"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; + cargoSha256 = "0lq6da2f6xywyhzyyrpph96d8b9vpdzakzipci167g6hhh232b5b"; - cargoSha256 = "0ylanxcb1vrhvm9h3lvq8nh28362wi5hjy0pqdv5lh40pphcknnz"; + nativeBuildInputs = [ installShellFiles ]; preFixup = '' - install -Dm644 "$src/doc/fd.1" "$out/man/man1/fd.1" - - install -Dm644 target/release/build/fd-find-*/out/fd.bash \ - "$out/share/bash-completion/completions/fd.bash" - install -Dm644 target/release/build/fd-find-*/out/fd.fish \ - "$out/share/fish/vendor_completions.d/fd.fish" - install -Dm644 target/release/build/fd-find-*/out/_fd \ - "$out/share/zsh/site-functions/_fd" + installManPage "$src/doc/fd.1" + + (cd target/release/build/fd-find-*/out + installShellCompletion fd.{bash,fish} + installShellCompletion --zsh _fd) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, fast and user-friendly alternative to find"; longDescription = '' `fd` is a simple, fast and user-friendly alternative to `find`. @@ -37,7 +33,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/sharkdp/fd"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir globin ]; + maintainers = with maintainers; [ dywedir globin ma27 ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 6637f2d2a4a..38619f53715 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -25,10 +25,7 @@ buildRustPackage rec { sha256 = "0yqigqh5vldzmp7wc1mxi5a4bxzm81xycx5h0ghak74vbjibps49"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1wwdnm6a5g4gpd1f89qii8v4f6mcfc1bif1v6mdlcbrpwax5skh4"; + cargoSha256 = "0m2931fmc8jczjpb08077cpz9klhhf3aq15j2h76sb254qndagzy"; nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 143bc805dec..3b9e600dcdb 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, libftdi1 +, libusb1 +, pciutils +}: stdenv.mkDerivation rec { pname = "flashrom"; @@ -9,23 +18,16 @@ stdenv.mkDerivation rec { sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71"; }; - # Newer versions of libusb deprecate some API flashrom uses. - #postPatch = '' - # substituteInPlace Makefile \ - # --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable=" - #''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libftdi pciutils ]; - - preConfigure = "export PREFIX=$out"; + nativeBuildInputs = [ meson pkgconfig ninja ]; + buildInputs = [ libftdi1 libusb1 pciutils ]; meta = with lib; { homepage = http://www.flashrom.org; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = licenses.gpl2; maintainers = with maintainers; [ funfunctor fpletz ]; - platforms = with platforms; linux; + platforms = platforms.all; + # https://github.com/flashrom/flashrom/issues/125 badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 042ed2b0334..57909debf79 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.7"; + version = "1.4.0"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1j0fzhakk4kpfpq4p4c0byw99adxd9w7irfn83rlvw8bw32j2lrj"; + sha256 = "07p0cy4y2x45kgimg7rjjk9zknmnnsfxdy2vlz6dzaxrslv6c3x6"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index 5c2e5e3da2d..e508eb02ad0 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "1zccl60l557lhaaqb33myys4vp3jsnjqh3dxb22i46bff28s1w6c"; + sha256 = "0cgzvzdsy8vbiapgk1l5dp48c3kq0xmx53yfi486mx8nwvz3ksc0"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; + cargoSha256 = "0mjd9nmaggsszf0kx68yrvy3fqbn35v34c7q3584fv50ipqn6drb"; - cargoSha256 = "1496zjrkwj5bv08k575m064x0hfk0gpci0dmxvvspj6jf8f8bfm6"; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage docs/fselect.1 + ''; meta = with stdenv.lib; { description = "Find files with SQL-like queries"; diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix index e8e48d7879a..5e59d34fe4a 100644 --- a/pkgs/tools/misc/fsmon/default.nix +++ b/pkgs/tools/misc/fsmon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fsmon"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "nowsecure"; repo = "fsmon"; rev = version; - sha256 = "1zpac37biy8jz8234q0krn7pjggz33k0grz590ravbjgfawm1ccy"; + sha256 = "18p80nmax8lniza324kvwq06r4w2yxcq90ypk2kqym3bnv0jm938"; }; installPhase = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "FileSystem Monitor utility"; - homepage = https://github.com/nowsecure/fsmon; + homepage = "https://github.com/nowsecure/fsmon"; license = licenses.mit; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index 5fa57e830d2..5181610a039 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fx_cast_bridge"; - version = "0.0.5"; + version = "0.0.6"; src = fetchurl { url = "https://github.com/hensm/fx_cast/releases/download/v${version}/${pname}-${version}-x64.deb"; - sha256 = "1qmp1d7miq7c2q8i4bhfp5ywxdngvyi7rjl6i82is2g5nhr7gbvv"; + sha256 = "1mjpwd27b0cpigz4cc2mdl97d78rj5ikn2bqfdic50lqjciaqi1b"; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 0694d5931ef..d337731888f 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, }: +{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses }: buildGoModule rec { pname = "fzf"; - version = "0.20.0"; + version = "0.21.0-1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "02zy3c4k84rzqdkaf04idbj10v286hi0ix1xl2qsz1wrblh168w8"; + sha256 = "1d4bwcmjirwkkv0m01sx9rxp01iik57iy54zxhdkkz842pxlr2xv"; }; - modSha256 = "12lnv8b96adpcg9qfizcyd9nxz590nxd82xch6ij719zlqyps143"; + modSha256 = "16bb0a9z49jqhh9lmq8rvl7x9vh79mi4ygkb9sm04g41g5z6ag1s"; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index a4b9af09712..56462aa3d30 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "gotify-cli"; @@ -17,7 +17,9 @@ buildGoModule rec { mv $out/bin/cli $out/bin/gotify ''; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { license = licenses.mit; homepage = https://github.com/gotify/cli; description = "A command line interface for pushing messages to gotify/server."; diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 48b471e3b40..6ded4f28e9d 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1pilksik3bbd4sgmnpns9gg9sddybzxzxkn9sknn40dav08k1x6h"; + sha256 = "1n9nwxq0aklihhp0v39klq4za63ks6v5z76dp5821jcv1cbk96g9"; }; dontBuild = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source log management solution"; - homepage = https://www.graylog.org/; + homepage = "https://www.graylog.org/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.fadenb ]; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 3f5485718dc..3eec453824d 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -83,12 +83,9 @@ stdenv.mkDerivation rec { unset CPP # setting CPP intereferes with dependency calculation - cp -r ${gnulib} $PWD/gnulib - chmod u+w -R $PWD/gnulib - patchShebangs . - ./bootstrap --no-git --gnulib-srcdir=$PWD/gnulib + ./bootstrap --no-git --gnulib-srcdir=${gnulib} substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' ''; diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index d7944e55d32..22a7d8ec4a7 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -1,22 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "heatseeker"; - version = "1.5.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "rschmitt"; repo = "heatseeker"; rev = "v${version}"; - sha256 = "1fcrbjwnhcz71i70ppy0rcgk5crwwmbkm9nrk1kapvks33pv0az7"; + sha256 = "1x7mdyf1m17s55f6yjdr1j510kb7a8f3zkd7lb2kzdc7nd3vgaxg"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0m3sxbz1iii31s30cnv1970i1mwfhl6gm19k8wv0n7zji30ayx07"; + cargoSha256 = "0jnlcm7v29m4nc318qgf7r7jvs80s7n04fw83imm506vwr9rxbx9"; # some tests require a tty, this variable turns them off for Travis CI, # which we can also make use of @@ -24,7 +19,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "A general-purpose fuzzy selector"; - homepage = https://github.com/rschmitt/heatseeker; + homepage = "https://github.com/rschmitt/heatseeker"; license = licenses.mit; maintainers = [ maintainers.michaelpj ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index b3cc549e018..e67b0116df1 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -2,21 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "hexyl"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1n2q5a6697bxvl0askywhad2x560cajv456gxihdqqmmyq2vf63h"; + sha256 = "0blq81zpmzldngk9ymcg56syspjp1g1ziap4z69idv05mfkf6sp3"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1wcpbqlglf9r0xhfjmyym8bnd4pgrsf9lrmb14hn1ml5zlshpd7p"; + cargoSha256 = "09kccd1brcbvzimm05dyybwrkganqxdkjrvzgcf1l93xs1z2h94b"; meta = with stdenv.lib; { + changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}"; description = "A command-line hex viewer"; longDescription = '' `hexyl` is a simple hex viewer for the terminal. It uses a colored @@ -24,7 +22,7 @@ rustPlatform.buildRustPackage rec { printable ASCII characters, ASCII whitespace characters, other ASCII characters and non-ASCII). ''; - homepage = https://github.com/sharkdp/hexyl; + homepage = "https://github.com/sharkdp/hexyl"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index cab69d41f93..615eea5a783 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -5,8 +5,8 @@ GEM public_suffix (>= 2.0.2, < 5.0) ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.12.1) - html-proofer (3.15.1) + ffi (1.12.2) + html-proofer (3.15.2) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) @@ -16,7 +16,7 @@ GEM yell (~> 2.0) mercenary (0.4.0) mini_portile2 (2.4.0) - nokogiri (1.10.7) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) @@ -25,7 +25,7 @@ GEM rainbow (3.0.0) typhoeus (1.3.1) ethon (>= 0.9.0) - yell (2.2.1) + yell (2.2.2) PLATFORMS ruby diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index fbf65a8a0c0..2e3b3a10b3b 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -26,10 +26,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i2vxj3ryvih5y06mgsa19dwy8fpyx58byh5szp7m6i702p78rni"; + sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; type = "gem"; }; - version = "1.12.1"; + version = "1.12.2"; }; html-proofer = { dependencies = ["addressable" "mercenary" "nokogumbo" "parallel" "rainbow" "typhoeus" "yell"]; @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krd80ga7qcms469l55jbm711a7ph2lmyn88l929nhbxc7sgm81g"; + sha256 = "1b7wx2hnwnml3y10x6yxybl3hy973n2ifq3hbqh0jd72bqs615wp"; type = "gem"; }; - version = "3.15.1"; + version = "3.15.2"; }; mercenary = { groups = ["default"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.7"; + version = "1.10.9"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -130,9 +130,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r2kygdh193qdbjjwhfghzl9czj4jr9xrw3gqyg5hmvmn7lygjwm"; + sha256 = "1g16kcdhdfvczn7x81jiq6afg3bdxmb73skqjyjlkp5nqcy6y5hx"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix index be199f7eb0a..77df7ab6908 100644 --- a/pkgs/tools/misc/journaldriver/default.nix +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -3,10 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "journaldriver"; version = "1.1.0"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0wmr0r54ar7gvhvhv76a49ap74lx8hl79bf73vc4f4xlj7hj303g"; + cargoSha256 = "1vyc9pglppfz5idahvcj01wpmmm6jw043zk896wdksywa5zcqn28"; src = fetchFromGitHub { owner = "tazjin"; diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 55a3cf409eb..4bcfd81f71d 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1b9v417g0z9q1sqgnms5vy740xggg4fcz0fdwbc4hfvfj6jkyaad"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0kzrrphlilnyl79yfmlvd6an8iyi8zcs0inwiq74z383lnbdpk7q"; + cargoSha256 = "1cmms8kvh24sjb0w77i1bwl09wkx3x65p49pkg1j0lipwic3apm3"; buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index faa5e9d85e8..a7b7da451fb 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -1,23 +1,25 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: 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"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." "covergen" "seriesmeta" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "EPUB to KEPUB converter"; homepage = "https://pgaskin.net/kepubify"; license = licenses.mit; diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix index 246684c6638..a6570adf120 100644 --- a/pkgs/tools/misc/licensor/default.nix +++ b/pkgs/tools/misc/licensor/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "licensor"; @@ -11,10 +11,12 @@ rustPlatform.buildRustPackage rec { sha256 = "0zr8hcq7crmhrdhwcclc0nap68wvg5kqn5l93ha0vn9xgjy8z11p"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; + patches = [ (fetchpatch { + url = "https://github.com/raftario/licensor/commit/77ae1ea6d9b6de999ee7590d9dbd3c8465d70bb6.patch"; + sha256 = "0kfyg06wa2v7swm7hs9kkazjg34mircd4nm4qmljyzjh2yh8icg3"; + })]; - cargoSha256 = "042dplm0cdxkv73m5qlkc61h0x9fpzxn2b0c8gjx2hwvigcia139"; + cargoSha256 = "1z2r8nfizifj8sk1ghppyqk5r65sgmbk47fiq95pnwpadm5drvqa"; meta = with lib; { description = "Write licenses to stdout"; diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index e3d8d15922d..2b5bb1989f4 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -10,10 +10,7 @@ rustPlatform.buildRustPackage { sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "19x8n39yaa924naldw6fv7mq9qb500arkhwj9jz2fsbhz5nz607r"; + cargoSha256 = "1ydd0sd4lvl6fdl4b13ncqcs03sbxb6v9dwfyqi64zihqzpblshv"; meta = with stdenv.lib; { description = "UNIX's missing `loop` command"; diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index c4175f77d05..7829a677b43 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/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index ae3b5723850..24006e5cbd9 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0fh5rz6slyjzz03bpjcl9gplk36vm7qcc0i0gvhsikwvw0cf3hym"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0377jbjkrrjss3w8xmjsjjynycpdk19grp20hffxschg4ryvniin"; + cargoSha256 = "1z7sg9b7qsjw1hhc7dkvxz8xgf4k8jddr7gbnjr4d2569g97jf3f"; preFixup = '' install -Dm644 -t $out/share/zsh/site-functions/ target/release/build/lsd-*/out/_lsd diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 168afc7efed..07c5f9b3517 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -15,18 +15,19 @@ , libssh2 , openssl , coreutils +, autoreconfHook }: stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.23"; + version = "4.8.24"; src = fetchurl { - url = "http://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx"; + url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; + sha256 = "0ikd2yql44p7nagmb08dmjqdwadclnvgr7ri9pmzc2s5f301r7w5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ file @@ -58,12 +59,12 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "File Manager and User Shell for the GNU Project"; - downloadPage = "http://www.midnight-commander.org/downloads/"; - homepage = "http://www.midnight-commander.org"; + downloadPage = "https://www.midnight-commander.org/downloads/"; + homepage = "https://www.midnight-commander.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; platforms = with platforms; linux ++ darwin; - repositories.git = git://github.com/MidnightCommander/mc.git; + repositories.git = "https://github.com/MidnightCommander/mc.git"; updateWalker = true; }; } diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index ee3d622a47a..e9ba1c3b5d1 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -17,10 +17,7 @@ rustPlatform.buildRustPackage rec { install -Dm644 -t $out/share/mcfly mcfly.bash ''; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1bf65kagvhsi6lg8187ihi5j45hkq9d8v6j7rzmmfhngdzvcfr69"; + cargoSha256 = "0r2zb59rpja9z7q0gsylqaq4vqm5rp57fy56ajjrm6k6z06nq7bv"; meta = with stdenv.lib; { homepage = https://github.com/cantino/mcfly; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 0231d4df923..9add75acee2 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -1,29 +1,26 @@ -{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib, openssl }: +{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkg-config, zlib, openssl }: rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "06cxkkf3sf84prba65dymr1hg7mwizmsax0dlljh0lcmvlcpzi08"; + sha256 = "0ybxnxjg0vqm4q60z4zjl3hfls0s2rvy44m6jgyhlj1p6cr3dbyw"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "046xxxqcf1sdsi9dlilsn0nk36gyca20ck1a70ihj1k9kl7yj8sn"; + cargoSha256 = "0ypxv9wqcnjxjdrvdparddpssrarnifr43dq7kcr4l3fd1anl40a"; RUSTC_BOOTSTRAP = 1; - nativeBuildInputs = [ cmake pkgconfig zlib ]; + nativeBuildInputs = [ cmake pkg-config zlib ]; buildInputs = [ openssl ]; meta = with stdenv.lib; { description = "For when you really just want to serve some files over HTTP right now!"; - homepage = https://github.com/svenstaro/miniserve; + homepage = "https://github.com/svenstaro/miniserve"; license = with licenses; [ mit ]; maintainers = with maintainers; [ nequissimus ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 9514ca18b9d..c029f38acb2 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -1,21 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: buildGoModule rec { pname = "mutagen"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "19rr2q7kfkivjj23vv3s249jifx9hipi3zwzr2550v9jb4372x1r"; + sha256 = "0ykzrxlllip4wvhd9rja5bcr2m72695fjj2q1scwn8ri6jcgfa19"; }; modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Make remote development work with your local tools"; homepage = "https://mutagen.io/"; changelog = "https://github.com/mutagen-io/mutagen/releases/tag/v${version}"; diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 5850c4a90af..a1a0c159bb4 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "neofetch"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "022xzn9jk18k2f4b6011d8jk5nbl84i3mw3inlz4q52p2hvk8fch"; + sha256 = "0xc0fdc7n5bhqirh83agqiy8r14l14zwca07czvj8vgnsnfybslr"; }; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast, highly customizable system info script"; - homepage = https://github.com/dylanaraps/neofetch; + homepage = "https://github.com/dylanaraps/neofetch"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ alibabzo konimex ]; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 9c5ffc260ff..58abf6f72f8 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1sgpai3gx3w7w3ilmbnmzgdxdim6klkfiqaqxmffpyap6qgksfqs"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1phv06zf47bv5cmhypivljfiynrblha0kj13c5al9l0hd1xx749h"; + cargoSha256 = "18z887mklynxpjci6va4i5zhg90j824avykym24vbz9w97nqpdd5"; buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index 94984c57e49..8cc5cd7f6f2 100644 --- a/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/pkgs/tools/misc/opentimestamps-client/default.nix @@ -4,7 +4,7 @@ buildPythonApplication rec { pname = "opentimestamps-client"; - version = "0.6.0"; + version = "0.7.0"; disabled = (!isPy3k); # We can't use the pypi source because it doesn't include README.md which is @@ -13,18 +13,9 @@ buildPythonApplication rec { owner = "opentimestamps"; repo = "opentimestamps-client"; rev = "opentimestamps-client-v${version}"; - sha256 = "05m8nllqad3k69mvby5q08y22i0wrj84gqifdgcldimrrn1i00xp"; + sha256 = "1aiq9cwr40md54swzm7wkwj0h65psxmvj2japvw79s9x0pp8iwqs"; }; - patches = [ - (fetchpatch { - url = "https://github.com/opentimestamps/opentimestamps-client/commit/1b328269ceee66916e9a639e8d5d7d13cd70d5d8.patch"; - sha256 = "0bd3yalyvk5n4sflw9zilpay5k653ybdgkkfppyrk7c8z3i81hbl"; - }) - ]; - - checkInputs = [ git ]; - propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ]; meta = { diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 4bc690bc45f..24a104dc974 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -37,13 +37,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2019.6"; + version = "2020.3"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "1bhrfbjna3rnymijxagzkdq2zl74g71s2xmimihjhvcw2zybi0jl"; + sha256 = "01cch4as23xspq6pck59al7x5jj60wl21g8p3iqbdxcjl1p3jxsq"; }; patches = [ @@ -52,12 +52,6 @@ in stdenv.mkDerivation rec { # Patch from https://github.com/ostreedev/ostree/pull/1633 ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch - # Fix tests running in Catalan instead of C locale. - (fetchpatch { - url = "https://github.com/ostreedev/ostree/commit/5135a1e58ade2bfafc8c1fda359540eafd72531e.patch"; - sha256 = "1crzaagw1zzx8v6rsnxb9jnc3ij9hlpvdl91w3skqdm28adx7yx8"; - }) - # Workarounds for https://github.com/ostreedev/ostree/issues/1592 ./fix-1592.patch @@ -119,9 +113,14 @@ in stdenv.mkDerivation rec { "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree" ]; - postFixup = '' + postFixup = let + typelibPath = stdenv.lib.makeSearchPath "/lib/girepository-1.0" [ + (placeholder "out") + gobject-introspection + ]; + in '' for test in $installedTests/libexec/installed-tests/libostree/*.js; do - wrapProgram "$test" --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0" + wrapProgram "$test" --prefix GI_TYPELIB_PATH : "${typelibPath}" done ''; diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix index b4f939da3c9..213e8c8e378 100644 --- a/pkgs/tools/misc/parallel-rust/default.nix +++ b/pkgs/tools/misc/parallel-rust/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1bb1m3ckkrxlnw9w24ig70bd1zwyrbaw914q3xz5yv43c0l6pn9c"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0ssawp06fidsppvfzk0balf4fink2vym9688r7k7x7pb2z7cvyqc"; + cargoSha256 = "1r5chjhmy6ivhsvgqf75ph1qxa4x7n20f7rb3b6maqpbsc64km9n"; patches = [ ./fix_cargo_lock_version.patch ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 32db897ae0f..77fdbcf8ac3 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,13 +1,15 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200122"; + name = "parallel-20200322"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "070cv3b1ja8lmn2a5h1ry6b5y35jpm4z5r9yv9nb5kd5im11wvqi"; + sha256 = "0kg95glnfg25i1w7qg2vr5v4671vigsazmz4qdf223l64khq8x10"; }; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl procps ]; @@ -37,7 +39,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/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index 89ffdde2974..dd64200e130 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0nqcp54nwv4ic5jc3cgg15rh8dgkixfgkwb5q47rv8ding4cd0j5"; + cargoSha256 = "0sja0q9i0b1zb3a0a6z561yg9lqykylwr3iwin4r6cmi7j2sw5j6"; meta = with stdenv.lib; { description = "An autojump \"zap to directory\" helper"; diff --git a/pkgs/tools/misc/peep/0001-Add-Cargo.lock-by-running-cargo-vendor.patch b/pkgs/tools/misc/peep/0001-Add-Cargo.lock-by-running-cargo-vendor.patch new file mode 100644 index 00000000000..f444d72c464 --- /dev/null +++ b/pkgs/tools/misc/peep/0001-Add-Cargo.lock-by-running-cargo-vendor.patch @@ -0,0 +1,570 @@ +From 153e9acd6fb50c50db5ebdd03303a42f56ec05e0 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Tue, 17 Mar 2020 23:14:36 +0100 +Subject: [PATCH] Add Cargo.lock by running `cargo vendor` + +--- + Cargo.lock | 551 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 551 insertions(+) + create mode 100644 Cargo.lock + +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..91f9100 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,551 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "aho-corasick" ++version = "0.7.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" ++ ++[[package]] ++name = "bytes" ++version = "0.4.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" ++dependencies = [ ++ "byteorder", ++ "iovec", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" ++dependencies = [ ++ "autocfg", ++ "cfg-if", ++ "lazy_static", ++] ++ ++[[package]] ++name = "ctrlc" ++version = "3.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a4ba686dff9fa4c1c9636ce1010b0cf98ceb421361b0bb3d6faeec43bd217a7" ++dependencies = [ ++ "nix 0.17.0", ++ "winapi 0.3.8", ++] ++ ++[[package]] ++name = "fnv" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++dependencies = [ ++ "bitflags", ++ "fuchsia-zircon-sys", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++ ++[[package]] ++name = "futures" ++version = "0.1.29" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" ++ ++[[package]] ++name = "getopts" ++version = "0.2.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "inotify" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718" ++dependencies = [ ++ "bitflags", ++ "futures", ++ "inotify-sys", ++ "libc", ++ "mio", ++ "tokio-io", ++ "tokio-reactor", ++] ++ ++[[package]] ++name = "inotify-sys" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "libc" ++version = "0.2.68" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" ++ ++[[package]] ++name = "lock_api" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" ++dependencies = [ ++ "scopeguard", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "maybe-uninit" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" ++ ++[[package]] ++name = "memchr" ++version = "2.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" ++ ++[[package]] ++name = "mio" ++version = "0.6.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" ++dependencies = [ ++ "cfg-if", ++ "fuchsia-zircon", ++ "fuchsia-zircon-sys", ++ "iovec", ++ "kernel32-sys", ++ "libc", ++ "log", ++ "miow", ++ "net2", ++ "slab", ++ "winapi 0.2.8", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" ++dependencies = [ ++ "kernel32-sys", ++ "net2", ++ "winapi 0.2.8", ++ "ws2_32-sys", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "winapi 0.3.8", ++] ++ ++[[package]] ++name = "nix" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "becb657d662f1cd2ef38c7ad480ec6b8cf9e96b27adb543e594f9cf0f2e6065c" ++dependencies = [ ++ "bitflags", ++ "cc", ++ "cfg-if", ++ "libc", ++ "void", ++] ++ ++[[package]] ++name = "nix" ++version = "0.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" ++dependencies = [ ++ "bitflags", ++ "cc", ++ "cfg-if", ++ "libc", ++ "void", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "numtoa" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" ++ ++[[package]] ++name = "parking_lot" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" ++dependencies = [ ++ "lock_api", ++ "parking_lot_core", ++ "rustc_version", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" ++dependencies = [ ++ "cfg-if", ++ "cloudabi", ++ "libc", ++ "redox_syscall", ++ "rustc_version", ++ "smallvec", ++ "winapi 0.3.8", ++] ++ ++[[package]] ++name = "peep" ++version = "0.1.4" ++dependencies = [ ++ "ctrlc", ++ "getopts", ++ "inotify", ++ "libc", ++ "mio", ++ "nix 0.11.1", ++ "regex", ++ "termion", ++ "termios", ++ "unicode-width", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++ ++[[package]] ++name = "redox_termios" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" ++dependencies = [ ++ "redox_syscall", ++] ++ ++[[package]] ++name = "regex" ++version = "1.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8900ebc1363efa7ea1c399ccc32daed870b4002651e0bed86e72d501ebbe0048" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++dependencies = [ ++ "semver", ++] ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++dependencies = [ ++ "semver-parser", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++ ++[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++ ++[[package]] ++name = "smallvec" ++version = "0.6.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" ++dependencies = [ ++ "maybe-uninit", ++] ++ ++[[package]] ++name = "termion" ++version = "1.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c22cec9d8978d906be5ac94bceb5a010d885c626c4c8855721a4dbd20e3ac905" ++dependencies = [ ++ "libc", ++ "numtoa", ++ "redox_syscall", ++ "redox_termios", ++] ++ ++[[package]] ++name = "termios" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++dependencies = [ ++ "lazy_static", ++] ++ ++[[package]] ++name = "tokio-executor" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" ++dependencies = [ ++ "crossbeam-utils", ++ "futures", ++] ++ ++[[package]] ++name = "tokio-io" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" ++dependencies = [ ++ "bytes", ++ "futures", ++ "log", ++] ++ ++[[package]] ++name = "tokio-reactor" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" ++dependencies = [ ++ "crossbeam-utils", ++ "futures", ++ "lazy_static", ++ "log", ++ "mio", ++ "num_cpus", ++ "parking_lot", ++ "slab", ++ "tokio-executor", ++ "tokio-io", ++ "tokio-sync", ++] ++ ++[[package]] ++name = "tokio-sync" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" ++dependencies = [ ++ "fnv", ++ "futures", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++ ++[[package]] ++name = "void" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] +-- +2.25.0 + diff --git a/pkgs/tools/misc/peep/default.nix b/pkgs/tools/misc/peep/default.nix new file mode 100644 index 00000000000..161ea3f75e6 --- /dev/null +++ b/pkgs/tools/misc/peep/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "peep"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "ryochack"; + repo = "peep"; + rev = "v${version}"; + sha256 = "0c0fphnhq9vg9jjnkl35k56jbcnyz2ballsnkbm2xrh8vbyvk1av"; + }; + + cargoPatches = [ ./0001-Add-Cargo.lock-by-running-cargo-vendor.patch ]; + cargoSha256 = "15qc9a4zpnq7lbcaji1mkik93qkx366misczbi1mipiq5w7sgn0l"; + + meta = with lib; { + description = "The CLI text viewer tool that works like less command on small pane within the terminal window"; + license = licenses.mit; + homepage = "https://github.com/ryochack/peep"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index a5ce018545a..26463112006 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/pfetch/default.nix b/pkgs/tools/misc/pfetch/default.nix index a858ad696af..49867331780 100644 --- a/pkgs/tools/misc/pfetch/default.nix +++ b/pkgs/tools/misc/pfetch/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "pfetch"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "pfetch"; rev = version; - sha256 = "180vvbmvak888vs4dgzlmqk0ss4qfsz09700n4p8s68j7krkxsfq"; + sha256 = "0yg9nlrjnm2404ysm2qp1klpq1wlmyih302kzfqchn6l2sibsm4j"; }; dontBuild = true; diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index 7cb810b2fe2..9eed1aaffd8 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "pgcenter"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { homepage = https://pgcenter.org/; description = "Command-line admin tool for observing and troubleshooting PostgreSQL"; diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index bfacb713567..04e106ca552 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -1,20 +1,24 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "pgmetrics"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "17rr6rjdxg8gdljf65zkn3bl1kmnlp2gkhiq7slxslh8n9iz4wjs"; + sha256 = "06w2kqjq2yq9yypg6biywrybnmi4jlnnigd7az72hp7lzf2nhl62"; }; - modSha256 = "0llbx2sgcx95ym2q4l3334rdj3nkgr9z5jyp8406cp3k1ixi7gdb"; + modSha256 = "0h375zk0ik06g0b5vmi00b1wn5q2c0r137f7qf6l8k8p886x41h6"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; meta = with stdenv.lib; { - homepage = https://pgmetrics.io/; + homepage = "https://pgmetrics.io/"; description = "Collect and display information and stats from a running PostgreSQL server"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index bdb86cbb802..00ed2db1073 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.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "00c5xgyn34psj538zrzql16z16532c9444vc5asg7qhrcylpqpk7"; + sha256 = "1c33c8aihsfdxaqkwy4isrvmjam5j5rdz98vv2apy73638vx3q04"; }; 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 b42be5b548c..0e9df5350f9 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.0"; + version = "1.2020.2"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1ibhyj51wib2d8q7zyjbzp65hqm0a1jczqwqdw3834zdmrb2v7bs"; + 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/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 10844fc30c2..df0d344afaa 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0rqlxxl58dpfvm2idhi0vzinraf4bgiapmawiih9wxs599fnhm3y"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1vdx5nwj4qmkb3rdgnchd9xixc5pmhvskvn6dmqgm91s41p2al1p"; + cargoSha256 = "0a41a6kgwgz4040c2369jldvk6xy6s6fkgayca0qy7hdwc4bcxdp"; nativeBuildInputs = [ pkgconfig file perl cmake curl ]; buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index c1496e0dbc9..9c07254e587 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, utillinux}: stdenv.mkDerivation rec { - version = "6.35"; + version = "6.36"; pname = "profile-sync-daemon"; src = fetchurl { url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "0hd3cjhf9nv4q5gvc8lbh5c82095lll7mxll1mj5hkzmnijzsf0v"; + sha256 = "0zw9fqpfiz1ld443cw2vp54y86maksmq4mnjs73nlp00nn5z2047"; }; installPhase = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { between the two. One of the major design goals of psd is a completely transparent user experience. ''; - homepage = https://github.com/graysky2/profile-sync-daemon; + homepage = "https://github.com/graysky2/profile-sync-daemon"; downloadPage = https://github.com/graysky2/profile-sync-daemon/releases; license = licenses.mit; maintainers = [ maintainers.prikhi ]; diff --git a/pkgs/tools/misc/rmtrash/default.nix b/pkgs/tools/misc/rmtrash/default.nix new file mode 100644 index 00000000000..073871b0f43 --- /dev/null +++ b/pkgs/tools/misc/rmtrash/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper +, trash-cli, coreutils, which, getopt }: + +stdenv.mkDerivation rec { + pname = "rmtrash"; + version = "1.13"; + + src = fetchFromGitHub { + owner = "PhrozenByte"; + repo = pname; + rev = "v${version}"; + sha256 = "04a9c65wnkq1fj8qhdsdbps88xjbp7rn6p27y25v47kaysvrw01j"; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + for f in rm{,dir}trash; do + install -D ./$f $out/bin/$f + wrapProgram $out/bin/$f \ + --prefix PATH : ${lib.makeBinPath [ trash-cli coreutils which getopt ]} + done + ''; + + meta = with lib; { + homepage = "https://github.com/PhrozenByte/rmtrash"; + description = "trash-put made compatible with GNUs rm and rmdir"; + longDescription = '' + Put files (and directories) in trash using the `trash-put` command in a + way that is, otherwise as `trash-put` itself, compatible to GNUs `rm` + and `rmdir`. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ peelz ]; + }; +} diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index 670d8c19382..71cb3d23beb 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1s59ra99wcyyqz8gzly4qmcq5rh22c50c75cdi2kyajm7ghgryy9"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0s4p4mpz1p5v9hr4flxlzqvc1b3zbqr3nxp1nxjw39ng9g3hplpg"; + cargoSha256 = "1nqzg5jnwvf6wiihi3wwrym3d6g0hsfaxcadhl95r3v4k35fn5qb"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/shell-hist/default.nix b/pkgs/tools/misc/shell-hist/default.nix index 19f69655bbf..fd30d0370d8 100644 --- a/pkgs/tools/misc/shell-hist/default.nix +++ b/pkgs/tools/misc/shell-hist/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage { sha256 = "0kc128xnnp1d56if70vfv0w3qnwhljhbnvzwwb7hfm3x2m0vqrqf"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1nqnkzwqk879qy1261g1gds668xz6islhzq7chzhilaqpmvf6039"; + cargoSha256 = "0mfgax937na351qvi5n6s1ql9136djqiydzyfyax4684sp3kp613"; meta = with lib; { description = "Inspect your shell history"; diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 550db58895d..1472b4ae72f 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,21 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "lotabout"; repo = pname; rev = "v${version}"; - sha256 = "0is6zymvy673f1g466i3ayi4jawdl7pm9l3cbdxcw32h3snbkgqp"; + sha256 = "0b0x389khdqyzdb6mwbf31wdfn8xila756hb11l555iwipl271ci"; }; outputs = [ "out" "vim" ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1dl530ac8i4wdw7lziskl7rhh3ak9ykcws3kpy64808kxg3b1jnz"; + cargoSha256 = "0xcsj8wprp9r6s7r2d2fnbicrc5pfnnx1gxyrq2qkj3rwr1q8ndg"; patchPhase = '' 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 338452e213c..152db99660c 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchFromGitHub, rustPlatform +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl , libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.36.1"; + version = "0.38.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "1ip6jfnlw0maabvihzbmmka453njnw1yf7hq3fd89l6dx57315m5"; + sha256 = "0qp3y2wcpj1r07v1r2y42zrzkl13j0vlinjx05gfmrmapcls41gi"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + + buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; postPatch = '' substituteInPlace src/utils.rs \ --replace "/bin/echo" "echo" ''; - cargoSha256 = "16wsd8z4cfb5pplwfvwgi5qawwv8c0aa220wnvphplmgz8cpq35r"; + cargoSha256 = "11492fv2isw2prfcgxq0wrbln1n6xdi9209cifjf25nnw2aq2csn"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix index 5e4b1bec1e6..aa8f9be38b6 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -1,25 +1,37 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, cacert, curl +{ stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, installShellFiles +, openssl +, cacert , Security }: rustPlatform.buildRustPackage rec { pname = "tealdeer"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "dbrgn"; repo = "tealdeer"; rev = "v${version}"; - sha256 = "1v9wq4k7k4lmdz6xy6kabchjpbx9lds20yh6va87shypdh9iva29"; + sha256 = "0l16qqkrya22nnm4j3dxyq4gb85i3c07p10s00bpqcvki6n6v6r8"; }; - cargoSha256 = "0rr9mqylcs3nb7wgilp810qia0rv2pnalyhh28q0wnqyz0kqfrzr"; + cargoSha256 = "0jvgcf493rmkrh85j0fkf8ffanva80syyxclzkvkrzvvwwj78b5l"; - buildInputs = [ openssl cacert curl ] + buildInputs = [ openssl cacert ] ++ (stdenv.lib.optional stdenv.isDarwin Security); - nativeBuildInputs = [ pkgconfig ]; - + nativeBuildInputs = [ installShellFiles pkg-config ]; + + postInstall = '' + installShellCompletion --bash --name tealdeer.bash bash_tealdeer + installShellCompletion --fish --name tealdeer.fish fish_tealdeer + installShellCompletion --zsh --name _tealdeer zsh_tealdeer + ''; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; # disable tests for now since one needs network diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index 88d437e56af..eca80cbcadf 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/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix index 7e5b0e7d736..a17994706bb 100644 --- a/pkgs/tools/misc/termplay/default.nix +++ b/pkgs/tools/misc/termplay/default.nix @@ -1,22 +1,18 @@ -{ rustPlatform, fetchFromGitHub, lib, makeWrapper, gst_all_1, libsixel }: +{ rustPlatform, fetchFromGitLab, lib, makeWrapper, gst_all_1, libsixel }: rustPlatform.buildRustPackage rec { pname = "termplay"; version = "2.0.6"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "jD91mZM2"; repo = "termplay"; rev = "v${version}"; - sha256 = "1w7hdqgqr1jgxid3k7f2j52wz31gv8bzr9rsm6xzp7nnihp6i45p"; }; cargoBuildFlags = ["--features" "bin"]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "15i7qid91awlk74n823im1n6isqanf4vlcal90n1w9izyddzs9j0"; + cargoSha256 = "0nxm2k8dx6nxyghvpw44wqfd1n65947v2wqxxvy641hin4d7xzma"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 4ac9b32b355..d67da78a300 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "thefuck"; - version = "3.29"; + version = "3.30"; src = fetchFromGitHub { owner = "nvbn"; repo = pname; rev = version; - sha256 = "1qhxwjjgrzpqrqjv7l2847ywpln76lyd6j8bl9gz2r6kl0fx2fqs"; + sha256 = "0fnf78956pwhb9cgv1jmgypnkma5xzflkivfrkfiadbgin848yfg"; }; propagatedBuildInputs = [ colorama decorator psutil pyte six ]; diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index c307c96199f..88c3c7cb425 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation { sha256 = "1xf8n6dqzvi6nr2asags12ijbj1lwk1hgl3s27vm2szib8ww07qn"; }; + patches = [ ./timidity-iA-Oj.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ alsaLib libjack2 ncurses ]; diff --git a/pkgs/tools/misc/timidity/timidity-iA-Oj.patch b/pkgs/tools/misc/timidity/timidity-iA-Oj.patch new file mode 100644 index 00000000000..9bb96413428 --- /dev/null +++ b/pkgs/tools/misc/timidity/timidity-iA-Oj.patch @@ -0,0 +1,14 @@ +Without this timidity -iA -Oj prints "Couldn't start JACK device (`j')" +and does not play MIDI. + +--- a/timidity/jack_a.c ++++ b/timidity/jack_a.c +@@ -513,6 +513,8 @@ static int actl_jack(int request, void *arg) + ringbuf_clear(&ctx->rbuf); + return 0; + ++ case PM_REQ_PLAY_START: ++ return 0; + } + return -1; + } diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index e5932d9e946..5a467dd626d 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -1,81 +1,126 @@ -{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, file, systemd, iw, rfkill -, hdparm, ethtool, inetutils , kmod, pciutils, smartmontools -, x86_energy_perf_policy, gawk, gnugrep, coreutils, utillinux -, checkbashisms, shellcheck -, enableRDW ? false, networkmanager -}: - -let - paths = lib.makeBinPath - ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools - x86_energy_perf_policy gawk gnugrep coreutils utillinux - ] - ++ lib.optional enableRDW networkmanager - ); - -in stdenv.mkDerivation rec { +{ stdenv +, lib +, checkbashisms +, coreutils +, ethtool +, fetchFromGitHub +, gawk +, gnugrep +, gnused +, hdparm +, iw +, kmod +, makeWrapper +, pciutils +, perl +, shellcheck +, smartmontools +, systemd +, utillinux +, x86_energy_perf_policy + # RDW only works with NetworkManager, and thus is optional with default off +, enableRDW ? false +, networkmanager +}: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.2.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - sha256 = "0vm31ca6kdak9xzwskz7a8hvdp67drfh2zcdwlz3260r8r2ypgg1"; + sha256 = "14fcnaz9pw534v4d8dddqq4wcvpf1kghr8zlrk62r5lrl46sp1p5"; }; - outRef = placeholder "out"; + # XXX: See patch files for relevant explanations. + patches = [ ./patches/fix-makefile-sed.patch ./patches/tlp-sleep-service.patch ]; + buildInputs = [ perl ]; + nativeBuildInputs = [ makeWrapper gnused ]; + + # XXX: While [1] states that DESTDIR should not be used, and that the correct + # variable to set is, in fact, PREFIX, tlp thinks otherwise. The Makefile for + # tlp concerns itself only with DESTDIR [2] (possibly incorrectly) and so we set + # that as opposed to PREFIX, despite what [1] says. + # + # [1]: https://github.com/NixOS/nixpkgs/issues/65718 + # [2]: https://github.com/linrunner/TLP/blob/ab788abf4936dfb44fbb408afc34af834230a64d/Makefile#L4-L46 makeFlags = [ - "DESTDIR=${outRef}" - "TLP_SBIN=${outRef}/bin" - "TLP_BIN=${outRef}/bin" - "TLP_TLIB=${outRef}/share/tlp" - "TLP_FLIB=${outRef}/share/tlp/func.d" - "TLP_ULIB=${outRef}/lib/udev" - "TLP_NMDSP=${outRef}/etc/NetworkManager/dispatcher.d" - "TLP_SHCPL=${outRef}/share/bash-completion/completions" - "TLP_MAN=${outRef}/share/man" - "TLP_META=${outRef}/share/metainfo" + "DESTDIR=${placeholder "out"}" "TLP_NO_INIT=1" - ]; + "TLP_WITH_ELOGIND=0" + "TLP_WITH_SYSTEMD=1" - nativeBuildInputs = [ makeWrapper file ]; - - buildInputs = [ perl ]; - - installTargets = [ "install-tlp" "install-man" ] ++ stdenv.lib.optional enableRDW "install-rdw"; - - checkInputs = [ - checkbashisms - shellcheck + "TLP_BIN=/bin" + "TLP_CONFDEF=/share/tlp/defaults.conf" + "TLP_FLIB=/share/tlp/func.d" + "TLP_MAN=/share/man" + "TLP_META=/share/metainfo" + "TLP_SBIN=/sbin" + "TLP_SHCPL=/share/bash-completion/completions" + "TLP_TLIB=/share/tlp" ]; - doCheck = true; + installTargets = [ "install-tlp" "install-man" ] + ++ lib.optionals enableRDW [ "install-rdw" "install-man-rdw" ]; + + # XXX: This is disabled because it's basically just noise since upstream + # itself does not seem to care about the zillion shellcheck errors. + doCheck = false; + checkInputs = [ checkbashisms shellcheck ]; checkTarget = [ "checkall" ]; - postInstall = '' - cp -r $out/$out/* $out - rm -rf $out/$(echo "$NIX_STORE" | cut -d "/" -f2) + postInstall = let + paths = lib.makeBinPath ( + [ + coreutils + ethtool + gawk + gnugrep + gnused + hdparm + iw + kmod + pciutils + perl + smartmontools + systemd + utillinux + x86_energy_perf_policy + ] ++ lib.optional enableRDW networkmanager + ); + in + '' + fixup_perl=( + $out/share/tlp/tlp-pcilist + $out/share/tlp/tlp-readconfs + $out/share/tlp/tlp-usblist + $out/share/tlp/tpacpi-bat + ) + for f in "''${fixup_perl[@]}"; do + wrapProgram "$f" --prefix PATH : "${paths}" + done - for i in $out/bin/* $out/lib/udev/tlp-* ${lib.optionalString enableRDW "$out/etc/NetworkManager/dispatcher.d/*"}; do - if file "$i" | grep -q Perl; then - # Perl script; use wrapProgram - wrapProgram "$i" \ - --prefix PATH : "${paths}" - else - # Bash script - sed -i '2iexport PATH=${paths}:$PATH' "$i" - fi - done - ''; + fixup_bash=( + $out/bin/* + $out/etc/NetworkManager/dispatcher.d/* + $out/lib/udev/tlp-* + $out/sbin/* + $out/share/tlp/func.d/* + $out/share/tlp/tlp-func-base + ) + for f in "''${fixup_bash[@]}"; do + sed -i '2iexport PATH=${paths}:$PATH' "$f" + done + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced Power Management for Linux"; - homepage = https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html; + homepage = + "https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html"; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar lovesegfault ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch b/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch new file mode 100644 index 00000000000..942c9a579f6 --- /dev/null +++ b/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch @@ -0,0 +1,46 @@ +commit c44347b3b813e209fff537b4d46d23430727a5e2 +Author: Bernardo Meurer <meurerbernardo@gmail.com> +Date: Tue Feb 25 21:27:39 2020 -0800 + + makefile: correctly sed paths + + The default Makefile for tlp makes a mess with catenating `DESTDIR` to + everything, but then not actualy using the catenated (_ prefixed) + variables to sed it's `.in` files. + + This patch makes sure that it correctly sets the paths, taking `DESTDIR` + in account where it makes sense (e.g. /bin where we want $out/bin) but + not where it doesn't (/etc/tlp.conf should be just that). + + The reason DESTDIR is used at all, as opposed to the more appropriate + PREFIX, is covered in the nix formula, and is (also) due to the Makefile + being a bit "different." + +diff --git a/Makefile b/Makefile +index b5af74e..95122df 100644 +--- a/Makefile ++++ b/Makefile +@@ -47,17 +47,17 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) + + SED = sed \ + -e "s|@TLPVER@|$(TLPVER)|g" \ +- -e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \ +- -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \ +- -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \ +- -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \ ++ -e "s|@TLP_SBIN@|$(_SBIN)|g" \ ++ -e "s|@TLP_TLIB@|$(_TLIB)|g" \ ++ -e "s|@TLP_FLIB@|$(_FLIB)|g" \ ++ -e "s|@TLP_ULIB@|$(_ULIB)|g" \ + -e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \ + -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \ +- -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \ ++ -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \ + -e "s|@TLP_CONF@|$(TLP_CONF)|g" \ + -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ + -e "s|@TLP_VAR@|$(TLP_VAR)|g" \ +- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g" ++ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g" + + INFILES = \ + tlp \ diff --git a/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch b/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch new file mode 100644 index 00000000000..b37c7280e38 --- /dev/null +++ b/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch @@ -0,0 +1,95 @@ +commit ca94cd56210067e2a55c1f413bd7713f7d338f9f +Author: Bernardo Meurer <meurerbernardo@gmail.com> +Date: Wed Feb 26 10:46:23 2020 -0800 + + tlp-sleep.service: reintroduce + + This patch reintroduces tlp-sleep as a systemd unit as opposed to a + systemd system-sleep hook script. This is due to the recommendation by + systemd itself to not use the hook scripts. As per the manual: + + > Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/ + > are intended for local use only and should be considered hacks. If + > applications want to react to system suspend/hibernation and resume, + > they should rather use the Inhibitor interface[1]. + +diff --git a/Makefile b/Makefile +index 95122df..0e9230a 100644 +--- a/Makefile ++++ b/Makefile +@@ -70,6 +70,7 @@ INFILES = \ + tlp.rules \ + tlp-readconfs \ + tlp-run-on \ ++ tlp-sleep.service \ + tlp.service \ + tlp-stat \ + tlp.upstart \ +@@ -99,7 +100,6 @@ SHFILES = \ + tlp-rdw-udev.in \ + tlp-rf.in \ + tlp-run-on.in \ +- tlp-sleep \ + tlp-sleep.elogind \ + tlp-stat.in \ + tlp-usb-udev.in +@@ -147,7 +147,7 @@ ifneq ($(TLP_NO_INIT),1) + endif + ifneq ($(TLP_WITH_SYSTEMD),0) + install -D -m 644 tlp.service $(_SYSD)/tlp.service +- install -D -m 755 tlp-sleep $(_SDSL)/tlp ++ install -D -m 644 tlp-sleep.service $(_SYSD)/tlp-sleep.service + endif + ifneq ($(TLP_WITH_ELOGIND),0) + install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep +@@ -204,7 +204,7 @@ uninstall-tlp: + rm $(_ULIB)/rules.d/85-tlp.rules + rm -f $(_SYSV)/tlp + rm -f $(_SYSD)/tlp.service +- rm -f $(_SDSL)/tlp-sleep ++ rm -f $(_SYSD)/tlp-sleep.service + rm -f $(_ELOD)/49-tlp-sleep + rm -f $(_SHCPL)/tlp-stat + rm -f $(_SHCPL)/bluetooth +diff --git a/tlp-sleep b/tlp-sleep +deleted file mode 100644 +index 3de85ce..0000000 +--- a/tlp-sleep ++++ /dev/null +@@ -1,11 +0,0 @@ +-#!/bin/sh +- +-# tlp - systemd suspend/resume hook +-# +-# Copyright (c) 2020 Thomas Koch <linrunner at gmx.net> and others. +-# This software is licensed under the GPL v2 or later. +- +-case $1 in +- pre) tlp suspend ;; +- post) tlp resume ;; +-esac +diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in +new file mode 100644 +index 0000000..4ac17bd +--- /dev/null ++++ b/tlp-sleep.service.in +@@ -0,0 +1,19 @@ ++# tlp - systemd suspend/resume service ++# ++# Copyright (c) 2020 Thomas Koch <linrunner at gmx.net> and others. ++# This software is licensed under the GPL v2 or later. ++ ++[Unit] ++Description=TLP suspend/resume ++Before=sleep.target ++StopWhenUnneeded=yes ++Documentation=https://linrunner.de/tlp ++ ++[Service] ++Type=oneshot ++RemainAfterExit=yes ++ExecStart=@TLP_SBIN@/tlp suspend ++ExecStop=@TLP_SBIN@/tlp resume ++ ++[Install] ++WantedBy=sleep.target diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 191d66a6de8..db1938160b3 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,22 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "3.9.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "0g9pb4f5skigyahv8kpx7wkvv625lvgnbqz6iq7j7wgixxf4nl1i"; + sha256 = "02rcgz1sklll0gpxjwb7y3jc6flzr4492qp72blra6a26qpb7vxp"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1y85hl7xl60vsj3ivm6pyd6bvk39wqg25bqxfx00r9myha94iqmd"; + cargoSha256 = "1kd4q2ddm5byf62xj923n140k9x89yf9yswwgsnvkbpvrnpl4mwj"; buildInputs = lib.optional stdenv.isDarwin Foundation; + # TODO: add manpage (topgrade.8) to postInstall on next update + meta = with lib; { description = "Upgrade all the things"; homepage = "https://github.com/r-darwish/topgrade"; diff --git a/pkgs/tools/misc/trac/default.nix b/pkgs/tools/misc/trac/default.nix index f41087ca3fd..1d0f9a5d828 100644 --- a/pkgs/tools/misc/trac/default.nix +++ b/pkgs/tools/misc/trac/default.nix @@ -16,12 +16,12 @@ buildPythonApplication rec { pname = "trac"; - version = "1.4"; + version = "1.4.1"; src = fetchPypi { inherit version; pname = "Trac"; - sha256 = "1cg51rg0vb9vf23wgn28z3szlxhwnxprj5m0mvibqyypi123bvx1"; + sha256 = "0d61ypn0j9wb8119bj3pj7s8swfjykdl0sz398p92k9bvxh4dayz"; }; prePatch = '' diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 6309cbc1961..9c58785e84e 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -14,10 +14,7 @@ rustPlatform.buildRustPackage { # too many impure/platform-dependent tests doCheck = false; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0qnpx2xhckb45q8cgn0xh31dg5k73hqp5mz5zg3micmg7as4b621"; + cargoSha256 = "186hwzdpy7j0gw7491qx02vy4di5md47hipf1xxi1qccvmcfghwh"; makeFlags = [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 2f8bb36990b..52eec555b16 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -19,10 +19,7 @@ python3Packages.buildPythonApplication rec { name = "${name}-native"; inherit src; sourceRoot = "source/rust"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1n1dxq3klsry5mmbfff2jv7ih8mr5zvpncrdgba6qs93wi77qi0y"; + cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d"; buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; }; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 2e01059b736..17e764698d5 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, rustPlatform , openssl, pkg-config, protobuf , Security, libiconv, rdkafka +, tzdata , features ? (if stdenv.isAarch64 @@ -10,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.7.2"; + version = "0.8.1"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "1r6pqljrl0cqz5x09p6bmf4h52h8m02pg05a09idj86v0c0q6bw3"; + sha256 = "0k15scvjcg2v4z80vq27yrn2wm50fp8xj8lga2czzs0zxhlv21nl"; }; - cargoSha256 = "1c742g7a4z5lhr991hxdhwk8h0d43r4vv5bxj80sf3lynyx60yzf"; + cargoSha256 = "1al8jzjxjhxwb5n1d52pvl59d11g0bdg2dcw8ir2nclya1w68f2w"; buildInputs = [ openssl pkg-config protobuf rdkafka ] ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ]; @@ -28,8 +29,7 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE="${protobuf}/include"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; - # skip tests, too -- they don't respect the rdkafka flag... - doCheck = false; + checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features},disable-resolv-conf -- --test-threads 1"; meta = with stdenv.lib; { description = "A high-performance logs, metrics, and events router"; diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index 2f665f19958..1696a54d0aa 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -15,10 +15,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace src/main.rs --replace /usr/share $out/share ''; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "04xx26ngz7hx7bv5g01q9h6dqa96xkx0xm3jb0qk6c3hp6500zpn"; + cargoSha256 = "1l34i7qalid9mlcbpqhbb2bxgn2ylb2lwki4c0hf4kkq646ql0n1"; postInstall = '' mkdir -p $out/share/${pname} diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix index 7e570d21f7a..f71151259c8 100644 --- a/pkgs/tools/misc/void/default.nix +++ b/pkgs/tools/misc/void/default.nix @@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec { # The tests are long-running and not that useful doCheck = false; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "03g7155jpg8k1ymk95m8rlhlszkxyq0rv32966n4gk5yziijvk4k"; + cargoSha256 = "0fnkcjxcsiw9j0ibh4z7zy0m6r5d84q5hvr2darwpckbn9ryrh3k"; meta = with stdenv.lib; { description = "Terminal-based personal organizer"; diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index 0aa51363ff8..38fedbbf099 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20190710"; + version = "20200303"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "00v3a94vpmbdziizdw2dj4bfwzfzfs2lc0ijxv98ln1w01w412q4"; + sha256 = "1g27yp37kh57hmwicw3ndnsapsbqzk2cnjccmvyj4zw2z0l5iaj9"; }; meta = with stdenv.lib; { description = "Tests the compatibility so-called 'VT100-compatible' terminals"; - homepage = https://invisible-island.net/vttest/; + homepage = "https://invisible-island.net/vttest/"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 68527ebebb4..4e0e9193fe7 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/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 26fc7107d41..eede909ddce 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "03s9nsss4895x4lp90y65jajavk8c2nj1jjnmx0vbbwl210ghlv1"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "07whi9w51ddh8s7v06c3k6n5q9gfx74rdkhgfysi180y2rgnbanj"; + cargoSha256 = "0p20d7paiafvl4k9iiazbgq75wk7k42sz2h1y5lalq16f5rp6dbp"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 003932551ef..14617f207db 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoBuildFlags = [ "--features=ssl" ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "163kwpahrbb9v88kjkrc0jx2np3c068pspr8rqrm9cb8jyl2njrr"; + cargoSha256 = "09chj0bgf4r8v5cjq0hvb84zvh98nrzrh1m0wdqjy5gi7zc30cis"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/wev/default.nix b/pkgs/tools/misc/wev/default.nix index fa69cc4445e..0f033d1c7e2 100644 --- a/pkgs/tools/misc/wev/default.nix +++ b/pkgs/tools/misc/wev/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchurl -, pkg-config, scdoc -, wayland, wayland-protocols, libxkbcommon +, pkg-config, scdoc, wayland +, wayland-protocols, libxkbcommon }: -let - version = "2019-08-11"; - commit = "47d17393473be152cf601272faf5704fff1c3f92"; -in stdenv.mkDerivation { - pname = "wev-unstable"; - inherit version; +stdenv.mkDerivation rec { + pname = "wev"; + version = "1.0.0"; src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/wev/archive/${commit}.tar.gz"; - sha256 = "0a5kvrviz77bf7357gqs2iy7a1bvb3izgkmiv1rdxzzmihd563ga"; + url = "https://git.sr.ht/~sircmpwn/wev/archive/${version}.tar.gz"; + sha256 = "0vlxdkb59v6nb10j28gh1a56sx8jk7ak7liwzv911kpmygnls03g"; }; - nativeBuildInputs = [ pkg-config scdoc ]; - buildInputs = [ wayland wayland-protocols libxkbcommon ]; + nativeBuildInputs = [ pkg-config scdoc wayland ]; + buildInputs = [ wayland-protocols libxkbcommon ]; installFlags = [ "PREFIX=$(out)" ]; @@ -26,7 +23,7 @@ in stdenv.mkDerivation { This is a tool for debugging events on a Wayland window, analagous to the X11 tool xev. ''; - homepage = https://git.sr.ht/~sircmpwn/wev; + homepage = "https://git.sr.ht/~sircmpwn/wev"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/misc/wob/default.nix index c3b3cd11239..d9ea0648ebe 100644 --- a/pkgs/tools/misc/wob/default.nix +++ b/pkgs/tools/misc/wob/default.nix @@ -1,21 +1,24 @@ { stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland # wayland-scanner -, wayland-protocols +, wayland-protocols, libseccomp }: stdenv.mkDerivation rec { pname = "wob"; - version = "0.6"; + version = "0.8"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "0cfglwh1inv6ng55vgznhll51m9g1lxfh37k4ridyxl64rc9jfq8"; + sha256 = "0gzqc75wjm3yj81rm03zkp5lvsmlhhp79qlz85yyan1gcz5spdb6"; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; - buildInputs = [ wayland-protocols ]; + buildInputs = [ wayland-protocols ] + ++ stdenv.lib.optional stdenv.isLinux libseccomp; + + mesonFlags = stdenv.lib.optional stdenv.isLinux "-Dseccomp=enabled"; meta = with stdenv.lib; { description = "A lightweight overlay bar for Wayland"; @@ -24,6 +27,7 @@ stdenv.mkDerivation rec { inspired by xob. ''; inherit (src.meta) homepage; + changelog = "https://github.com/francma/wob/releases/tag/${version}"; license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix new file mode 100644 index 00000000000..e88322f7f75 --- /dev/null +++ b/pkgs/tools/misc/wootility/default.nix @@ -0,0 +1,32 @@ +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3, udev, wooting-udev-rules }: + +let + pname = "wootility"; + version = "3.3.3"; +in +appimageTools.wrapType2 rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/wootility-${version}.AppImage"; + sha256 = "1qdiacwnvqahqkrhwnblz0jjywn63c6ndl3z450myhx5x55fdcja"; + }; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" + ''; + + multiPkgs = extraPkgs; + extraPkgs = + pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ udev wooting-udev-rules ]); + extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + + meta = with lib; { + homepage = https://wooting.io/wootility; + description = "Wootility is customization and management software for Wooting keyboards."; + platforms = [ "x86_64-linux" ]; + license = "unknown"; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix index 270b39f8110..ac13f41ef9f 100644 --- a/pkgs/tools/misc/x11idle/default.nix +++ b/pkgs/tools/misc/x11idle/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, libXScrnSaver, libX11 }: +{ stdenv, fetchurl, libXScrnSaver, libX11 }: -stdenv.mkDerivation { - name = "x11idle-unstable-2017-07-01"; +stdenv.mkDerivation rec { - src = fetchgit { - url = "git://orgmode.org/org-mode.git"; - rev = "fbd865941f3105f689f78bf053bb3b353b9b8a23"; - sha256 = "0ma3m48f4s38xln0gl1ww9i5x28ij0ipxc94kx5h2931zy7lqzvz"; + version = "9.2.4"; + name = "x11idle-org-${version}"; + + src = fetchurl { + url = "https://code.orgmode.org/bzg/org-mode/raw/release_${version}/contrib/scripts/x11idle.c"; + sha256 = "0fc5g57xd6bmghyl214gcff0ni3idv33i3gkr339kgn1mdjljv5g"; }; buildInputs = [ libXScrnSaver libX11 ]; @@ -15,7 +16,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin - gcc -lXss -lX11 $src/contrib/scripts/x11idle.c -o $out/bin/x11idle + gcc -lXss -lX11 $src -o $out/bin/x11idle ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/xv/default.nix b/pkgs/tools/misc/xxv/default.nix index bbf966d1c1f..6b20c39b185 100644 --- a/pkgs/tools/misc/xv/default.nix +++ b/pkgs/tools/misc/xxv/default.nix @@ -7,20 +7,17 @@ let useNcurses = !stdenv.hostPlatform.isWindows; in assert useNcurses -> ncurses != null; rustPlatform.buildRustPackage rec { - pname = "xv"; - version = "0.1.1"; + pname = "xxv"; + version = "0.1.2"; src = fetchFromGitHub { owner = "chrisvest"; repo = pname; rev = version; - sha256 = "0x2yd21sr4wik3z22rknkx1fgb64j119ynjls919za8gd83zk81g"; + sha256 = "0ppfsgdigza2jppbkg4qanjhlkpnq7p115c4471vc6vpikpfrlk3"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0m69pcmnx3c3q7lgvbhxc8dl6lavv5ch4r6wg2bhdmapcmb4p7jq"; + cargoSha256 = "1gnyig87a0yqgkng52fpn6hv629vym6k7ydljnxrhb5phmj2qbqx"; buildInputs = lib.optionals useNcurses [ ncurses ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]) @@ -33,10 +30,10 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A visual hex viewer for the terminal"; longDescription = '' - XV is a terminal hex viewer with a text user interface, written in 100% safe Rust. + XXV is a terminal hex viewer with a text user interface, written in 100% safe Rust. ''; - homepage = https://chrisvest.github.io/xv/; - license = with licenses; [ asl20 ]; + homepage = "https://chrisvest.github.io/xxv/"; + license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ lilyball ]; platforms = platforms.all; }; diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 776b41ac1aa..d6b1b423ae2 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/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 466813ee75f..ab1a3e66825 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1403"; + version = "0.4.1410"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,12 +10,12 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "195c91xxcv3l3rd0v8ls5ghncf92ndfx0lpcbjr5zb41bl8alkcl"; + sha256 = "0isjmx1z5w3m2v25sb7fpi7lyd4h8bl9n9691ylvl5w3bxf6ynm9"; }; meta = with stdenv.lib; { description = "A tiny command line utility to download media contents from the web"; - homepage = https://you-get.org; + homepage = "https://you-get.org"; license = licenses.mit; maintainers = with maintainers; [ ryneeverett ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1fc8acdda2c..7b58ccfa853 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -10,7 +10,7 @@ , rtmpSupport ? true , phantomjsSupport ? false , hlsEncryptedSupport ? true -, makeWrapper }: +, installShellFiles, makeWrapper }: buildPythonPackage rec { @@ -18,14 +18,14 @@ 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.24"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1ip0p7gifwmkls8ppfvz89j1lh82dg60zmvabj8njnhj170ikkdb"; + sha256 = "05l4asakakxn53wrvxn6c03fd80zdizdbj6r2cj8c1ja3sj9i8s5"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ zip ] ++ lib.optional generateManPage pandoc; propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome; @@ -46,16 +46,14 @@ buildPythonPackage rec { ]; postInstall = '' - mkdir -p $out/share/zsh/site-functions - cp youtube-dl.zsh $out/share/zsh/site-functions/_youtube-dl + installShellCompletion youtube-dl.zsh ''; # Requires network doCheck = false; meta = with lib; { - homepage = https://rg3.github.io/youtube-dl/; - repositories.git = https://github.com/rg3/youtube-dl.git; + homepage = "https://ytdl-org.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 diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index f081f94a147..39150cfed7e 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }: +{ stdenv, fetchurl, pkgconfig, openssl, check, pcsclite, PCSC +, withApplePCSC ? stdenv.isDarwin +}: stdenv.mkDerivation rec { name = "yubico-piv-tool-2.0.0"; @@ -9,9 +11,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl pcsclite check ]; + buildInputs = [ openssl check ] + ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); - configureFlags = [ "--with-backend=pcsc" ]; + configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ]; meta = with stdenv.lib; { homepage = https://developers.yubico.com/yubico-piv-tool/; diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index 171c86e805b..7d8e760a8d9 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.7.4"; + version = "1.8.4"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; - rev = "v${version}"; - sha256 = "0cn38sadcn65pgw6dgr59bnx9hf97011hydmpmfi3kzdqjmarwci"; + rev = version; + sha256 = "1whh2gzxhx4c24mwh5yifnpah56bzb6v7barp727pjw4whpflg1s"; }; dontBuild = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/skywind3000/z.lua; + homepage = "https://github.com/skywind3000/z.lua"; description = "A new cd command that helps you navigate faster by learning your habits"; license = licenses.mit; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix index d2157388512..74e7e7223d1 100644 --- a/pkgs/tools/misc/zabbix-cli/default.nix +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -4,7 +4,7 @@ let in pythonPackages.buildPythonApplication rec { pname = "zabbix-cli"; - version = "2.1.1"; + version = "2.2.1"; propagatedBuildInputs = with pythonPackages; [ ipaddr requests ]; @@ -17,7 +17,7 @@ in pythonPackages.buildPythonApplication rec { owner = "usit-gd"; repo = "zabbix-cli"; rev = version; - sha256 = "10a1cvjqwlqqfz52ajv9i53h6v95w8y7xmgqr79q2c4v1nz5bfks"; + sha256 = "0wzmrn8p09ksqhhgawr179c4az7p2liqr0l4q2dra62bxliawyqz"; }; meta = with lib; { diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix new file mode 100644 index 00000000000..9502af65201 --- /dev/null +++ b/pkgs/tools/misc/zoxide/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform, fzf }: + +rustPlatform.buildRustPackage rec { + pname = "zoxide"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "ajeetdsouza"; + repo = "zoxide"; + rev = "v${version}"; + sha256 = "0s6aax6bln9jmmv7kw630mj0l6qpvdx8mdk3a5d9akr9d23zxmr5"; + }; + + buildInputs = [ + fzf + ]; + + cargoSha256 = "1gzpkf7phl5xd666l7pc25917x4qq0kkxk4i9dkz3lvxz3v8ylrz"; + + meta = with stdenv.lib; { + description = "A fast cd command that learns your habits"; + homepage = "https://github.com/ajeetdsouza/zoxide"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ysndr cole-h ]; + platforms = platforms.all; + }; +} |