diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2020-04-10 10:12:50 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-10 10:12:50 -0500 |
commit | 580304ea90d19024477fb5b4cd36db79a5abb8f8 (patch) | |
tree | 30a66e40072099830f64b4ae8c843f032970d0c8 | |
parent | a9dc3c44d7275dd7b66ae31ec1490f53dba8ed65 (diff) | |
parent | 759ac32d9abc383d56680b2a168efd6ed46a37ee (diff) | |
download | nixpkgs-580304ea90d19024477fb5b4cd36db79a5abb8f8.tar nixpkgs-580304ea90d19024477fb5b4cd36db79a5abb8f8.tar.gz nixpkgs-580304ea90d19024477fb5b4cd36db79a5abb8f8.tar.bz2 nixpkgs-580304ea90d19024477fb5b4cd36db79a5abb8f8.tar.lz nixpkgs-580304ea90d19024477fb5b4cd36db79a5abb8f8.tar.xz nixpkgs-580304ea90d19024477fb5b4cd36db79a5abb8f8.tar.zst nixpkgs-580304ea90d19024477fb5b4cd36db79a5abb8f8.zip |
Merge pull request #84887 from danieldk/maturin-0.8.0
maturin: 0.7.9 -> 0.8.0
-rw-r--r-- | pkgs/development/tools/rust/maturin/Cargo.lock.patch | 13 | ||||
-rw-r--r-- | pkgs/development/tools/rust/maturin/default.nix | 11 |
2 files changed, 21 insertions, 3 deletions
diff --git a/pkgs/development/tools/rust/maturin/Cargo.lock.patch b/pkgs/development/tools/rust/maturin/Cargo.lock.patch new file mode 100644 index 00000000000..9f7d46d4901 --- /dev/null +++ b/pkgs/development/tools/rust/maturin/Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 09ecb81..c37c646 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -733,7 +733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "maturin" +-version = "0.8.0-beta.1" ++version = "0.8.0" + dependencies = [ + "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 70c424ee008..30c74447109 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,21 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.7.9"; + version = "0.8.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "1l8i1mz97zsc8kayvryv6xznwpby9k9jxy7lsx45acs5yksqchrv"; + sha256 = "1fjai0c0j8zzaj4c186dkbvx6cpj0vi3sc1qbjbgn2cm8azsd6m6"; }; - cargoSha256 = "0ly0f64acn1hxnj7vg1m860xpl06rklwqh545c386nnxaj839b0r"; + # The maturin 0.8.0 lockfile has an incorrect version for maturin + # itself. The upstream lockfiles are normally correct, so this + # should be removed post-0.8.0. + cargoPatches = [ ./Cargo.lock.patch ]; + + cargoSha256 = "01sh523fi46k5xwdslhnmjz128jkdw47gp9bd8gim3ay13zkcn1i"; nativeBuildInputs = [ pkgconfig ]; |