diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index d5e77d4461d..18b58548202 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -2,7 +2,6 @@ , rustPlatform , lib , stdenv -, fetchpatch , pkg-config , zstd , CoreFoundation @@ -13,26 +12,21 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-16oiZAyj6haBk6mgUT25pPDUrCMd7pGo2kAQ0gTe2kM="; + sha256 = "sha256-nSvqAXzA/4CSnOMCZri2ks58bW+9v+SoyIIzb+K5S88="; }; cargoPatches = [ # enable pkg-config feature of zstd ./zstd-pkg-config.patch - # fix flaky test - (fetchpatch { - url = "https://github.com/o2sh/onefetch/commit/2c1f2f0b2c666f6ce94af0299f88048dd1d83484.patch"; - sha256 = "sha256-pI3yCFYkqOmLgKnCwexv1LcCrCkhi44zhEAx0szaMkg="; - }) ]; - cargoSha256 = "sha256-6wnfn33mfye5o/vY1JQX1Lc4+jzHiKKgGsSLxeJWyFc="; + cargoSha256 = "sha256-uSef6x5QkXKwajglbwyoIsUFGbz0zntVM1ko0FZqnck="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/onefetch/zstd-pkg-config.patch b/pkgs/tools/misc/onefetch/zstd-pkg-config.patch index 0ad7542bca6..24b95f1ca18 100644 --- a/pkgs/tools/misc/onefetch/zstd-pkg-config.patch +++ b/pkgs/tools/misc/onefetch/zstd-pkg-config.patch @@ -23,7 +23,7 @@ index 8e0b5ff..48959b4 100644 @@ -57,6 +57,8 @@ libc = "0.2.112" [dev-dependencies] more-asserts = "0.2" - paste = "1.0.6" + 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" ] }