Show More
@@ -0,0 +1,12 b'' | |||
|
1 | diff -rup celery-2.2.10-orig/setup.py celery-2.2.10/setup.py | |
|
2 | --- celery-2.2.10-orig/setup.py 2017-02-25 15:30:34.000000000 +0100 | |
|
3 | +++ celery-2.2.10/setup.py 2017-02-25 15:30:34.000000000 +0100 | |
|
4 | @@ -48,7 +48,7 @@ try: | |
|
5 | except ImportError: | |
|
6 | install_requires.append("importlib") | |
|
7 | install_requires.extend([ | |
|
8 | - "python-dateutil>=1.5.0,<2.0.0", | |
|
9 | + "python-dateutil>=1.5.0,<2.2.0", | |
|
10 | "anyjson>=0.3.1", | |
|
11 | "kombu>=1.1.2,<2.0.0", | |
|
12 | "pyparsing>=1.5.0,<2.0.0", |
@@ -1,268 +1,276 b'' | |||
|
1 | 1 | # Overrides for the generated python-packages.nix |
|
2 | 2 | # |
|
3 | 3 | # This function is intended to be used as an extension to the generated file |
|
4 | 4 | # python-packages.nix. The main objective is to add needed dependencies of C |
|
5 | 5 | # libraries and tweak the build instructions where needed. |
|
6 | 6 | |
|
7 | 7 | { pkgs, basePythonPackages }: |
|
8 | 8 | |
|
9 | 9 | let |
|
10 | 10 | sed = "sed -i"; |
|
11 | 11 | localLicenses = { |
|
12 | 12 | repoze = { |
|
13 | 13 | fullName = "Repoze License"; |
|
14 | 14 | url = http://www.repoze.org/LICENSE.txt; |
|
15 | 15 | }; |
|
16 | 16 | }; |
|
17 | 17 | |
|
18 | 18 | in |
|
19 | 19 | |
|
20 | 20 | self: super: { |
|
21 | 21 | |
|
22 | 22 | appenlight-client = super.appenlight-client.override (attrs: { |
|
23 | 23 | meta = { |
|
24 | 24 | license = [ pkgs.lib.licenses.bsdOriginal ]; |
|
25 | 25 | }; |
|
26 | 26 | }); |
|
27 | 27 | |
|
28 | 28 | future = super.future.override (attrs: { |
|
29 | 29 | meta = { |
|
30 | 30 | license = [ pkgs.lib.licenses.mit ]; |
|
31 | 31 | }; |
|
32 | 32 | }); |
|
33 | 33 | |
|
34 | 34 | gnureadline = super.gnureadline.override (attrs: { |
|
35 | 35 | buildInputs = attrs.buildInputs ++ [ |
|
36 | 36 | pkgs.ncurses |
|
37 | 37 | ]; |
|
38 | 38 | patchPhase = '' |
|
39 | 39 | substituteInPlace setup.py --replace "/bin/bash" "${pkgs.bash}/bin/bash" |
|
40 | 40 | ''; |
|
41 | 41 | }); |
|
42 | 42 | |
|
43 | 43 | gunicorn = super.gunicorn.override (attrs: { |
|
44 | 44 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ |
|
45 | 45 | # johbo: futures is needed as long as we are on Python 2, otherwise |
|
46 | 46 | # gunicorn explodes if used with multiple threads per worker. |
|
47 | 47 | self.futures |
|
48 | 48 | ]; |
|
49 | 49 | }); |
|
50 | 50 | |
|
51 | 51 | nbconvert = super.nbconvert.override (attrs: { |
|
52 | 52 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ |
|
53 | 53 | # marcink: plug in jupyter-client for notebook rendering |
|
54 | 54 | self.jupyter-client |
|
55 | 55 | ]; |
|
56 | 56 | }); |
|
57 | 57 | |
|
58 | 58 | ipython = super.ipython.override (attrs: { |
|
59 | 59 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ |
|
60 | 60 | self.gnureadline |
|
61 | 61 | ]; |
|
62 | 62 | }); |
|
63 | 63 | |
|
64 | celery = super.celery.override (attrs: { | |
|
65 | # The current version of kombu needs some patching to work with the | |
|
66 | # other libs. Should be removed once we update celery and kombu. | |
|
67 | patches = [ | |
|
68 | ./patch-celery-dateutil.diff | |
|
69 | ]; | |
|
70 | }); | |
|
71 | ||
|
64 | 72 | kombu = super.kombu.override (attrs: { |
|
65 | 73 | # The current version of kombu needs some patching to work with the |
|
66 | 74 | # other libs. Should be removed once we update celery and kombu. |
|
67 | 75 | patches = [ |
|
68 | 76 | ./patch-kombu-py-2-7-11.diff |
|
69 | 77 | ./patch-kombu-msgpack.diff |
|
70 | 78 | ]; |
|
71 | 79 | }); |
|
72 | 80 | |
|
73 | 81 | lxml = super.lxml.override (attrs: { |
|
74 | 82 | # johbo: On 16.09 we need this to compile on darwin, otherwise compilation |
|
75 | 83 | # fails on Darwin. |
|
76 | 84 | hardeningDisable = if pkgs.stdenv.isDarwin then [ "format" ] else null; |
|
77 | 85 | buildInputs = with self; [ |
|
78 | 86 | pkgs.libxml2 |
|
79 | 87 | pkgs.libxslt |
|
80 | 88 | ]; |
|
81 | 89 | }); |
|
82 | 90 | |
|
83 | 91 | MySQL-python = super.MySQL-python.override (attrs: { |
|
84 | 92 | buildInputs = attrs.buildInputs ++ [ |
|
85 | 93 | pkgs.openssl |
|
86 | 94 | ]; |
|
87 | 95 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ |
|
88 | 96 | pkgs.mysql.lib |
|
89 | 97 | pkgs.zlib |
|
90 | 98 | ]; |
|
91 | 99 | }); |
|
92 | 100 | |
|
93 | 101 | psutil = super.psutil.override (attrs: { |
|
94 | 102 | buildInputs = attrs.buildInputs ++ |
|
95 | 103 | pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.IOKit; |
|
96 | 104 | }); |
|
97 | 105 | |
|
98 | 106 | psycopg2 = super.psycopg2.override (attrs: { |
|
99 | 107 | buildInputs = attrs.buildInputs ++ |
|
100 | 108 | pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.openssl; |
|
101 | 109 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ |
|
102 | 110 | pkgs.postgresql |
|
103 | 111 | ]; |
|
104 | 112 | meta = { |
|
105 | 113 | license = pkgs.lib.licenses.lgpl3Plus; |
|
106 | 114 | }; |
|
107 | 115 | }); |
|
108 | 116 | |
|
109 | 117 | py-gfm = super.py-gfm.override { |
|
110 | 118 | name = "py-gfm-0.1.3.rhodecode-upstream1"; |
|
111 | 119 | }; |
|
112 | 120 | |
|
113 | 121 | pycurl = super.pycurl.override (attrs: { |
|
114 | 122 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ |
|
115 | 123 | pkgs.curl |
|
116 | 124 | pkgs.openssl |
|
117 | 125 | ]; |
|
118 | 126 | preConfigure = '' |
|
119 | 127 | substituteInPlace setup.py --replace '--static-libs' '--libs' |
|
120 | 128 | export PYCURL_SSL_LIBRARY=openssl |
|
121 | 129 | ''; |
|
122 | 130 | meta = { |
|
123 | 131 | # TODO: It is LGPL and MIT |
|
124 | 132 | license = pkgs.lib.licenses.mit; |
|
125 | 133 | }; |
|
126 | 134 | }); |
|
127 | 135 | |
|
128 | 136 | Pylons = super.Pylons.override (attrs: { |
|
129 | 137 | name = "Pylons-1.0.2.rhodecode-patch1"; |
|
130 | 138 | }); |
|
131 | 139 | |
|
132 | 140 | pyramid = super.pyramid.override (attrs: { |
|
133 | 141 | postFixup = '' |
|
134 | 142 | wrapPythonPrograms |
|
135 | 143 | # TODO: johbo: "wrapPython" adds this magic line which |
|
136 | 144 | # confuses pserve. |
|
137 | 145 | ${sed} '/import sys; sys.argv/d' $out/bin/.pserve-wrapped |
|
138 | 146 | ''; |
|
139 | 147 | meta = { |
|
140 | 148 | license = localLicenses.repoze; |
|
141 | 149 | }; |
|
142 | 150 | }); |
|
143 | 151 | |
|
144 | 152 | pyramid-debugtoolbar = super.pyramid-debugtoolbar.override (attrs: { |
|
145 | 153 | meta = { |
|
146 | 154 | license = [ pkgs.lib.licenses.bsdOriginal localLicenses.repoze ]; |
|
147 | 155 | }; |
|
148 | 156 | }); |
|
149 | 157 | |
|
150 | 158 | pysqlite = super.pysqlite.override (attrs: { |
|
151 | 159 | propagatedBuildInputs = [ |
|
152 | 160 | pkgs.sqlite |
|
153 | 161 | ]; |
|
154 | 162 | meta = { |
|
155 | 163 | license = [ pkgs.lib.licenses.zlib pkgs.lib.licenses.libpng ]; |
|
156 | 164 | }; |
|
157 | 165 | }); |
|
158 | 166 | |
|
159 | 167 | pytest-runner = super.pytest-runner.override (attrs: { |
|
160 | 168 | propagatedBuildInputs = [ |
|
161 | 169 | self.setuptools-scm |
|
162 | 170 | ]; |
|
163 | 171 | }); |
|
164 | 172 | |
|
165 | 173 | python-ldap = super.python-ldap.override (attrs: { |
|
166 | 174 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ |
|
167 | 175 | pkgs.cyrus_sasl |
|
168 | 176 | pkgs.openldap |
|
169 | 177 | pkgs.openssl |
|
170 | 178 | ]; |
|
171 | 179 | # TODO: johbo: Remove the "or" once we drop 16.03 support. |
|
172 | 180 | NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl.dev or pkgs.cyrus_sasl}/include/sasl"; |
|
173 | 181 | }); |
|
174 | 182 | |
|
175 | 183 | python-pam = super.python-pam.override (attrs: |
|
176 | 184 | let |
|
177 | 185 | includeLibPam = pkgs.stdenv.isLinux; |
|
178 | 186 | in { |
|
179 | 187 | # TODO: johbo: Move the option up into the default.nix, we should |
|
180 | 188 | # include python-pam only on supported platforms. |
|
181 | 189 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ |
|
182 | 190 | pkgs.lib.optional includeLibPam [ |
|
183 | 191 | pkgs.pam |
|
184 | 192 | ]; |
|
185 | 193 | # TODO: johbo: Check if this can be avoided, or transform into |
|
186 | 194 | # a real patch |
|
187 | 195 | patchPhase = pkgs.lib.optionals includeLibPam '' |
|
188 | 196 | substituteInPlace pam.py \ |
|
189 | 197 | --replace 'find_library("pam")' '"${pkgs.pam}/lib/libpam.so.0"' |
|
190 | 198 | ''; |
|
191 | 199 | }); |
|
192 | 200 | |
|
193 | 201 | URLObject = super.URLObject.override (attrs: { |
|
194 | 202 | meta = { |
|
195 | 203 | license = { |
|
196 | 204 | spdxId = "Unlicense"; |
|
197 | 205 | fullName = "The Unlicense"; |
|
198 | 206 | url = http://unlicense.org/; |
|
199 | 207 | }; |
|
200 | 208 | }; |
|
201 | 209 | }); |
|
202 | 210 | |
|
203 | 211 | amqplib = super.amqplib.override (attrs: { |
|
204 | 212 | meta = { |
|
205 | 213 | license = pkgs.lib.licenses.lgpl3; |
|
206 | 214 | }; |
|
207 | 215 | }); |
|
208 | 216 | |
|
209 | 217 | docutils = super.docutils.override (attrs: { |
|
210 | 218 | meta = { |
|
211 | 219 | license = pkgs.lib.licenses.bsd2; |
|
212 | 220 | }; |
|
213 | 221 | }); |
|
214 | 222 | |
|
215 | 223 | colander = super.colander.override (attrs: { |
|
216 | 224 | meta = { |
|
217 | 225 | license = localLicenses.repoze; |
|
218 | 226 | }; |
|
219 | 227 | }); |
|
220 | 228 | |
|
221 | 229 | pyramid-beaker = super.pyramid-beaker.override (attrs: { |
|
222 | 230 | meta = { |
|
223 | 231 | license = localLicenses.repoze; |
|
224 | 232 | }; |
|
225 | 233 | }); |
|
226 | 234 | |
|
227 | 235 | pyramid-mako = super.pyramid-mako.override (attrs: { |
|
228 | 236 | meta = { |
|
229 | 237 | license = localLicenses.repoze; |
|
230 | 238 | }; |
|
231 | 239 | }); |
|
232 | 240 | |
|
233 | 241 | repoze.lru = super.repoze.lru.override (attrs: { |
|
234 | 242 | meta = { |
|
235 | 243 | license = localLicenses.repoze; |
|
236 | 244 | }; |
|
237 | 245 | }); |
|
238 | 246 | |
|
239 | 247 | recaptcha-client = super.recaptcha-client.override (attrs: { |
|
240 | 248 | meta = { |
|
241 | 249 | # TODO: It is MIT/X11 |
|
242 | 250 | license = pkgs.lib.licenses.mit; |
|
243 | 251 | }; |
|
244 | 252 | }); |
|
245 | 253 | |
|
246 | 254 | python-editor = super.python-editor.override (attrs: { |
|
247 | 255 | meta = { |
|
248 | 256 | license = pkgs.lib.licenses.asl20; |
|
249 | 257 | }; |
|
250 | 258 | }); |
|
251 | 259 | |
|
252 | 260 | translationstring = super.translationstring.override (attrs: { |
|
253 | 261 | meta = { |
|
254 | 262 | license = localLicenses.repoze; |
|
255 | 263 | }; |
|
256 | 264 | }); |
|
257 | 265 | |
|
258 | 266 | venusian = super.venusian.override (attrs: { |
|
259 | 267 | meta = { |
|
260 | 268 | license = localLicenses.repoze; |
|
261 | 269 | }; |
|
262 | 270 | }); |
|
263 | 271 | |
|
264 | 272 | # Avoid that setuptools is replaced, this leads to trouble |
|
265 | 273 | # with buildPythonPackage. |
|
266 | 274 | setuptools = basePythonPackages.setuptools; |
|
267 | 275 | |
|
268 | 276 | } |
General Comments 0
You need to be logged in to leave comments.
Login now