diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-01-24 04:09:15 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-01-24 04:13:11 +0100 |
| commit | 1316a83f43506a7d0b79913bbb101fba49887bf1 (patch) | |
| tree | ec9ba17ddc9fdf32d18378db205652eb4b27cf95 /pkgs/tools/misc | |
| parent | c1801065f4458ec0a320c074ad48781956eb9093 (diff) | |
| download | nixpkgs-1316a83f43506a7d0b79913bbb101fba49887bf1.tar nixpkgs-1316a83f43506a7d0b79913bbb101fba49887bf1.tar.gz nixpkgs-1316a83f43506a7d0b79913bbb101fba49887bf1.tar.bz2 nixpkgs-1316a83f43506a7d0b79913bbb101fba49887bf1.tar.lz nixpkgs-1316a83f43506a7d0b79913bbb101fba49887bf1.tar.xz nixpkgs-1316a83f43506a7d0b79913bbb101fba49887bf1.tar.zst nixpkgs-1316a83f43506a7d0b79913bbb101fba49887bf1.zip | |
onefetch: 2.10.2 -> 2.11.0
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/onefetch/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/tools/misc/onefetch/zstd-pkg-config.patch | 31 |
2 files changed, 43 insertions, 4 deletions
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 = [] |