onefetch: 2.12.0 -> 2.13.2

This commit is contained in:
Sandro Jäckel 2022-10-30 22:01:11 +01:00
parent f5a573fc29
commit f237e2b83e
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 12 additions and 39 deletions

View File

@ -2,6 +2,7 @@
, rustPlatform
, lib
, stdenv
, cmake
, pkg-config
, zstd
, CoreFoundation
@ -12,27 +13,30 @@
rustPlatform.buildRustPackage rec {
pname = "onefetch";
version = "2.12.0";
version = "2.13.2";
src = fetchFromGitHub {
owner = "o2sh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nSvqAXzA/4CSnOMCZri2ks58bW+9v+SoyIIzb+K5S88=";
sha256 = "sha256-ydRdnzOI9syfF2ox9vHA9Q0j8C7ZNb0b7CJfqUprPA0=";
};
cargoPatches = [
# enable pkg-config feature of zstd
./zstd-pkg-config.patch
];
cargoSha256 = "sha256-uSef6x5QkXKwajglbwyoIsUFGbz0zntVM1ko0FZqnck=";
cargoSha256 = "sha256-rZC1CAEWx8l1EQNRs1KAfVgGgBut1hxg6Ug4780O3dw=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ zstd ]
++ lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ];
checkInputs = [
cmake
];
checkFlags = [
"--skip=info::tests::test_style_subtitle"
];
meta = with lib; {
description = "Git repository summary on your terminal";
homepage = "https://github.com/o2sh/onefetch";

View File

@ -1,31 +0,0 @@
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.7"
+# 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 = []