Show More
@@ -45,13 +45,14 b' self: super: {' | |||||
45 | # Override subversion derivation to |
|
45 | # Override subversion derivation to | |
46 | # - activate special python bindings |
|
46 | # - activate special python bindings | |
47 | subversionrc = |
|
47 | subversionrc = | |
|
48 | ||||
48 | let |
|
49 | let | |
49 | py3c = self.python38Packages.buildPythonPackage rec { |
|
50 | py3c = self.python38Packages.buildPythonPackage rec { | |
50 | pname = "py3c"; |
|
51 | pname = "py3c"; | |
51 |
version = "1. |
|
52 | version = "1.1"; | |
52 | src = self.fetchurl { |
|
53 | src = self.fetchurl { | |
53 | url = "https://files.pythonhosted.org/packages/6a/aa/9f1a69a8c71e72553b281603633e42501de932aa4d9912bccbf9a2884093/py3c-1.0.tar.gz"; |
|
54 | url = "https://github.com/encukou/py3c/archive/v1.1.tar.gz"; | |
54 | sha256 = "1h80jqi6r64kppxb4kshsiadrgc5hwk5arp3zcki01jf4ahknjz9"; |
|
55 | sha256 = "086xxccgzr4zkhsjkbcakydghrmll3rkxdcxhp5d1pidr4mw5zy7"; | |
55 | }; |
|
56 | }; | |
56 | format = "setuptools"; |
|
57 | format = "setuptools"; | |
57 | doCheck = false; |
|
58 | doCheck = false; | |
@@ -62,14 +63,16 b' self: super: {' | |||||
62 | meta = { |
|
63 | meta = { | |
63 | license = [ ]; |
|
64 | license = [ ]; | |
64 | }; |
|
65 | }; | |
|
66 | ||||
|
67 | preBuild = '' | |||
|
68 | make install | |||
|
69 | ''; | |||
65 | }; |
|
70 | }; | |
66 | in |
|
71 | ||
67 | let |
|
|||
68 | pythonWithEnv = self.python38Packages.python.buildEnv.override { |
|
72 | pythonWithEnv = self.python38Packages.python.buildEnv.override { | |
69 | extraLibs = [ py3c ]; |
|
73 | extraLibs = [ py3c ]; | |
70 | }; |
|
74 | }; | |
71 | in |
|
75 | ||
72 | let |
|
|||
73 | subversionWithPython = super.subversion.override { |
|
76 | subversionWithPython = super.subversion.override { | |
74 | httpSupport = true; # client must support http |
|
77 | httpSupport = true; # client must support http | |
75 | pythonBindings = true; |
|
78 | pythonBindings = true; | |
@@ -88,6 +91,7 b' self: super: {' | |||||
88 | configureFlags = oldAttrs.configureFlags ++ [ |
|
91 | configureFlags = oldAttrs.configureFlags ++ [ | |
89 | " --with-lz4=internal" |
|
92 | " --with-lz4=internal" | |
90 | " --with-utf8proc=internal" |
|
93 | " --with-utf8proc=internal" | |
|
94 | " --with-py3c=${py3c}/include/python3.8/py3c/" | |||
91 | ]; |
|
95 | ]; | |
92 | }); |
|
96 | }); | |
93 |
|
97 |
@@ -9,7 +9,7 b'' | |||||
9 | let |
|
9 | let | |
10 |
|
10 | |||
11 | # Full runtime environment without the actual Python package |
|
11 | # Full runtime environment without the actual Python package | |
12 | env = import ./default.nix { |
|
12 | PythonDepsEnv = import ./default.nix { | |
13 | inherit |
|
13 | inherit | |
14 | doCheck; |
|
14 | doCheck; | |
15 | pythonExternalOverrides = self: super: { |
|
15 | pythonExternalOverrides = self: super: { | |
@@ -27,7 +27,7 b' let' | |||||
27 | attrs.nativeBuildInputs ++ |
|
27 | attrs.nativeBuildInputs ++ | |
28 | attrs.buildInputs ++ |
|
28 | attrs.buildInputs ++ | |
29 | attrs.propagatedBuildInputs ++ [ |
|
29 | attrs.propagatedBuildInputs ++ [ | |
30 | env |
|
30 | PythonDepsEnv | |
31 | pytest |
|
31 | pytest | |
32 | ipdb |
|
32 | ipdb | |
33 | ipython |
|
33 | ipython |
General Comments 0
You need to be logged in to leave comments.
Login now