From 075dc2851fa1ec593cd83e0806b8a04ac7a6003a Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 11 Oct 2024 17:52:53 -0400 Subject: [PATCH] rcodesign: 0.22.0 -> 0.27.0 https://github.com/indygreg/apple-platform-rs/releases/tag/apple-codesign%2F0.23.0 https://github.com/indygreg/apple-platform-rs/releases/tag/apple-codesign%2F0.24.0 https://github.com/indygreg/apple-platform-rs/releases/tag/apple-codesign%2F0.25.0 https://github.com/indygreg/apple-platform-rs/releases/tag/apple-codesign%2F0.26.0 https://github.com/indygreg/apple-platform-rs/releases/tag/apple-codesign%2F0.27.0 --- pkgs/development/tools/rcodesign/default.nix | 13 +++-- .../update-time-rs-in-cargo-lock.patch | 47 +++++++++++++++++++ 2 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/tools/rcodesign/update-time-rs-in-cargo-lock.patch diff --git a/pkgs/development/tools/rcodesign/default.nix b/pkgs/development/tools/rcodesign/default.nix index a110611ab4a9..15636a651437 100644 --- a/pkgs/development/tools/rcodesign/default.nix +++ b/pkgs/development/tools/rcodesign/default.nix @@ -7,20 +7,25 @@ rustPlatform.buildRustPackage rec { pname = "rcodesign"; - version = "0.22.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "indygreg"; repo = "apple-platform-rs"; rev = "apple-codesign/${version}"; - hash = "sha256-ndbDBGtTOfHHUquKrETe4a+hB5Za9samlnXwVGVvWy4="; + hash = "sha256-F6Etl3Zbpmh3A/VeCcSXIy3W1WYFg8WUSJBJV/akCxU="; }; - cargoHash = "sha256-cpQBdxTw/ge4VtzjdL2a2xgSeCT22fMIjuKu5UEedhI="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; + cargoPatches = [ + # Update time to a version that is compatible with Rust 1.80 + ./update-time-rs-in-cargo-lock.patch + ]; + + cargoHash = "sha256-VrexypkCW58asvzXo3wj/Rgi72tiGuchA31BkEZoYpI="; + cargoBuildFlags = [ # Only build the binary we want diff --git a/pkgs/development/tools/rcodesign/update-time-rs-in-cargo-lock.patch b/pkgs/development/tools/rcodesign/update-time-rs-in-cargo-lock.patch new file mode 100644 index 000000000000..892c5c2ae402 --- /dev/null +++ b/pkgs/development/tools/rcodesign/update-time-rs-in-cargo-lock.patch @@ -0,0 +1,47 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 3a5dd6d244..787b048829 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2257,6 +2257,12 @@ + ] + + [[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ ++[[package]] + name = "num-integer" + version = "0.1.45" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -3605,12 +3611,13 @@ + + [[package]] + name = "time" +-version = "0.3.31" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", + "powerfmt", + "serde", + "time-core", +@@ -3625,10 +3632,11 @@ + + [[package]] + name = "time-macros" +-version = "0.2.16" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] +