##// END OF EJS Templates
core: fix zipp package patches
milka -
r930:87b36281 default
parent child
Show More
@@ -0,0 +1,10
1 diff -rup zip-1.2.0-orig/pyproject.toml zip-1.2.0/pyproject.toml
2 --- zip-1.2.0-orig/pyproject.toml 2021-03-23 10:55:37.000000000 +0100
3 +++ zip-1.2.0/pyproject.toml 2021-03-23 10:56:05.000000000 +0100
4 @@ -1,5 +1,5 @@
5 [build-system]
6 -requires = ["setuptools>=34.4", "wheel", "setuptools_scm>=1.15"]
7 +requires = ["setuptools<42.0", "wheel", "setuptools_scm<6.0.0"]
8 build-backend = "setuptools.build_meta"
9
10 [tool.black]
@@ -1,123 +1,126
1 # Overrides for the generated python-packages.nix
1 # Overrides for the generated python-packages.nix
2 #
2 #
3 # This function is intended to be used as an extension to the generated file
3 # This function is intended to be used as an extension to the generated file
4 # python-packages.nix. The main objective is to add needed dependencies of C
4 # python-packages.nix. The main objective is to add needed dependencies of C
5 # libraries and tweak the build instructions where needed.
5 # libraries and tweak the build instructions where needed.
6
6
7 { pkgs
7 { pkgs
8 , basePythonPackages
8 , basePythonPackages
9 }:
9 }:
10
10
11 let
11 let
12 sed = "sed -i";
12 sed = "sed -i";
13
13
14 in
14 in
15
15
16 self: super: {
16 self: super: {
17
17
18 "cffi" = super."cffi".override (attrs: {
18 "cffi" = super."cffi".override (attrs: {
19 buildInputs = [
19 buildInputs = [
20 pkgs.libffi
20 pkgs.libffi
21 ];
21 ];
22 });
22 });
23
23
24 "ipython" = super."ipython".override (attrs: {
24 "ipython" = super."ipython".override (attrs: {
25 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
25 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
26 self."setuptools-scm"
26 self."setuptools-scm"
27 ];
27 ];
28 });
28 });
29
29
30 "gevent" = super."gevent".override (attrs: {
30 "gevent" = super."gevent".override (attrs: {
31 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
31 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
32 # NOTE: (marcink) odd requirements from gevent aren not set properly,
32 # NOTE: (marcink) odd requirements from gevent aren not set properly,
33 # thus we need to inject psutil manually
33 # thus we need to inject psutil manually
34 self."psutil"
34 self."psutil"
35 ];
35 ];
36 });
36 });
37
37
38 "hgsubversion" = super."hgsubversion".override (attrs: {
38 "hgsubversion" = super."hgsubversion".override (attrs: {
39 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
39 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
40 pkgs.sqlite
40 pkgs.sqlite
41 #basePythonPackages.sqlite3
41 #basePythonPackages.sqlite3
42 self.mercurial
42 self.mercurial
43 ];
43 ];
44 });
44 });
45
45
46 "subvertpy" = super."subvertpy".override (attrs: {
46 "subvertpy" = super."subvertpy".override (attrs: {
47 SVN_PREFIX = "${pkgs.subversion.dev}";
47 SVN_PREFIX = "${pkgs.subversion.dev}";
48 propagatedBuildInputs = [
48 propagatedBuildInputs = [
49 pkgs.apr.dev
49 pkgs.apr.dev
50 pkgs.aprutil
50 pkgs.aprutil
51 pkgs.subversion
51 pkgs.subversion
52 ];
52 ];
53 });
53 });
54
54
55 "mercurial" = super."mercurial".override (attrs: {
55 "mercurial" = super."mercurial".override (attrs: {
56 propagatedBuildInputs = [
56 propagatedBuildInputs = [
57 # self.python.modules.curses
57 # self.python.modules.curses
58 ];
58 ];
59 });
59 });
60
60
61 "dulwich" = super."dulwich".override (attrs: {
61 "dulwich" = super."dulwich".override (attrs: {
62 patches = [
62 patches = [
63 ./patches/dulwich/handle-dir-refs.patch
63 ./patches/dulwich/handle-dir-refs.patch
64 ];
64 ];
65 });
65 });
66
66
67 "pygit2" = super."pygit2".override (attrs: {
67 "pygit2" = super."pygit2".override (attrs: {
68 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
68 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
69 pkgs.libffi
69 pkgs.libffi
70 pkgs.libgit2rc
70 pkgs.libgit2rc
71 ];
71 ];
72 });
72 });
73
73
74 "pytest" = super."pytest".override (attrs: {
74 "pytest" = super."pytest".override (attrs: {
75 patches = [
75 patches = [
76 ./patches/pytest/setuptools.patch
76 ./patches/pytest/setuptools.patch
77 ];
77 ];
78 });
78 });
79
79
80 "pytest-runner" = super."pytest-runner".override (attrs: {
80 "pytest-runner" = super."pytest-runner".override (attrs: {
81 propagatedBuildInputs = [
81 propagatedBuildInputs = [
82 self."setuptools-scm"
82 self."setuptools-scm"
83 ];
83 ];
84 });
84 });
85
85
86 "py" = super."py".override (attrs: {
86 "py" = super."py".override (attrs: {
87 propagatedBuildInputs = [
87 propagatedBuildInputs = [
88 self."setuptools-scm"
88 self."setuptools-scm"
89 ];
89 ];
90 });
90 });
91
91
92 "configparser" = super."configparser".override (attrs: {
92 "configparser" = super."configparser".override (attrs: {
93 patches = [
93 patches = [
94 ./patches/configparser/pyproject.patch
94 ./patches/configparser/pyproject.patch
95 ];
95 ];
96 propagatedBuildInputs = [
96 propagatedBuildInputs = [
97 self."setuptools-scm"
97 self."setuptools-scm"
98 ];
98 ];
99 });
99 });
100
100
101 "importlib-metadata" = super."importlib-metadata".override (attrs: {
101 "importlib-metadata" = super."importlib-metadata".override (attrs: {
102
102
103 patches = [
103 patches = [
104 ./patches/importlib_metadata/pyproject.patch
104 ./patches/importlib_metadata/pyproject.patch
105 ];
105 ];
106
106
107 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
107 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
108 self."setuptools-scm"
108 self."setuptools-scm"
109 ];
109 ];
110
110
111 });
112
111 "zipp" = super."zipp".override (attrs: {
113 "zipp" = super."zipp".override (attrs: {
114 patches = [
115 ./patches/zipp/pyproject.patch
116 ];
112 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
117 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
113 self."setuptools-scm"
118 self."setuptools-scm"
114 ];
119 ];
115 });
120 });
116
121
117 });
118
119 # Avoid that base packages screw up the build process
122 # Avoid that base packages screw up the build process
120 inherit (basePythonPackages)
123 inherit (basePythonPackages)
121 setuptools;
124 setuptools;
122
125
123 }
126 }
General Comments 0
You need to be logged in to leave comments. Login now