diff options
| author | Donovan Glover <donovan@dglover.co> | 2024-12-03 18:23:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-03 18:23:22 +0000 |
| commit | 5f708cb9c039c5af56f9455922318cc4d9bf8ae4 (patch) | |
| tree | 9f1a92070def970cd3e8349a96f52786180ec3de | |
| parent | gerrit: 3.10.3 -> 3.11.0 (#361332) (diff) | |
| parent | rcodesign: 0.27.0 -> 0.28.0 (diff) | |
| download | nixpkgs-5f708cb9c039c5af56f9455922318cc4d9bf8ae4.tar.gz | |
rcodesign: 0.27.0 -> 0.28.0 (#356104)
| -rw-r--r-- | pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch | 19 | ||||
| -rw-r--r-- | pkgs/by-name/rc/rcodesign/package.nix | 13 | ||||
| -rw-r--r-- | pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch | 47 |
3 files changed, 3 insertions, 76 deletions
diff --git a/pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch b/pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch deleted file mode 100644 index 5d134bd71165..000000000000 --- a/pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/apple-codesign/src/cli/mod.rs b/apple-codesign/src/cli/mod.rs -index 53e9649271..82d4d061a6 100644 ---- a/apple-codesign/src/cli/mod.rs -+++ b/apple-codesign/src/cli/mod.rs -@@ -2499,9 +2499,11 @@ - _ => LevelFilter::Trace, - }; - -- let mut builder = env_logger::Builder::from_env( -- env_logger::Env::default().default_filter_or(log_level.as_str()), -- ); -+ let mut builder = env_logger::Builder::new(); -+ -+ builder -+ .filter_level(log_level) -+ .parse_default_env(); - - // Disable log context except at higher log levels. - if log_level <= LevelFilter::Info { diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix index b96258cf1672..c4e2f601a193 100644 --- a/pkgs/by-name/rc/rcodesign/package.nix +++ b/pkgs/by-name/rc/rcodesign/package.nix @@ -8,28 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "rcodesign"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "indygreg"; repo = "apple-platform-rs"; rev = "apple-codesign/${version}"; - hash = "sha256-F6Etl3Zbpmh3A/VeCcSXIy3W1WYFg8WUSJBJV/akCxU="; + hash = "sha256-xyjq5mdc29OwzlUAQZWSg1k68occ81i7KBGUiiq0ke0="; }; - cargoPatches = [ - # Update time to a version that is compatible with Rust 1.80 - ./update-time-rs-in-cargo-lock.patch - ]; - patches = [ - # Fix rcodesign’s verbosity level to set the logging level as intended. Needed for cli_tests. - ./fix-verbosity-level.patch # Disable cli_tests test that requires network access. ./disable-sign-for-notarization-test.patch ]; - cargoHash = "sha256-VrexypkCW58asvzXo3wj/Rgi72tiGuchA31BkEZoYpI="; + cargoHash = "sha256-xMhyKovXoBPZp6epWQ+CYODpyvHgpv6eZfdWPTuDnK8="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; diff --git a/pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch b/pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch deleted file mode 100644 index 892c5c2ae402..000000000000 --- a/pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch +++ /dev/null @@ -1,47 +0,0 @@ -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", - ] - |
