From 02380d7d7c89f3577ebb26b95af8dff0ed93d577 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 06:31:48 +0000 Subject: [PATCH 1/3] maturin: 0.8.3 -> 0.9.0 --- pkgs/development/tools/rust/maturin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index ff52824ef9a..d40145f163b 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "08l5r7d75id6qzf8xhkjv4hkdr64cq4dbcmdjywmvf9szjbnr65z"; + sha256 = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs="; }; - cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n"; + cargoSha256 = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI="; nativeBuildInputs = [ pkg-config ]; From e645c169568b892da6633b6930697492d295e812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 23 Jan 2021 12:03:32 +0100 Subject: [PATCH 2/3] python3Packages.johnnycanencrypt: maturin 0.9.0 compatibility fix --- .../development/python-modules/johnnycanencrypt/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index f0ee4a6bd99..77789fa44db 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -61,6 +61,12 @@ rustPlatform.buildRustPackage rec { numpy ]; + # Remove with the next release after 0.5.0. This change is required + # for compatibility with maturin 0.9.0. + postPatch = '' + sed '/project-url = /d' -i Cargo.toml + ''; + buildPhase = '' runHook preBuild maturin build --release --manylinux off --strip --cargo-extra-args="-j $NIX_BUILD_CORES --frozen" From c81a5d9abbe2b1ba3c5c192b8727763dafed454d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 24 Jan 2021 10:32:28 +0100 Subject: [PATCH 3/3] python3Packages.wasmer: 1.0.0-beta1 -> 1.0.0 --- pkgs/development/python-modules/wasmer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 0bb60d6b9e3..62c8a2a06b7 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -8,7 +8,7 @@ }: let pname = "wasmer"; - version = "1.0.0-beta1"; + version = "1.0.0"; wheel = rustPlatform.buildRustPackage rec { inherit pname version; @@ -17,10 +17,10 @@ let owner = "wasmerio"; repo = "wasmer-python"; rev = version; - sha256 = "0302lcfjlw7nz18nf86z6swhhpp1qnpwcsm2fj4avl22rsv0h78j"; + hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; }; - cargoHash = "sha256-Rq5m9Lu6kePvohfhODLMOpGPFtCh0woTsQY2TufoiNQ="; + cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; nativeBuildInputs = [ maturin python ];