From 1c4e970c152b33e813ede5951a1a2b8e930e30d9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 26 Jan 2023 14:55:51 -0500 Subject: [PATCH] crabz: 0.7.10 -> 0.8.1 Diff: https://github.com/sstadick/crabz/compare/v0.7.10...v0.8.1 Changelog: https://github.com/sstadick/crabz/blob/v0.8.1/CHANGELOG.md --- pkgs/tools/compression/crabz/default.nix | 25 +++--------------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/compression/crabz/default.nix b/pkgs/tools/compression/crabz/default.nix index c4d9e06e4c8a..b68d3af1a844 100644 --- a/pkgs/tools/compression/crabz/default.nix +++ b/pkgs/tools/compression/crabz/default.nix @@ -2,42 +2,23 @@ , rustPlatform , fetchFromGitHub , cmake -, stdenv -, libiconv -, CoreFoundation -, Security }: rustPlatform.buildRustPackage rec { pname = "crabz"; - version = "0.7.10"; + version = "0.8.1"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A1mjnGnFKgCdwr2J0MBUzpL/UI9nOHDxbrZ9UazqZik="; + sha256 = "sha256-w/e0NFmBsYNEECT+2zHEm/UUpp5LxPYr0BdKikT2o1M="; }; - cargoSha256 = "sha256-YxO0YPY82Q6dXOBs2ZoSAv14p67kNsmhGOiwt+voD5I="; + cargoSha256 = "sha256-9VOJeRvyudZSCaUZ1J9gHMEoWXEnEhCZPxvfYGRKzj0="; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ - libiconv - CoreFoundation - Security - ]; - - # link System as a dylib instead of a framework on macos - postPatch = lib.optionalString stdenv.isDarwin '' - core_affinity=../$(stripHash $cargoDeps)/core_affinity - oldHash=$(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1) - substituteInPlace $core_affinity/src/lib.rs --replace framework dylib - substituteInPlace $core_affinity/.cargo-checksum.json \ - --replace $oldHash $(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1) - ''; - meta = with lib; { description = "A cross platform, fast, compression and decompression tool"; homepage = "https://github.com/sstadick/crabz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b51ff09d281..7e38094e0354 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5936,9 +5936,7 @@ with pkgs; cpuminer = callPackage ../tools/misc/cpuminer { }; - crabz = callPackage ../tools/compression/crabz { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; + crabz = callPackage ../tools/compression/crabz { }; ethash = callPackage ../development/libraries/ethash { };