Merge pull request #116954 from danieldk/setuptools-rust-0.12.1
python3Packages.setuptools-rust: 0.11.6 -> 0.12.1
This commit is contained in:
commit
611ba48b71
|
@ -2,7 +2,7 @@
|
||||||
, lib
|
, lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, isPy27
|
, pythonOlder
|
||||||
, semantic-version
|
, semantic-version
|
||||||
, setuptools
|
, setuptools
|
||||||
, setuptools-scm
|
, setuptools-scm
|
||||||
|
@ -11,12 +11,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "setuptools-rust";
|
pname = "setuptools-rust";
|
||||||
version = "0.11.6";
|
version = "0.12.1";
|
||||||
disabled = isPy27;
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "a5b5954909cbc5d66b914ee6763f81fa2610916041c7266105a469f504a7c4ca";
|
sha256 = "647009e924f0ae439c7f3e0141a184a69ad247ecb9044c511dabde232d3d570e";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ setuptools-scm ];
|
nativeBuildInputs = [ setuptools-scm ];
|
||||||
|
|
|
@ -17,5 +17,9 @@ callPackage ../../../tools/rust/maturin/pyo3-test/generic.nix {
|
||||||
rust.rustc
|
rust.rustc
|
||||||
]);
|
]);
|
||||||
|
|
||||||
sourceRoot = "source/examples/word-count";
|
preConfigure = ''
|
||||||
|
# sourceRoot puts Cargo.lock in the wrong place due to the
|
||||||
|
# example setup.
|
||||||
|
cd examples/word-count
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{ callPackage
|
{ python3
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
}:
|
}:
|
||||||
|
|
||||||
callPackage ./generic.nix {
|
python3.pkgs.callPackage ./generic.nix {
|
||||||
buildAndTestSubdir = "examples/word-count";
|
buildAndTestSubdir = "examples/word-count";
|
||||||
|
|
||||||
nativeBuildInputs = with rustPlatform; [
|
nativeBuildInputs = with rustPlatform; [
|
||||||
|
|
|
@ -3,17 +3,17 @@
|
||||||
|
|
||||||
{ lib
|
{ lib
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, python3Packages
|
, python
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
|
|
||||||
, nativeBuildInputs
|
, nativeBuildInputs
|
||||||
|
|
||||||
, buildAndTestSubdir ? null
|
, buildAndTestSubdir ? null
|
||||||
, format ? "pyproject"
|
, format ? "pyproject"
|
||||||
, sourceRoot ? "source"
|
, preConfigure ? ""
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3Packages.buildPythonPackage rec {
|
python.pkgs.buildPythonPackage rec {
|
||||||
pname = "word-count";
|
pname = "word-count";
|
||||||
version = "0.13.2";
|
version = "0.13.2";
|
||||||
|
|
||||||
|
@ -25,14 +25,14 @@ python3Packages.buildPythonPackage rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||||
inherit src sourceRoot patches;
|
inherit src patches;
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
hash = "sha256-//TmozgWy9zrSpMKX92XdHj4fw/T1Elfgn4YhhR7ot0=";
|
hash = "sha256-//TmozgWy9zrSpMKX92XdHj4fw/T1Elfgn4YhhR7ot0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./Cargo.lock.patch ];
|
patches = [ ./Cargo.lock.patch ];
|
||||||
|
|
||||||
inherit buildAndTestSubdir format nativeBuildInputs sourceRoot;
|
inherit buildAndTestSubdir format nativeBuildInputs preConfigure;
|
||||||
|
|
||||||
pythonImportsCheck = [ "word_count" ];
|
pythonImportsCheck = [ "word_count" ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue