diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2019-08-31 01:44:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-31 01:44:25 +0200 |
commit | 1a1d1bc389e9458848599560a50eb50ca44ad681 (patch) | |
tree | dd9c28d2fa78212fdbdc536d61880a3fdd4c0eb8 /pkgs | |
parent | 00762b57545dba3b3e21e3a649b574db3db36c65 (diff) | |
parent | 7e29ce8a774ecf7831820feb3c82e69bf67c1fcb (diff) | |
download | nixlib-1a1d1bc389e9458848599560a50eb50ca44ad681.tar nixlib-1a1d1bc389e9458848599560a50eb50ca44ad681.tar.gz nixlib-1a1d1bc389e9458848599560a50eb50ca44ad681.tar.bz2 nixlib-1a1d1bc389e9458848599560a50eb50ca44ad681.tar.lz nixlib-1a1d1bc389e9458848599560a50eb50ca44ad681.tar.xz nixlib-1a1d1bc389e9458848599560a50eb50ca44ad681.tar.zst nixlib-1a1d1bc389e9458848599560a50eb50ca44ad681.zip |
Merge pull request #67786 from danieldk/maturin
maturin: 0.6.1 -> 0.7.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/rust/maturin/default.nix (renamed from pkgs/development/tools/rust/pyo3-pack/default.nix) | 12 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/tools/rust/pyo3-pack/default.nix b/pkgs/development/tools/rust/maturin/default.nix index a17d50262a0e..4b07129ae0ef 100644 --- a/pkgs/development/tools/rust/pyo3-pack/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -4,17 +4,17 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { - name = "pyo3-pack-${version}"; - version = "0.6.1"; + name = "maturin-${version}"; + version = "0.7.0"; src = fetchFromGitHub { owner = "PyO3"; - repo = "pyo3-pack"; + repo = "maturin"; rev = "v${version}"; - sha256 = "0zk0jhr7lnl9z6c8pbk7si3wa8b1kqzj3wrslc1n5fjla7xx8fzn"; + sha256 = "1qscn8ycyg9ldkp1v5178mlw8r5ak2p12x52c0w4hgij7y1q5s39"; }; - cargoSha256 = "13gycipxc17baxg8nvjzkw96i1pxgncx7qjcrm9aab7p9vi2vrih"; + cargoSha256 = "0fk9dgwkgkkmxxd8ydl0vp14jhzi65pkz36v5h3nkp4cb4n4cvdj"; nativeBuildInputs = [ pkgconfig ]; @@ -27,7 +27,7 @@ in rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Build and publish crates with pyo3 bindings as python packages"; - homepage = https://github.com/PyO3/pyo3-pack; + homepage = https://github.com/PyO3/maturin; license = licenses.mit; maintainers = [ maintainers.danieldk ]; platforms = platforms.all; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3b8818da5c96..202590f626f4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -287,6 +287,7 @@ mapAliases ({ ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream."; processing3 = processing; # added 2019-08-16 procps-ng = procps; # added 2018-06-08 + pyo3-pack = maturin; pulseaudioLight = pulseaudio; # added 2018-04-25 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qt_gstreamer = qt-gstreamer; # added 2017-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69aac6362137..904cc691aa56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8361,7 +8361,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; + maturin = callPackage ../development/tools/rust/maturin { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; |