diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-24 12:01:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-24 12:01:16 +0000 |
| commit | 6fee71d3392affde34cc92dbce530fe8133c6e73 (patch) | |
| tree | ed28d868fe863628924c21842389c79e0a80ab36 /pkgs/tools/misc | |
| parent | 4bde5a3a68d8d7095017f57c831b6f9540848e16 (diff) | |
| parent | e7dbfd7ece0e8f11ef0617919cc5597258eda90f (diff) | |
| download | nixpkgs-6fee71d3392affde34cc92dbce530fe8133c6e73.tar nixpkgs-6fee71d3392affde34cc92dbce530fe8133c6e73.tar.gz nixpkgs-6fee71d3392affde34cc92dbce530fe8133c6e73.tar.bz2 nixpkgs-6fee71d3392affde34cc92dbce530fe8133c6e73.tar.lz nixpkgs-6fee71d3392affde34cc92dbce530fe8133c6e73.tar.xz nixpkgs-6fee71d3392affde34cc92dbce530fe8133c6e73.tar.zst nixpkgs-6fee71d3392affde34cc92dbce530fe8133c6e73.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/nncp/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/onefetch/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/tools/misc/onefetch/zstd-pkg-config.patch | 31 |
3 files changed, 45 insertions, 6 deletions
diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix index 13984228897..8008ffe7706 100644 --- a/pkgs/tools/misc/nncp/default.nix +++ b/pkgs/tools/misc/nncp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "nncp"; - version = "8.2.0"; + version = "8.3.0"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; - sha256 = "sha256-WbDW4kjTAokpOVtjXU4M8RS8TeD0+fEFLgSShJgO6t0="; + sha256 = "sha256-bBSIep72htYRLyCW7R2la6q+X+tLqSVziazGsm0KI+o="; }; nativeBuildInputs = [ go redo-apenwarr ]; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 6e7484a7e40..860a9758d4f 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -3,6 +3,8 @@ , lib , stdenv , fetchpatch +, pkg-config +, zstd , CoreFoundation , libiconv , libresolv @@ -11,18 +13,24 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.10.2"; + version = "2.11.0"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lrRp01ZeK9bGn7L7SqAxJAU9qugpHnC06CWChhVPGGQ="; + sha256 = "sha256-16oiZAyj6haBk6mgUT25pPDUrCMd7pGo2kAQ0gTe2kM="; }; - cargoSha256 = "sha256-vNa1OF1x/MCTo9B4DTDZNWyHTsOl7Za3EgjnpsL/gWg="; + # enable pkg-config feature of zstd + cargoPatches = [ ./zstd-pkg-config.patch ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ]; + cargoSha256 = "sha256-6wnfn33mfye5o/vY1JQX1Lc4+jzHiKKgGsSLxeJWyFc="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ zstd ] + ++ lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ]; meta = with lib; { description = "Git repository summary on your terminal"; diff --git a/pkgs/tools/misc/onefetch/zstd-pkg-config.patch b/pkgs/tools/misc/onefetch/zstd-pkg-config.patch new file mode 100644 index 00000000000..0ad7542bca6 --- /dev/null +++ b/pkgs/tools/misc/onefetch/zstd-pkg-config.patch @@ -0,0 +1,31 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 202cda0..bc864cc 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -872,6 +872,7 @@ dependencies = [ + "tokei", + "toml", + "yaml-rust", ++ "zstd-sys", + ] + + [[package]] +@@ -1678,4 +1679,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" + dependencies = [ + "cc", + "libc", ++ "pkg-config", + ] +diff --git a/Cargo.toml b/Cargo.toml +index 8e0b5ff..48959b4 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -57,6 +57,8 @@ libc = "0.2.112" + [dev-dependencies] + more-asserts = "0.2" + paste = "1.0.6" ++# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library ++zstd-sys = { version = "1", features = [ "pkg-config" ] } + + [features] + fail-on-deprecated = [] |