Merge pull request #112775 from danieldk/maturin-pname

authored by

Sandro and committed by
GitHub
e9b66b96 a1ea4bdd

+18 -12
+14 -11
pkgs/development/tools/rust/maturin/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkg-config 2 - , darwin }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , rustPlatform 5 + , pkg-config 6 + , dbus 7 + , Security 8 + }: 3 9 4 - let 5 - inherit (darwin.apple_sdk.frameworks) Security; 6 - in rustPlatform.buildRustPackage rec { 7 - name = "maturin-${version}"; 10 + rustPlatform.buildRustPackage rec { 11 + pname = "maturin"; 8 12 version = "0.9.0"; 9 13 10 14 src = fetchFromGitHub { 11 15 owner = "PyO3"; 12 16 repo = "maturin"; 13 17 rev = "v${version}"; 14 - sha256 = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs="; 18 + hash = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs="; 15 19 }; 16 20 17 - cargoSha256 = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI="; 21 + cargoHash = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI="; 18 22 19 23 nativeBuildInputs = [ pkg-config ]; 20 24 21 - buildInputs = [ gmp openssl ] 22 - ++ lib.optional stdenv.isDarwin Security 23 - ++ lib.optional stdenv.isLinux dbus; 25 + buildInputs = lib.optional stdenv.isLinux dbus 26 + ++ lib.optional stdenv.isDarwin Security; 24 27 25 28 # Requires network access, fails in sandbox. 26 29 doCheck = false;
+4 -1
pkgs/top-level/all-packages.nix
··· 10840 10840 inherit (darwin.apple_sdk.frameworks) Security; 10841 10841 }; 10842 10842 10843 - maturin = callPackage ../development/tools/rust/maturin { }; 10843 + maturin = callPackage ../development/tools/rust/maturin { 10844 + inherit (darwin.apple_sdk.frameworks) Security; 10845 + }; 10846 + 10844 10847 inherit (rustPackages) rls; 10845 10848 rustfmt = rustPackages.rustfmt; 10846 10849 rustracer = callPackage ../development/tools/rust/racer {