From cf66c08b8436c02b11ab4a4fb665fc4731abaee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 20 Mar 2021 08:50:28 +0100 Subject: [PATCH] python3Packages.setuptools-rust: do no mix Python versions in tests The passthru test used python3Packages, mixing different Python version when testing on a Python version different that the python3 alias. --- pkgs/development/tools/rust/maturin/pyo3-test/default.nix | 4 ++-- pkgs/development/tools/rust/maturin/pyo3-test/generic.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/default.nix b/pkgs/development/tools/rust/maturin/pyo3-test/default.nix index b118309b36d7..7f79c8565d23 100644 --- a/pkgs/development/tools/rust/maturin/pyo3-test/default.nix +++ b/pkgs/development/tools/rust/maturin/pyo3-test/default.nix @@ -1,8 +1,8 @@ -{ callPackage +{ python3 , rustPlatform }: -callPackage ./generic.nix { +python3.pkgs.callPackage ./generic.nix { buildAndTestSubdir = "examples/word-count"; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix b/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix index 84ca2ddf77f6..41175ad8538a 100644 --- a/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix +++ b/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix @@ -3,7 +3,7 @@ { lib , fetchFromGitHub -, python3Packages +, python , rustPlatform , nativeBuildInputs @@ -13,7 +13,7 @@ , preConfigure ? "" }: -python3Packages.buildPythonPackage rec { +python.pkgs.buildPythonPackage rec { pname = "word-count"; version = "0.13.2";