From 1e5b480e8b9e925e4a6e72c4365f1ae5653c8265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 25 Jun 2020 17:23:04 +0200
Subject: [PATCH] maturin: 0.8.0 -> 0.8.1

- Supports `sdist-include = ["path/**/*"]` to include arbitrary files
  in source distributions
- Fixes Cargo.lock
- Updates some dependencies
---
 .../development/tools/rust/maturin/Cargo.lock.patch | 13 -------------
 pkgs/development/tools/rust/maturin/default.nix     | 11 +++--------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/development/tools/rust/maturin/Cargo.lock.patch

diff --git a/pkgs/development/tools/rust/maturin/Cargo.lock.patch b/pkgs/development/tools/rust/maturin/Cargo.lock.patch
deleted file mode 100644
index 9f7d46d4901f..000000000000
--- a/pkgs/development/tools/rust/maturin/Cargo.lock.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 09ecb81..c37c646 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -733,7 +733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
- name = "maturin"
--version = "0.8.0-beta.1"
-+version = "0.8.0"
- dependencies = [
-  "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix
index e4ee97d02427..72b22dba1043 100644
--- a/pkgs/development/tools/rust/maturin/default.nix
+++ b/pkgs/development/tools/rust/maturin/default.nix
@@ -5,21 +5,16 @@ let
   inherit (darwin.apple_sdk.frameworks) Security;
 in rustPlatform.buildRustPackage rec {
   name = "maturin-${version}";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    sha256 = "1fjai0c0j8zzaj4c186dkbvx6cpj0vi3sc1qbjbgn2cm8azsd6m6";
+    sha256 = "16bxxa261k2l6mpdd55gyzl1mx756i0zbvqp15glpzlcwhb9bm2m";
   };
 
-  # The maturin 0.8.0 lockfile has an incorrect version for maturin
-  # itself. The upstream lockfiles are normally correct, so this
-  # should be removed post-0.8.0.
-  cargoPatches = [ ./Cargo.lock.patch ];
-
-  cargoSha256 = "01sh523fi46k5xwdslhnmjz128jkdw47gp9bd8gim3ay13zkcn1i";
+  cargoSha256 = "1s1brfnhwl42jb37qqz4d8mxpyq2ck60jnmjfllkga3mhwm4r8px";
 
   nativeBuildInputs = [ pkgconfig ];