hiro/poetry2nix
1
0
Fork 0
mirror of https://github.com/vale981/poetry2nix synced 2025-03-04 08:41:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Incorporate string escaping changes from nixpkgs #108086

Browse source
This commit is contained in:
adisbladis 2021-03-04 14:11:52 +02:00
parent 2f1fd6a5bd
commit 36f46f7696
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib.nix
View file

@ -157,7 +157,7 @@ let
missingBuildBackendError = "No build-system.build-backend section in pyproject.toml. " missingBuildBackendError = "No build-system.build-backend section in pyproject.toml. "
+ "Add such a section as described in https://python-poetry.org/docs/pyproject/#poetry-and-pep-517"; + "Add such a section as described in https://python-poetry.org/docs/pyproject/#poetry-and-pep-517";
requires = lib.attrByPath [ "build-system" "requires" ] (throw missingBuildBackendError) pyProject; requires = lib.attrByPath [ "build-system" "requires" ] (throw missingBuildBackendError) pyProject;
requiredPkgs = builtins.map (n: lib.elemAt (builtins.match "([^!=<>~\[]+).*" n) 0) requires; requiredPkgs = builtins.map (n: lib.elemAt (builtins.match "([^!=<>~[]+).*" n) 0) requires;
in in
builtins.map (drvAttr: pythonPackages.${drvAttr} or (throw "unsupported build system requirement ${drvAttr}")) requiredPkgs; builtins.map (drvAttr: pythonPackages.${drvAttr} or (throw "unsupported build system requirement ${drvAttr}")) requiredPkgs;

6
semver.nix
View file

@ -3,7 +3,7 @@ let
inherit (builtins) elemAt match; inherit (builtins) elemAt match;
operators = operators =
let let
matchWildCard = s: match "([^\*])(\.[\*])" s; matchWildCard = s: match "([^*])(\\.[*])" s;
mkComparison = ret: version: v: builtins.compareVersions version v == ret; mkComparison = ret: version: v: builtins.compareVersions version v == ret;
mkIdxComparison = idx: version: v: mkIdxComparison = idx: version: v:
let let
@ -52,8 +52,8 @@ let
# #
}; };
re = { re = {
operators = "([=><!~\^]+)"; operators = "([=><!~^]+)";
version = "([0-9\.\*x]+)"; version = "([0-9.*x]+)";
}; };
parseConstraint = constraint: parseConstraint = constraint:
let let