mirror of
https://github.com/vale981/poetry2nix
synced 2025-03-05 17:21:39 -05:00
Add preferWheel option to <derivation>.override
Previously override wasn't really useful as it inherited the args from buildPythonPackage. Now we can create custom args for overrides.
This commit is contained in:
parent
0d5719df26
commit
136f008a03
8 changed files with 194 additions and 93 deletions
|
@ -16,7 +16,13 @@
|
||||||
, pwd
|
, pwd
|
||||||
, supportedExtensions ? lib.importJSON ./extensions.json
|
, supportedExtensions ? lib.importJSON ./extensions.json
|
||||||
, ...
|
, ...
|
||||||
}: let
|
}:
|
||||||
|
|
||||||
|
pythonPackages.callPackage (
|
||||||
|
{ preferWheel ? false
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi;
|
inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi;
|
||||||
|
|
||||||
|
@ -56,7 +62,9 @@
|
||||||
sourceDist = builtins.filter isSdist fileCandidates;
|
sourceDist = builtins.filter isSdist fileCandidates;
|
||||||
eggs = builtins.filter isEgg fileCandidates;
|
eggs = builtins.filter isEgg fileCandidates;
|
||||||
|
|
||||||
lockFileEntry = builtins.head (sourceDist ++ binaryDist ++ eggs);
|
entries = (if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist);
|
||||||
|
|
||||||
|
lockFileEntry = builtins.head entries;
|
||||||
|
|
||||||
_isEgg = isEgg lockFileEntry;
|
_isEgg = isEgg lockFileEntry;
|
||||||
|
|
||||||
|
@ -115,3 +123,5 @@ buildPythonPackage {
|
||||||
inherit (fileInfo) file hash kind;
|
inherit (fileInfo) file hash kind;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
) {}
|
||||||
|
|
|
@ -154,6 +154,11 @@ in
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
# Calls Cargo at build time for source builds and is really tricky to package
|
||||||
|
maturin = super.maturin.override {
|
||||||
|
preferWheel = true;
|
||||||
|
};
|
||||||
|
|
||||||
mccabe = super.mccabe.overrideAttrs (
|
mccabe = super.mccabe.overrideAttrs (
|
||||||
old: {
|
old: {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -21,6 +21,7 @@ in
|
||||||
cli = poetry2nix;
|
cli = poetry2nix;
|
||||||
path-deps = pkgs.callPackage ./path-deps { inherit poetry2nix; };
|
path-deps = pkgs.callPackage ./path-deps { inherit poetry2nix; };
|
||||||
operators = pkgs.callPackage ./operators { inherit poetry2nix; };
|
operators = pkgs.callPackage ./operators { inherit poetry2nix; };
|
||||||
|
preferWheel = pkgs.callPackage ./prefer-wheel { inherit poetry2nix; };
|
||||||
|
|
||||||
# Egg support not yet in channel, uncomment when channel progressed
|
# Egg support not yet in channel, uncomment when channel progressed
|
||||||
# eggs = pkgs.callPackage ./eggs { inherit poetry2nix; };
|
# eggs = pkgs.callPackage ./eggs { inherit poetry2nix; };
|
||||||
|
|
20
tests/prefer-wheel/default.nix
Normal file
20
tests/prefer-wheel/default.nix
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
{ lib, poetry2nix, python3 }:
|
||||||
|
|
||||||
|
poetry2nix.mkPoetryApplication {
|
||||||
|
python = python3;
|
||||||
|
pyproject = ./pyproject.toml;
|
||||||
|
poetrylock = ./poetry.lock;
|
||||||
|
src = lib.cleanSource ./.;
|
||||||
|
overrides = [
|
||||||
|
poetry2nix.defaultPoetryOverrides
|
||||||
|
# This is also in overrides.nix but repeated for completeness
|
||||||
|
(
|
||||||
|
self: super: {
|
||||||
|
maturin = super.maturin.override {
|
||||||
|
preferWheel = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
];
|
||||||
|
}
|
37
tests/prefer-wheel/poetry.lock
generated
Normal file
37
tests/prefer-wheel/poetry.lock
generated
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
[[package]]
|
||||||
|
category = "main"
|
||||||
|
description = "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages"
|
||||||
|
name = "maturin"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.5"
|
||||||
|
version = "0.7.7"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
toml = ">=0.10.0,<0.11.0"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
category = "main"
|
||||||
|
description = "Python Library for Tom's Obvious, Minimal Language"
|
||||||
|
name = "toml"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
version = "0.10.0"
|
||||||
|
|
||||||
|
[metadata]
|
||||||
|
content-hash = "7335d3fa093f70b77439e92fa00ba1c990d37e4515bc588fce2144580db8b504"
|
||||||
|
python-versions = "^3.7"
|
||||||
|
|
||||||
|
[metadata.files]
|
||||||
|
maturin = [
|
||||||
|
{file = "maturin-0.7.7-py2.py3-none-macosx_10_7_x86_64.whl", hash = "sha256:87a3d9a94f9c3b8d3ecc57017cdae2b3f1e0f6bfc851509f0b53c2486f312dcc"},
|
||||||
|
{file = "maturin-0.7.7-py2.py3-none-manylinux1_i686.whl", hash = "sha256:7f7f04de2acf379b1ff8993747f11bfb60760c69caf8c43414212cf7cc4b07ef"},
|
||||||
|
{file = "maturin-0.7.7-py2.py3-none-manylinux1_x86_64.whl", hash = "sha256:aa474d70630833349dac090306fd51a8af2df88080cea74ea4d831b40616ea41"},
|
||||||
|
{file = "maturin-0.7.7-py2.py3-none-win32.whl", hash = "sha256:5e6390245a023cbdca39d9276035fdee4d892b44d3ab798ccf2c3443d87e3f98"},
|
||||||
|
{file = "maturin-0.7.7-py2.py3-none-win_amd64.whl", hash = "sha256:4fd7fcf4e40e984274dc9caf80c08fa16a6c7c1f4ca1f694ba2ac3802b7340aa"},
|
||||||
|
{file = "maturin-0.7.7.tar.gz", hash = "sha256:2533c648aa8fa19f7a9d4f62282b4adce2f9c07c49f512005f92911be767555e"},
|
||||||
|
]
|
||||||
|
toml = [
|
||||||
|
{file = "toml-0.10.0-py2.7.egg", hash = "sha256:f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3"},
|
||||||
|
{file = "toml-0.10.0-py2.py3-none-any.whl", hash = "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e"},
|
||||||
|
{file = "toml-0.10.0.tar.gz", hash = "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c"},
|
||||||
|
]
|
15
tests/prefer-wheel/pyproject.toml
Normal file
15
tests/prefer-wheel/pyproject.toml
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
[tool.poetry]
|
||||||
|
name = "test_preferwheel"
|
||||||
|
version = "0.1.0"
|
||||||
|
description = ""
|
||||||
|
authors = ["adisbladis <adisbladis@gmail.com>"]
|
||||||
|
|
||||||
|
[tool.poetry.dependencies]
|
||||||
|
python = "^3.7"
|
||||||
|
maturin = "^0.7.7"
|
||||||
|
|
||||||
|
[tool.poetry.dev-dependencies]
|
||||||
|
|
||||||
|
[build-system]
|
||||||
|
requires = ["poetry>=0.12"]
|
||||||
|
build-backend = "poetry.masonry.api"
|
0
tests/prefer-wheel/test_preferwheel.py
Normal file
0
tests/prefer-wheel/test_preferwheel.py
Normal file
|
@ -5,4 +5,17 @@ poetry2nix.mkPoetryApplication {
|
||||||
pyproject = ./pyproject.toml;
|
pyproject = ./pyproject.toml;
|
||||||
poetrylock = ./poetry.lock;
|
poetrylock = ./poetry.lock;
|
||||||
src = lib.cleanSource ./.;
|
src = lib.cleanSource ./.;
|
||||||
|
|
||||||
|
overrides = [
|
||||||
|
poetry2nix.defaultPoetryOverrides
|
||||||
|
(
|
||||||
|
self: super: {
|
||||||
|
maturin = (builtins.trace (lib.functionArgs super.maturin.override) super.maturin.override) {
|
||||||
|
preferWheel = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue