##// END OF EJS Templates
build: fixed setuptools
milka -
r919:648a9697 stable
parent child Browse files
Show More
@@ -0,0 +1,12 b''
1 diff -rup pytest-4.6.5-orig/setup.py pytest-4.6.5/setup.py
2 --- pytest-4.6.5-orig/setup.py 2018-04-10 10:23:04.000000000 +0200
3 +++ pytest-4.6.5/setup.py 2018-04-10 10:23:34.000000000 +0200
4 @@ -24,7 +24,7 @@ INSTALL_REQUIRES = [
5 def main():
6 setup(
7 use_scm_version={"write_to": "src/_pytest/_version.py"},
8 - setup_requires=["setuptools-scm", "setuptools>=40.0"],
9 + setup_requires=["setuptools-scm", "setuptools<=42.0"],
10 package_dir={"": "src"},
11 # fmt: off
12 extras_require={ No newline at end of file
@@ -1,72 +1,78 b''
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 "gevent" = super."gevent".override (attrs: {
24 "gevent" = super."gevent".override (attrs: {
25 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
25 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
26 # NOTE: (marcink) odd requirements from gevent aren't set properly,
26 # NOTE: (marcink) odd requirements from gevent aren't set properly,
27 # thus we need to inject psutil manually
27 # thus we need to inject psutil manually
28 self."psutil"
28 self."psutil"
29 ];
29 ];
30 });
30 });
31
31
32 "hgsubversion" = super."hgsubversion".override (attrs: {
32 "hgsubversion" = super."hgsubversion".override (attrs: {
33 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
33 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
34 pkgs.sqlite
34 pkgs.sqlite
35 #basePythonPackages.sqlite3
35 #basePythonPackages.sqlite3
36 self.mercurial
36 self.mercurial
37 ];
37 ];
38 });
38 });
39
39
40 "subvertpy" = super."subvertpy".override (attrs: {
40 "subvertpy" = super."subvertpy".override (attrs: {
41 SVN_PREFIX = "${pkgs.subversion.dev}";
41 SVN_PREFIX = "${pkgs.subversion.dev}";
42 propagatedBuildInputs = [
42 propagatedBuildInputs = [
43 pkgs.apr.dev
43 pkgs.apr.dev
44 pkgs.aprutil
44 pkgs.aprutil
45 pkgs.subversion
45 pkgs.subversion
46 ];
46 ];
47 });
47 });
48
48
49 "mercurial" = super."mercurial".override (attrs: {
49 "mercurial" = super."mercurial".override (attrs: {
50 propagatedBuildInputs = [
50 propagatedBuildInputs = [
51 # self.python.modules.curses
51 # self.python.modules.curses
52 ];
52 ];
53 });
53 });
54
54
55 "dulwich" = super."dulwich".override (attrs: {
55 "dulwich" = super."dulwich".override (attrs: {
56 patches = [
56 patches = [
57 ./patches/dulwich/handle-dir-refs.patch
57 ./patches/dulwich/handle-dir-refs.patch
58 ];
58 ];
59 });
59 });
60
60
61 "pygit2" = super."pygit2".override (attrs: {
61 "pygit2" = super."pygit2".override (attrs: {
62 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
62 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
63 pkgs.libffi
63 pkgs.libffi
64 pkgs.libgit2rc
64 pkgs.libgit2rc
65 ];
65 ];
66 });
66 });
67
67
68 "pytest" = super."pytest".override (attrs: {
69 patches = [
70 ./patches/pytest/setuptools.patch
71 ];
72 });
73
68 # Avoid that base packages screw up the build process
74 # Avoid that base packages screw up the build process
69 inherit (basePythonPackages)
75 inherit (basePythonPackages)
70 setuptools;
76 setuptools;
71
77
72 }
78 }
General Comments 0
You need to be logged in to leave comments. Login now