git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #123867 from danieldk/maturin-0.10.5

maturin: 0.10.4 -> 0.10.6

commit7eddab91f59a14704eceb117cc6cadb44eacb8b2 authorDaniël de Kok <me@danieldk.eu> dateTue 25 May 2021, 16:01 (5 years ago) parent563c503604ea22
3 files changed+9−7
pkgs/build-support/rust/hooks/default.nix+2−1 pkgs/development/compilers/rust/make-rust-platform.nix+1−1 pkgs/development/tools/rust/maturin/default.nix+6−5
pkgs/build-support/rust/hooks/default.nix+2−1
@@ -6,6 +6,7 @@
66, makeSetupHook
77, maturin
88, rust
9+, rustc
910, stdenv
1011, target ? rust.toRustTargetSpec stdenv.hostPlatform
1112}:
@@ -85,7 +86,7 @@ in {
8586 maturinBuildHook = callPackage ({ }:
8687 makeSetupHook {
8788 name = "maturin-build-hook.sh";
88− deps = [ cargo maturin ];
89+ deps = [ cargo maturin rustc ];
8990 substitutions = {
9091 inherit ccForBuild ccForHost cxxForBuild cxxForHost
9192 rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec;
pkgs/development/compilers/rust/make-rust-platform.nix+1−1
@@ -26,6 +26,6 @@ rec {
2626
2727 # Hooks
2828 inherit (callPackage ../../../build-support/rust/hooks {
29− inherit cargo;
29+ inherit cargo rustc;
3030 }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook;
3131}
pkgs/development/tools/rust/maturin/default.nix+6−5
@@ -5,26 +5,27 @@
55, rustPlatform
66, pkg-config
77, dbus
8+, libiconv
89, Security
910}:
1011
1112rustPlatform.buildRustPackage rec {
1213 pname = "maturin";
13− version = "0.10.4";
14+ version = "0.10.6";
1415
1516 src = fetchFromGitHub {
1617 owner = "PyO3";
1718 repo = "maturin";
1819 rev = "v${version}";
19− hash = "sha256-9emrBajFd0eLHcsd9Uf6MLCWqZFqxmZdWPBLGIYc2kU=";
20+ hash = "sha256-qWDrdS1zxe5woQSKLHhDSGJ1KF4SHk1mhaQApJXCCO4=";
2021 };
2122
22− cargoSha256 = "113i7a5hpz7qch45wwapp53ixvgssnlxm0810yjicxp3k61ak30j";
23+ cargoHash = "sha256-NEXgb7yWQkqbbofd3oYQ5n+CmfaM2cWj8HwufrcRKkc=";
2324
2425 nativeBuildInputs = [ pkg-config ];
2526
26− buildInputs = lib.optional stdenv.isLinux dbus
27− ++ lib.optional stdenv.isDarwin Security;
27+ buildInputs = lib.optionals stdenv.isLinux [ dbus ]
28+ ++ lib.optionals stdenv.isDarwin [ Security libiconv ];
2829
2930 # Requires network access, fails in sandbox.
3031 doCheck = false;