JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

poetry2nix: 1.23.0 -> 1.24.1

Browse Source
This commit is contained in:
adisbladis 2021-12-27 20:33:31 -08:00
parent c1a2cf8f41
commit 4d6da24d18
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/tools/poetry2nix/poetry2nix/default.nix
View File

@ -5,7 +5,7 @@
}:
let
# Poetry2nix version
version = "1.23.0";
version = "1.24.1";
inherit (poetryLib) isCompatible readTOML moduleName;
@ -261,6 +261,7 @@ lib.makeScope pkgs.newScope (self: {
, python ? pkgs.python3
, preferWheels ? false
, editablePackageSources ? { }
, extraPackages ? ps: [ ]
}:
let
poetryPython = self.mkPoetryPackages {
@ -270,7 +271,7 @@ lib.makeScope pkgs.newScope (self: {
inherit (poetryPython) poetryPackages;
in
poetryPython.python.withPackages (_: poetryPackages);
poetryPython.python.withPackages (ps: poetryPackages ++ (extraPackages ps));
/* Creates a Python application from pyproject.toml and poetry.lock

8
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
View File

@ -202,14 +202,14 @@ self: super:
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ];
} // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") {
CRYPTOGRAPHY_DONT_BUILD_RUST = "1";
} // lib.optionalAttrs (lib.versionAtLeast old.version "3.5") rec {
} // lib.optionalAttrs (lib.versionAtLeast old.version "35") rec {
cargoDeps =
let
getCargoHash = version:
if lib.versionOlder version "3.6.0" then "sha256-tQoQfo+TAoqAea86YFxyj/LNQCiViu5ij/3wj7ZnYLI="
else if lib.versionOlder version "3.6.1" then "sha256-Y6TuW7AryVgSvZ6G8WNoDIvi+0tvx8ZlEYF5qB0jfNk="
if lib.versionOlder version "36.0.0" then "sha256-tQoQfo+TAoqAea86YFxyj/LNQCiViu5ij/3wj7ZnYLI="
else if lib.versionOlder version "36.0.1" then "sha256-Y6TuW7AryVgSvZ6G8WNoDIvi+0tvx8ZlEYF5qB0jfNk="
# This hash could no longer be valid for cryptography versions
# different from 3.6.1
# different from 36.0.1
else "sha256-kozYXkqt1Wpqyo9GYCwN08J+zV92ZWFJY/f+rulxmeQ=";
in
pkgs.rustPlatform.fetchCargoTarball {