pyrox.dev
Merge pull request #251643 from dotlambda/poetry-1.6.1
poetry: 1.5.1 -> 1.6.1
authored by
Robert Schütz
and committed by
GitHub
61c94743
af213b3a
+2
-23
pkgs/tools/package-management/poetry/default.nix
+2
-23
pkgs/tools/package-management/poetry/default.nix
···
10
10
poetry = self.callPackage ./unwrapped.nix { };
11
11
12
12
# version overrides required by poetry and its plugins
13
-
cachecontrol = super.cachecontrol.overridePythonAttrs (old: rec {
14
-
version = "0.12.14";
15
-
format = "setuptools";
16
-
src = fetchFromGitHub {
17
-
owner = "ionrock";
18
-
repo = "cachecontrol";
19
-
rev = "v${version}";
20
-
hash = "sha256-BuBaKP7OAYoT+SPVhtE6l9U/KmN21OKTL6poV5a6+0c=";
21
-
};
22
-
nativeCheckInputs = old.nativeCheckInputs ++ [
23
-
self.lockfile
24
-
];
25
-
});
26
-
keyring = super.keyring.overridePythonAttrs (old: rec {
27
-
version = "23.13.1";
28
-
src = fetchPypi {
29
-
inherit (old) pname;
30
-
inherit version;
31
-
hash = "sha256-ui4VqbNeIZCNCq9OCkesxS1q4zRE3w2itJ1BpG721ng=";
32
-
};
33
-
});
34
13
poetry-core = super.poetry-core.overridePythonAttrs (old: rec {
35
-
version = "1.6.1";
14
+
version = "1.7.0";
36
15
src = fetchFromGitHub {
37
16
owner = "python-poetry";
38
17
repo = "poetry-core";
39
18
rev = version;
40
-
hash = "sha256-Gc22Y2T4uO39jiOqEUFeOfnVCbknuDjmzFPZgk2eY74=";
19
+
hash = "sha256-OfY2zc+5CgOrgbiPVnvMdT4h1S7Aek8S7iThl6azmsk=";
41
20
};
42
21
});
43
22
} // (plugins self);
+2
-2
pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
+2
-2
pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
···
6
6
7
7
buildPythonPackage rec {
8
8
pname = "poetry-plugin-export";
9
-
version = "1.4.0";
9
+
version = "1.5.0";
10
10
format = "pyproject";
11
11
12
12
src = fetchFromGitHub {
13
13
owner = "python-poetry";
14
14
repo = pname;
15
15
rev = "refs/tags/${version}";
16
-
hash = "sha256-okI91Z9u5w7IHpPb9jL4Hb8+MkYJEF2qm0mqqCdyKbk=";
16
+
hash = "sha256-bX7Mqpe7SYQQVrPNVOl8Bwmeiq7owIiUhw0sp5+Gwck=";
17
17
};
18
18
19
19
postPatch = ''
+11
-11
pkgs/tools/package-management/poetry/unwrapped.nix
+11
-11
pkgs/tools/package-management/poetry/unwrapped.nix
···
4
4
, pythonOlder
5
5
, fetchFromGitHub
6
6
, installShellFiles
7
+
, pythonRelaxDepsHook
7
8
, build
8
9
, cachecontrol
9
10
, cleo
10
11
, crashtest
11
12
, dulwich
12
-
, filelock
13
-
, html5lib
14
13
, installer
15
14
, jsonschema
16
15
, keyring
17
-
, lockfile
18
16
, packaging
19
17
, pexpect
20
18
, pkginfo
···
27
25
, shellingham
28
26
, tomlkit
29
27
, trove-classifiers
30
-
, urllib3
31
28
, virtualenv
32
29
, xattr
33
30
, tomli
···
44
41
45
42
buildPythonPackage rec {
46
43
pname = "poetry";
47
-
version = "1.5.1";
44
+
version = "1.6.1";
48
45
format = "pyproject";
49
46
50
-
disabled = pythonOlder "3.7";
47
+
disabled = pythonOlder "3.8";
51
48
52
49
src = fetchFromGitHub {
53
50
owner = "python-poetry";
54
51
repo = pname;
55
52
rev = "refs/tags/${version}";
56
-
hash = "sha256-1zqfGzSI5RDACSNcz0tLA4VKMFwE5uD/YqOkgpzg2nQ=";
53
+
hash = "sha256-/OvYT4Vix1t5Yx/Tx0z3E9L9qJ4OdI4maQqUVl8H524=";
57
54
};
58
55
59
56
nativeBuildInputs = [
60
57
installShellFiles
58
+
pythonRelaxDepsHook
59
+
];
60
+
61
+
pythonRelaxDeps = [
62
+
# only pinned to avoid dependency on Rust
63
+
"jsonschema"
61
64
];
62
65
63
66
propagatedBuildInputs = [
···
66
69
cleo
67
70
crashtest
68
71
dulwich
69
-
filelock
70
-
html5lib
71
72
installer
72
73
jsonschema
73
74
keyring
74
-
lockfile
75
75
packaging
76
76
pexpect
77
77
pkginfo
···
84
84
shellingham
85
85
tomlkit
86
86
trove-classifiers
87
-
urllib3
88
87
virtualenv
89
88
] ++ lib.optionals (stdenv.isDarwin) [
90
89
xattr
···
130
129
"load"
131
130
"vcs"
132
131
"prereleases_if_they_are_compatible"
132
+
"test_builder_setup_generation_runs_with_pip_editable"
133
133
"test_executor"
134
134
# requires git history to work correctly
135
135
"default_with_excluded_data"