diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-25 18:43:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-25 18:43:22 +0000 |
commit | a673990e6c06f7d958d7b9b0d85cb924046a8350 (patch) | |
tree | 41502642b40ac6aadff970d7643677d1c059d587 /pkgs/development/tools/rust | |
parent | 73d840c309c05e931fe2c0a0b4de1691371fc5ca (diff) | |
parent | c29e090a7dc98bbc6abb607227647b6a263e3364 (diff) | |
download | nixpkgs-a673990e6c06f7d958d7b9b0d85cb924046a8350.tar nixpkgs-a673990e6c06f7d958d7b9b0d85cb924046a8350.tar.gz nixpkgs-a673990e6c06f7d958d7b9b0d85cb924046a8350.tar.bz2 nixpkgs-a673990e6c06f7d958d7b9b0d85cb924046a8350.tar.lz nixpkgs-a673990e6c06f7d958d7b9b0d85cb924046a8350.tar.xz nixpkgs-a673990e6c06f7d958d7b9b0d85cb924046a8350.tar.zst nixpkgs-a673990e6c06f7d958d7b9b0d85cb924046a8350.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/rust')
-rw-r--r-- | pkgs/development/tools/rust/maturin/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 41746fa65ce..5ab47c8aa8d 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,26 +5,27 @@ , rustPlatform , pkg-config , dbus +, libiconv , Security }: rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.10.4"; + version = "0.10.6"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-9emrBajFd0eLHcsd9Uf6MLCWqZFqxmZdWPBLGIYc2kU="; + hash = "sha256-qWDrdS1zxe5woQSKLHhDSGJ1KF4SHk1mhaQApJXCCO4="; }; - cargoSha256 = "113i7a5hpz7qch45wwapp53ixvgssnlxm0810yjicxp3k61ak30j"; + cargoHash = "sha256-NEXgb7yWQkqbbofd3oYQ5n+CmfaM2cWj8HwufrcRKkc="; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optional stdenv.isLinux dbus - ++ lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isLinux [ dbus ] + ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; # Requires network access, fails in sandbox. doCheck = false; |