From 7e29ce8a774ecf7831820feb3c82e69bf67c1fcb Mon Sep 17 00:00:00 2001
From: Daniël de Kok <me@danieldk.eu>
Date: Fri, 30 Aug 2019 20:59:44 +0200
Subject: maturin: 0.6.1 -> 0.7.0

pyo3-pack has been renamed to maturin version 0.7.0. Other larger
changes are:

- Mixed rust/python layout
- Added PEP 517 support
- Support settings all applicable fields from the python core
  metadata specification in Cargo.toml
---
 pkgs/development/tools/rust/maturin/default.nix   | 35 +++++++++++++++++++++++
 pkgs/development/tools/rust/pyo3-pack/default.nix | 35 -----------------------
 pkgs/top-level/aliases.nix                        |  1 +
 pkgs/top-level/all-packages.nix                   |  2 +-
 4 files changed, 37 insertions(+), 36 deletions(-)
 create mode 100644 pkgs/development/tools/rust/maturin/default.nix
 delete mode 100644 pkgs/development/tools/rust/pyo3-pack/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix
new file mode 100644
index 000000000000..4b07129ae0ef
--- /dev/null
+++ b/pkgs/development/tools/rust/maturin/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkgconfig
+, darwin }:
+
+let
+  inherit (darwin.apple_sdk.frameworks) Security;
+in rustPlatform.buildRustPackage rec {
+  name = "maturin-${version}";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "PyO3";
+    repo = "maturin";
+    rev = "v${version}";
+    sha256 = "1qscn8ycyg9ldkp1v5178mlw8r5ak2p12x52c0w4hgij7y1q5s39";
+  };
+
+  cargoSha256 = "0fk9dgwkgkkmxxd8ydl0vp14jhzi65pkz36v5h3nkp4cb4n4cvdj";
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ gmp openssl ]
+    ++ stdenv.lib.optional stdenv.isDarwin Security
+    ++ stdenv.lib.optional stdenv.isLinux dbus;
+
+  # Requires network access, fails in sandbox.
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Build and publish crates with pyo3 bindings as python packages";
+    homepage = https://github.com/PyO3/maturin;
+    license = licenses.mit;
+    maintainers = [ maintainers.danieldk ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/rust/pyo3-pack/default.nix b/pkgs/development/tools/rust/pyo3-pack/default.nix
deleted file mode 100644
index a17d50262a0e..000000000000
--- a/pkgs/development/tools/rust/pyo3-pack/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkgconfig
-, darwin }:
-
-let
-  inherit (darwin.apple_sdk.frameworks) Security;
-in rustPlatform.buildRustPackage rec {
-  name = "pyo3-pack-${version}";
-  version = "0.6.1";
-
-  src = fetchFromGitHub {
-    owner = "PyO3";
-    repo = "pyo3-pack";
-    rev = "v${version}";
-    sha256 = "0zk0jhr7lnl9z6c8pbk7si3wa8b1kqzj3wrslc1n5fjla7xx8fzn";
-  };
-
-  cargoSha256 = "13gycipxc17baxg8nvjzkw96i1pxgncx7qjcrm9aab7p9vi2vrih";
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  buildInputs = [ gmp openssl ]
-    ++ stdenv.lib.optional stdenv.isDarwin Security
-    ++ stdenv.lib.optional stdenv.isLinux dbus;
-
-  # Requires network access, fails in sandbox.
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "Build and publish crates with pyo3 bindings as python packages";
-    homepage = https://github.com/PyO3/pyo3-pack;
-    license = licenses.mit;
-    maintainers = [ maintainers.danieldk ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1a4169605a64..f51ba3fbaf12 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -285,6 +285,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 6c3af89bc8d3..256b2f28e11e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8355,7 +8355,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;
-- 
cgit 1.4.1