diff options
| author | Jonas Heinrich <onny@project-insanity.org> | 2023-01-17 23:48:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-17 23:48:30 +0100 |
| commit | aa7e3b940ad90ba58a5d8c0a2269ec557c9ecc70 (patch) | |
| tree | 9d2c2792791635d40448a033791050ed1bc9a966 | |
| parent | f3c7b03c26889ec50c90c8fa2fa44c5baddddc14 (diff) | |
| parent | 18174bdf86fb3cec34cc7654525cfb9e3f819cd6 (diff) | |
| download | nixpkgs-aa7e3b940ad90ba58a5d8c0a2269ec557c9ecc70.tar nixpkgs-aa7e3b940ad90ba58a5d8c0a2269ec557c9ecc70.tar.gz nixpkgs-aa7e3b940ad90ba58a5d8c0a2269ec557c9ecc70.tar.bz2 nixpkgs-aa7e3b940ad90ba58a5d8c0a2269ec557c9ecc70.tar.lz nixpkgs-aa7e3b940ad90ba58a5d8c0a2269ec557c9ecc70.tar.xz nixpkgs-aa7e3b940ad90ba58a5d8c0a2269ec557c9ecc70.tar.zst nixpkgs-aa7e3b940ad90ba58a5d8c0a2269ec557c9ecc70.zip | |
Merge pull request #211110 from figsoda/cargo-generate
cargo-generate: 0.17.4 -> 0.17.5
| -rw-r--r-- | pkgs/development/tools/rust/cargo-generate/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 04da55126a2..d8fdd4e0d90 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -5,29 +5,33 @@ , libgit2 , openssl , stdenv -, Security +, darwin +, git }: rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.17.4"; + version = "0.17.5"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-3dJ16G1PCLAV1sxtDt+eru+Chg7SWt+K/crJgXMO++k="; + sha256 = "sha256-VKhlPg4H04HdfIgXCXx560oFRwxPotGnGfczZ8PfVog="; }; # patch Cargo.toml to not vendor libgit2 and openssl cargoPatches = [ ./no-vendor.patch ]; - cargoSha256 = "sha256-eLPLBBytzjKfJk0pbPBC0kJrxkelfDrAj5kaM6g9z9w="; + cargoSha256 = "sha256-TbmivH9LXwESpqk2RFEZYZRDlLyuAyek8JxQEROsPYs="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2 openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + checkInputs = [ git ]; preCheck = '' export HOME=$(mktemp -d) USER=nixbld diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aac0f6d9d3c..fee406ff830 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15619,9 +15619,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit Security CoreFoundation AppKit System; }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; - cargo-generate = callPackage ../development/tools/rust/cargo-generate { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cargo-generate = callPackage ../development/tools/rust/cargo-generate { }; cargo-bootimage = callPackage ../development/tools/rust/bootimage { }; cargo-whatfeatures = callPackage ../development/tools/rust/cargo-whatfeatures { |