##// END OF EJS Templates
py3: packaging changes to build python37 packages, and make pip2nix work.
marcink -
r981:55389aab python3
parent child Browse files
Show More
@@ -6,7 +6,7 b''
6 6
7 7 args@
8 8 { system ? builtins.currentSystem
9 , pythonPackages ? "python27Packages"
9 , pythonPackages ? "python37Packages"
10 10 , pythonExternalOverrides ? self: super: {}
11 11 , doCheck ? false
12 12 , ...
@@ -26,11 +26,6 b' let'
26 26 system;
27 27 };
28 28
29 # Works with the new python-packages, still can fallback to the old
30 # variant.
31 basePythonPackagesUnfix = basePythonPackages.__unfix__ or (
32 self: basePythonPackages.override (a: { inherit self; }));
33
34 29 # Evaluates to the last segment of a file system path.
35 30 basename = path: with pkgs.lib; last (splitString "/" path);
36 31 startsWith = prefix: full: let
@@ -72,13 +67,7 b' let'
72 67 rhodecode-vcsserver =
73 68 let
74 69 releaseName = "RhodeCodeVCSServer-${version}";
75 pythonWithEnv =
76 self.python.buildEnv.override {
77 extraLibs = [ ] ++ self.rhodecode-vcsserver.propagatedBuildInputs;
78 ignoreCollisions = true;
79 #--set PYTHONHASHSEED random TODO
80 };
81 in super.rhodecode-vcsserver.override (attrs: {
70 in super.rhodecode-vcsserver.overridePythonAttrs (attrs: {
82 71 inherit
83 72 doCheck
84 73 version;
@@ -88,12 +77,6 b' let'
88 77 src = rhodecode-vcsserver-src;
89 78 dontStrip = true; # prevent strip, we don't need it.
90 79
91 # expose following attributed outside
92 passthru = {
93 pythonPackages = self;
94 vcs_pkgs = pkgs;
95 };
96
97 80 buildInputs =
98 81 attrs.buildInputs or [] ++ [
99 82
@@ -120,7 +103,7 b' let'
120 103 # custom check phase for testing
121 104 checkPhase = ''
122 105 runHook preCheck
123 PYTHONHASHSEED=random py.test -vv -p no:sugar -r xw --cov-config=.coveragerc --cov=vcsserver --cov-report=term-missing vcsserver
106 PYTHONHASHSEED=$RANDOM py.test -vv -p no:sugar -r xw --cov-config=.coveragerc --cov=vcsserver --cov-report=term-missing vcsserver
124 107 runHook postCheck
125 108 '';
126 109
@@ -145,45 +128,6 b' let'
145 128 echo "LOCALE_ARCHIVE=\"${pkgs.glibcLocales}/lib/locale/locale-archive\"" >> $out/etc/env_vars.txt
146 129 echo "LC_ALL=\"en_US.UTF-8\"" >> $out/etc/env_vars.txt
147 130
148 # python based programs need to be wrapped
149 mkdir -p $out/bin
150
151 # expose python
152 ln -s ${pythonWithEnv}/bin/python $out/bin/
153
154 # required binaries from dependencies
155 ln -s ${pythonWithEnv}/bin/gunicorn $out/bin/
156 ln -s ${pythonWithEnv}/bin/prequest $out/bin/
157 ln -s ${pythonWithEnv}/bin/pserve $out/bin/
158
159 # Symlink version control utilities
160 # We ensure that always the correct version is available as a symlink.
161 # So that users calling them via the profile path will always use the
162 # correct version. Wrapping is required so those can "import"
163 # vcsserver python hooks.
164 ln -s ${pkgs.git}/bin/git $out/bin
165 ln -s ${self.mercurial}/bin/hg $out/bin
166 ln -s ${pkgs.subversion}/bin/svn* $out/bin
167
168 echo "[DONE ]: created symlinks into $out/bin"
169 DEPS="$out/bin/hg \
170 $out/bin/git \
171 $out/bin/svn \
172 $out/bin/svnserve \
173 $out/bin/svnadmin
174 "
175
176 # wrap only dependency scripts, they require to have full PYTHONPATH set
177 # to be able to import all packages
178 for file in $DEPS;
179 do
180 wrapProgram $file \
181 --prefix PATH : $PATH \
182 --prefix PYTHONPATH : $PYTHONPATH
183 done
184
185 echo "[DONE ]: vcsserver binary wrapping"
186
187 131 # expose sources of vcsserver
188 132 ln -s $out $out/etc/rhodecode_vcsserver_source
189 133 '';
@@ -191,7 +135,6 b' let'
191 135 });
192 136 };
193 137
194
195 138 basePythonPackages = with builtins;
196 139 if isAttrs pythonPackages then
197 140 pythonPackages
@@ -207,14 +150,62 b' let'
207 150 inherit pkgs basePythonPackages;
208 151 };
209 152
210 # Apply all overrides and fix the final package set
211 myPythonPackagesUnfix = with pkgs.lib;
153 # Apply all overrides and fix the vcsserver package set
154 targetPython = basePythonPackages.python.override {
155 packageOverrides = self: super: with pkgs.lib;
212 156 (extends pythonExternalOverrides
213 157 (extends pythonLocalOverrides
214 158 (extends pythonVCSServerOverrides
215 159 (extends pythonGeneratedPackages
216 basePythonPackagesUnfix))));
160 (self: super))))) self;
161 };
162
163 # Python env with rhodecode-vcsserver
164 pythonEnv = (targetPython.withPackages(ps: with ps; [rhodecode-vcsserver]));
217 165
218 myPythonPackages = (pkgs.lib.fix myPythonPackagesUnfix);
166 # Generic env with wrapped binaries
167 vcsserver = pkgs.buildEnv {
168 name = if ! isNull targetPython.pkgs.rhodecode-vcsserver
169 then "vcsserver-${targetPython.pkgs.rhodecode-vcsserver.version}"
170 else "vcsserver";
171 paths = [
172 pythonEnv
173 # Symlink version control utilities
174 # We ensure that always the correct version is available as a symlink.
175 # So that users calling them via the profile path will always use the
176 # correct version. Wrapping is required so those can "import"
177 # vcsserver python hooks.
178 pkgs.git
179 pkgs.subversion
180 ];
181 # expose following attributed outside
182 passthru = {
183 pythonPackages = targetPython.pkgs;
184 vcs_pkgs = pkgs;
185 };
186 buildInputs = [
187 pkgs.makeWrapper
188 ];
189 postBuild = (if ! isNull targetPython.pkgs.rhodecode-vcsserver then ''
190 echo "Writing vcsserver meta information for rccontrol to nix-support/rccontrol"
191 ln -s ${targetPython.pkgs.rhodecode-vcsserver}/nix-support $out/nix-support
192 echo "DONE: vcsserver meta information for rccontrol written"
193 '' else "") + ''
194 DEPS="$out/bin/*"
195 # wrap only dependency scripts, they require to have full PYTHONPATH set
196 # to be able to import all packages
197 for file in $DEPS;
198 do
199 wrapProgram $file \
200 --prefix PATH : ${pkgs.git}/bin \
201 --prefix PATH : ${pkgs.subversion}/bin \
202 --prefix PATH : ${pythonEnv}/bin \
203 --prefix PYTHONPATH : ${pythonEnv}/${pythonEnv.sitePackages} \
204 --prefix PYTHONPATH : ${pkgs.subversion}/${pythonEnv.sitePackages} \
205 --set PYTHONHASHSEED $RANDOM
206 done
207 echo "DONE: vcsserver binary wrapping"
208 '';
209 };
219 210
220 in myPythonPackages.rhodecode-vcsserver
211 in vcsserver
@@ -14,6 +14,10 b' rec {'
14 14 pythonPackages;
15 15 };
16 16
17 flit = pythonPackages.flit;
18
19 cython = pythonPackages.pip-tools;
20
17 21 pip-tools = pythonPackages.pip-tools;
18 22
19 23 setuptools = pythonPackages.setuptools;
@@ -50,7 +50,7 b' self: super: {'
50 50 subversionWithPython = super.subversion.override {
51 51 httpSupport = true;
52 52 pythonBindings = true;
53 python = self.python27Packages.python;
53 python = self.python37Packages.python;
54 54 };
55 55 in
56 56 super.lib.overrideDerivation subversionWithPython (oldAttrs: {
@@ -52,6 +52,16 b' self: super: {'
52 52 nativeBuildInputs = with self; attrs.nativeBuildInputs ++ [
53 53 # self.python.modules.curses
54 54 ];
55 postInstall = ''
56 rm -f $out/${self.python.sitePackages}/hgext3rd/__pycache__/__init__.*.pyc
57 '';
58 });
59
60 "hg-evolve" = super."hg-evolve".override (attrs: {
61 postInstall = ''
62 rm -f $out/${self.python.sitePackages}/hgext3rd/__init__.py
63 rm -f $out/${self.python.sitePackages}/hgext3rd/__init__.pyc
64 '';
55 65 });
56 66
57 67 "dulwich" = super."dulwich".override (attrs: {
@@ -76,6 +86,12 b' self: super: {'
76 86 ];
77 87 });
78 88
89 "zipp" = super."zipp".override (attrs: {
90 buildInputs = with self; attrs.buildInputs ++ [
91 self."toml"
92 ];
93 });
94
79 95 # Avoid that base packages screw up the build process
80 96 inherit (basePythonPackages)
81 97 setuptools;
@@ -41,23 +41,6 b' self: super: {'
41 41 license = [ pkgs.lib.licenses.mit ];
42 42 };
43 43 };
44 "backports.shutil-get-terminal-size" = super.buildPythonPackage rec {
45 pname = "backports.shutil-get-terminal-size";
46 version = "1.0.0";
47 src = fetchurl {
48 url = "https://files.pythonhosted.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b/backports.shutil_get_terminal_size-1.0.0.tar.gz";
49 sha256 = "107cmn7g3jnbkp826zlj8rrj19fam301qvaqf0f3905f5217lgki";
50 };
51 format = "setuptools";
52 doCheck = false;
53 buildInputs = [];
54 checkInputs = [];
55 nativeBuildInputs = [];
56 propagatedBuildInputs = [];
57 meta = {
58 license = [ pkgs.lib.licenses.mit ];
59 };
60 };
61 44 "beautifulsoup4" = super.buildPythonPackage rec {
62 45 pname = "beautifulsoup4";
63 46 version = "4.6.3";
@@ -77,10 +60,10 b' self: super: {'
77 60 };
78 61 "cffi" = super.buildPythonPackage rec {
79 62 pname = "cffi";
80 version = "1.12.3";
63 version = "1.14.0";
81 64 src = fetchurl {
82 url = "https://files.pythonhosted.org/packages/93/1a/ab8c62b5838722f29f3daffcc8d4bd61844aa9b5f437341cc890ceee483b/cffi-1.12.3.tar.gz";
83 sha256 = "0x075521fxwv0mfp4cqzk7lvmw4n94bjw601qkcv314z5s182704";
65 url = "https://files.pythonhosted.org/packages/05/54/3324b0c46340c31b909fcec598696aaec7ddc8c18a63f2db352562d3354c/cffi-1.14.0.tar.gz";
66 sha256 = "1dn279gw5ql8i5n3s5v4rnv96rhhjjfn7xq729qbl5bs2954yf1d";
84 67 };
85 68 format = "setuptools";
86 69 doCheck = false;
@@ -113,27 +96,6 b' self: super: {'
113 96 license = [ pkgs.lib.licenses.bsdOriginal ];
114 97 };
115 98 };
116 "configparser" = super.buildPythonPackage rec {
117 pname = "configparser";
118 version = "4.0.2";
119 src = fetchurl {
120 url = "https://files.pythonhosted.org/packages/16/4f/48975536bd488d3a272549eb795ac4a13a5f7fcdc8995def77fbef3532ee/configparser-4.0.2.tar.gz";
121 sha256 = "1priacxym85yjcf68hh38w55nqswaxp71ryjyfdk222kg9l85ln7";
122 };
123 format = "setuptools";
124 doCheck = false;
125 buildInputs = [];
126 checkInputs = [];
127 nativeBuildInputs = [
128 self."setuptools"
129 self."wheel"
130 self."setuptools-scm"
131 ];
132 propagatedBuildInputs = [];
133 meta = {
134 license = [ pkgs.lib.licenses.mit ];
135 };
136 };
137 99 "contextlib2" = super.buildPythonPackage rec {
138 100 pname = "contextlib2";
139 101 version = "0.6.0.post1";
@@ -187,23 +149,6 b' self: super: {'
187 149 license = [ pkgs.lib.licenses.asl20 ];
188 150 };
189 151 };
190 "cython" = super.buildPythonPackage rec {
191 pname = "cython";
192 version = "0.29.17";
193 src = fetchurl {
194 url = "https://files.pythonhosted.org/packages/99/36/a3dc962cc6d08749aa4b9d85af08b6e354d09c5468a3e0edc610f44c856b/Cython-0.29.17.tar.gz";
195 sha256 = "1wnaz40hdw4mg5acz5gqb6bhjhn4cvfxg0xdzfy7aa6qn665hqb3";
196 };
197 format = "setuptools";
198 doCheck = false;
199 buildInputs = [];
200 checkInputs = [];
201 nativeBuildInputs = [];
202 propagatedBuildInputs = [];
203 meta = {
204 license = [ pkgs.lib.licenses.asl20 { fullName = "Apache"; } ];
205 };
206 };
207 152 "decorator" = super.buildPythonPackage rec {
208 153 pname = "decorator";
209 154 version = "4.1.2";
@@ -218,15 +163,15 b' self: super: {'
218 163 nativeBuildInputs = [];
219 164 propagatedBuildInputs = [];
220 165 meta = {
221 license = [ pkgs.lib.licenses.bsdOriginal { fullName = "new BSD License"; } ];
166 license = [ { fullName = "new BSD License"; } pkgs.lib.licenses.bsdOriginal ];
222 167 };
223 168 };
224 169 "dogpile.cache" = super.buildPythonPackage rec {
225 170 pname = "dogpile.cache";
226 version = "0.9.0";
171 version = "0.9.2";
227 172 src = fetchurl {
228 url = "https://files.pythonhosted.org/packages/ac/6a/9ac405686a94b7f009a20a50070a5786b0e1aedc707b88d40d0c4b51a82e/dogpile.cache-0.9.0.tar.gz";
229 sha256 = "0sr1fn6b4k5bh0cscd9yi8csqxvj4ngzildav58x5p694mc86j5k";
173 url = "https://files.pythonhosted.org/packages/b5/02/9692c82808341747afc87a7c2b701c8eed76c05ec6bc98844c102a537de7/dogpile.cache-0.9.2.tar.gz";
174 sha256 = "17h5bkijp4zj49a9a0dd608r4lq5xxrkgiydzfg1gq2xz8gxx7dw";
230 175 };
231 176 format = "setuptools";
232 177 doCheck = false;
@@ -237,7 +182,7 b' self: super: {'
237 182 self."decorator"
238 183 ];
239 184 meta = {
240 license = [ pkgs.lib.licenses.bsdOriginal ];
185 license = [ pkgs.lib.licenses.mit pkgs.lib.licenses.bsdOriginal ];
241 186 };
242 187 };
243 188 "dogpile.core" = super.buildPythonPackage rec {
@@ -274,65 +219,6 b' self: super: {'
274 219 license = [ pkgs.lib.licenses.gpl2Plus ];
275 220 };
276 221 };
277 "enum34" = super.buildPythonPackage rec {
278 pname = "enum34";
279 version = "1.1.10";
280 src = fetchurl {
281 url = "https://files.pythonhosted.org/packages/11/c4/2da1f4952ba476677a42f25cd32ab8aaf0e1c0d0e00b89822b835c7e654c/enum34-1.1.10.tar.gz";
282 sha256 = "0j7ji699fwswm4vg6w1v07fkbf8dkzdm6gfh88jvs5nqgr3sgrnc";
283 };
284 format = "setuptools";
285 doCheck = false;
286 buildInputs = [];
287 checkInputs = [];
288 nativeBuildInputs = [];
289 propagatedBuildInputs = [];
290 meta = {
291 license = [ pkgs.lib.licenses.bsdOriginal ];
292 };
293 };
294 "funcsigs" = super.buildPythonPackage rec {
295 pname = "funcsigs";
296 version = "1.0.2";
297 src = fetchurl {
298 url = "https://files.pythonhosted.org/packages/94/4a/db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23/funcsigs-1.0.2.tar.gz";
299 sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
300 };
301 format = "setuptools";
302 doCheck = false;
303 buildInputs = [];
304 checkInputs = [];
305 nativeBuildInputs = [];
306 propagatedBuildInputs = [];
307 meta = {
308 license = [ { fullName = "ASL"; } pkgs.lib.licenses.asl20 ];
309 };
310 };
311 "gevent" = super.buildPythonPackage rec {
312 pname = "gevent";
313 version = "1.5.0";
314 src = fetchurl {
315 url = "https://files.pythonhosted.org/packages/5a/79/2c63d385d017b5dd7d70983a463dfd25befae70c824fedb857df6e72eff2/gevent-1.5.0.tar.gz";
316 sha256 = "0aac3d4vhv5n4rsb6cqzq0d1xx9immqz4fmpddw35yxkwdc450dj";
317 };
318 format = "setuptools";
319 doCheck = false;
320 buildInputs = [];
321 checkInputs = [];
322 nativeBuildInputs = [
323 self."setuptools"
324 self."wheel"
325 self."cython"
326 self."cffi"
327 self."greenlet"
328 ];
329 propagatedBuildInputs = [
330 self."greenlet"
331 ];
332 meta = {
333 license = [ pkgs.lib.licenses.mit ];
334 };
335 };
336 222 "gprof2dot" = super.buildPythonPackage rec {
337 223 pname = "gprof2dot";
338 224 version = "2017.9.19";
@@ -347,49 +233,34 b' self: super: {'
347 233 nativeBuildInputs = [];
348 234 propagatedBuildInputs = [];
349 235 meta = {
350 license = [ { fullName = "GNU Lesser General Public License v3 or later (LGPLv3+)"; } { fullName = "LGPL"; } ];
236 license = [ { fullName = "LGPL"; } { fullName = "GNU Lesser General Public License v3 or later (LGPLv3+)"; } ];
351 237 };
352 238 };
353 "greenlet" = super.buildPythonPackage rec {
354 pname = "greenlet";
355 version = "0.4.15";
239 "gunicorn" = super.buildPythonPackage rec {
240 pname = "gunicorn";
241 version = "20.0.4";
356 242 src = fetchurl {
357 url = "https://files.pythonhosted.org/packages/f8/e8/b30ae23b45f69aa3f024b46064c0ac8e5fcb4f22ace0dca8d6f9c8bbe5e7/greenlet-0.4.15.tar.gz";
358 sha256 = "1g4g1wwc472ds89zmqlpyan3fbnzpa8qm48z3z1y6mlk44z485ll";
243 url = "https://files.pythonhosted.org/packages/33/b8/f5fd32e1f46fcfefd7cb5c84dee1cf657ab3540ee92b8a09fc40e4887bf0/gunicorn-20.0.4.tar.gz";
244 sha256 = "09n6fc019bgrvph1s5h1lwhn2avcsprw6ncd203qhra3i8mvn10r";
359 245 };
360 246 format = "setuptools";
361 247 doCheck = false;
362 248 buildInputs = [];
363 249 checkInputs = [];
364 250 nativeBuildInputs = [];
365 propagatedBuildInputs = [];
366 meta = {
367 license = [ pkgs.lib.licenses.mit ];
368 };
369 };
370 "gunicorn" = super.buildPythonPackage rec {
371 pname = "gunicorn";
372 version = "19.9.0";
373 src = fetchurl {
374 url = "https://files.pythonhosted.org/packages/47/52/68ba8e5e8ba251e54006a49441f7ccabca83b6bef5aedacb4890596c7911/gunicorn-19.9.0.tar.gz";
375 sha256 = "1wzlf4xmn6qjirh5w81l6i6kqjnab1n1qqkh7zsj1yb6gh4n49ps";
376 };
377 format = "setuptools";
378 doCheck = false;
379 buildInputs = [];
380 checkInputs = [];
381 nativeBuildInputs = [];
382 propagatedBuildInputs = [];
251 propagatedBuildInputs = [
252 self."setuptools"
253 ];
383 254 meta = {
384 255 license = [ pkgs.lib.licenses.mit ];
385 256 };
386 257 };
387 258 "hg-evolve" = super.buildPythonPackage rec {
388 259 pname = "hg-evolve";
389 version = "9.1.0";
260 version = "10.0.0";
390 261 src = fetchurl {
391 url = "https://files.pythonhosted.org/packages/20/36/5a6655975aa0c663be91098d31a0b24841acad44fe896aa2bdee77c6b883/hg-evolve-9.1.0.tar.gz";
392 sha256 = "1mna81cmzxxn7s2nwz3g1xgdjlcc1axkvfmwg7gjqghwn3pdraps";
262 url = "https://files.pythonhosted.org/packages/b8/81/d86d3b4e6c602074805b086ae7471672d24d7ffa4f68ddb97bf68dd460fd/hg-evolve-10.0.0.tar.gz";
263 sha256 = "03kn1c62y6rb851wjhsaxkrwq223hkc4ij59i85999byyb2hyqad";
393 264 };
394 265 format = "setuptools";
395 266 doCheck = false;
@@ -443,10 +314,10 b' self: super: {'
443 314 };
444 315 "importlib-metadata" = super.buildPythonPackage rec {
445 316 pname = "importlib-metadata";
446 version = "1.6.0";
317 version = "1.6.1";
447 318 src = fetchurl {
448 url = "https://files.pythonhosted.org/packages/b4/1b/baab42e3cd64c9d5caac25a9d6c054f8324cdc38975a44d600569f1f7158/importlib_metadata-1.6.0.tar.gz";
449 sha256 = "07icyggasn38yv2swdrd8z6i0plazmc9adavsdkbqqj91j53ll9l";
319 url = "https://files.pythonhosted.org/packages/aa/9a/8483b77e2decd95963d7e34bc9bc91a26e71fd89b57d8cf978ca24747c7f/importlib_metadata-1.6.1.tar.gz";
320 sha256 = "0if5fp7wgr7gdrm47dw1v9bpfvb74zchljm7ac7w1zlc0q4ds185";
450 321 };
451 322 format = "setuptools";
452 323 doCheck = false;
@@ -458,69 +329,18 b' self: super: {'
458 329 self."setuptools-scm"
459 330 ];
460 331 propagatedBuildInputs = [
461 self."configparser"
462 self."contextlib2"
463 self."pathlib2"
464 332 self."zipp"
465 333 ];
466 334 meta = {
467 335 license = [ pkgs.lib.licenses.asl20 ];
468 336 };
469 337 };
470 "ipdb" = super.buildPythonPackage rec {
471 pname = "ipdb";
472 version = "0.13.2";
473 src = fetchurl {
474 url = "https://files.pythonhosted.org/packages/2c/bb/a3e1a441719ebd75c6dac8170d3ddba884b7ee8a5c0f9aefa7297386627a/ipdb-0.13.2.tar.gz";
475 sha256 = "0jcd849rx30y3wcgzsqbn06v0yjlzvb9x3076q0yxpycdwm1ryvp";
476 };
477 format = "setuptools";
478 doCheck = false;
479 buildInputs = [];
480 checkInputs = [];
481 nativeBuildInputs = [];
482 propagatedBuildInputs = [
483 self."ipython"
484 self."setuptools"
485 ];
486 meta = {
487 license = [ pkgs.lib.licenses.bsdOriginal ];
488 };
489 };
490 "ipython" = super.buildPythonPackage rec {
491 pname = "ipython";
492 version = "5.10.0";
338 "mercurial" = super.buildPythonPackage rec {
339 pname = "mercurial";
340 version = "5.4.1";
493 341 src = fetchurl {
494 url = "https://files.pythonhosted.org/packages/b6/73/c8f68b3a7d0deece3d2f7ab727fbf262bfca7475330b44043a5503b3aa7a/ipython-5.10.0.tar.gz";
495 sha256 = "1vjgfayfsjkwsccizpmr8gfg6p1sr9513bxnyzg0v45h5g8f5yfi";
496 };
497 format = "setuptools";
498 doCheck = false;
499 buildInputs = [];
500 checkInputs = [];
501 nativeBuildInputs = [];
502 propagatedBuildInputs = [
503 self."backports.shutil-get-terminal-size"
504 self."decorator"
505 self."pathlib2"
506 self."pexpect"
507 self."pickleshare"
508 self."prompt-toolkit"
509 self."pygments"
510 self."setuptools"
511 self."simplegeneric"
512 self."traitlets"
513 ];
514 meta = {
515 license = [ pkgs.lib.licenses.bsdOriginal ];
516 };
517 };
518 "ipython-genutils" = super.buildPythonPackage rec {
519 pname = "ipython-genutils";
520 version = "0.2.0";
521 src = fetchurl {
522 url = "https://files.pythonhosted.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz";
523 sha256 = "1a4bc9y8hnvq6cp08qs4mckgm6i6ajpndp4g496rvvzcfmp12bpb";
342 url = "https://files.pythonhosted.org/packages/83/54/d81317f98f31f05026dd4255828e04a1c4a2e1c4e8d7291e0b5b51d99b07/mercurial-5.4.1.tar.gz";
343 sha256 = "1ilam0dz121nn4852jgkgyzyrvk3hn5cqnivy8gk1qg815mh4763";
524 344 };
525 345 format = "setuptools";
526 346 doCheck = false;
@@ -529,24 +349,7 b' self: super: {'
529 349 nativeBuildInputs = [];
530 350 propagatedBuildInputs = [];
531 351 meta = {
532 license = [ pkgs.lib.licenses.bsdOriginal ];
533 };
534 };
535 "mercurial" = super.buildPythonPackage rec {
536 pname = "mercurial";
537 version = "5.1.1";
538 src = fetchurl {
539 url = "https://files.pythonhosted.org/packages/22/39/e1a95f6048aa0785b82f5faad8281ae7320894a635cb4a57e19479639c92/mercurial-5.1.1.tar.gz";
540 sha256 = "17z42rfjdkrks4grzgac66nfh285zf1pwxd2zwx1p71pw2jqpz1m";
541 };
542 format = "setuptools";
543 doCheck = false;
544 buildInputs = [];
545 checkInputs = [];
546 nativeBuildInputs = [];
547 propagatedBuildInputs = [];
548 meta = {
549 license = [ pkgs.lib.licenses.gpl1 pkgs.lib.licenses.gpl2Plus ];
352 license = [ pkgs.lib.licenses.gpl2Plus pkgs.lib.licenses.gpl1 ];
550 353 };
551 354 };
552 355 "mock" = super.buildPythonPackage rec {
@@ -562,28 +365,25 b' self: super: {'
562 365 checkInputs = [];
563 366 nativeBuildInputs = [];
564 367 propagatedBuildInputs = [
565 self."funcsigs"
566 368 self."six"
567 369 ];
568 370 meta = {
569 license = [ pkgs.lib.licenses.bsdOriginal { fullName = "OSI Approved :: BSD License"; } ];
371 license = [ { fullName = "OSI Approved :: BSD License"; } pkgs.lib.licenses.bsdOriginal ];
570 372 };
571 373 };
572 374 "more-itertools" = super.buildPythonPackage rec {
573 375 pname = "more-itertools";
574 version = "5.0.0";
376 version = "8.3.0";
575 377 src = fetchurl {
576 url = "https://files.pythonhosted.org/packages/dd/26/30fc0d541d9fdf55faf5ba4b0fd68f81d5bd2447579224820ad525934178/more-itertools-5.0.0.tar.gz";
577 sha256 = "1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q";
378 url = "https://files.pythonhosted.org/packages/16/e8/b371710ad458e56b6c74b82352fdf1625e75c03511c66a75314f1084f057/more-itertools-8.3.0.tar.gz";
379 sha256 = "1gk7jbl4f5hm99cbd4ci3xp79jxf6ng0i693ir7mwbr3labvi2sm";
578 380 };
579 381 format = "setuptools";
580 382 doCheck = false;
581 383 buildInputs = [];
582 384 checkInputs = [];
583 385 nativeBuildInputs = [];
584 propagatedBuildInputs = [
585 self."six"
586 ];
386 propagatedBuildInputs = [];
587 387 meta = {
588 388 license = [ pkgs.lib.licenses.mit ];
589 389 };
@@ -607,10 +407,10 b' self: super: {'
607 407 };
608 408 "packaging" = super.buildPythonPackage rec {
609 409 pname = "packaging";
610 version = "20.3";
410 version = "20.4";
611 411 src = fetchurl {
612 url = "https://files.pythonhosted.org/packages/65/37/83e3f492eb52d771e2820e88105f605335553fe10422cba9d256faeb1702/packaging-20.3.tar.gz";
613 sha256 = "18xpablq278janh03bai9xd4kz9b0yfp6vflazn725ns9x3jna9w";
412 url = "https://files.pythonhosted.org/packages/55/fd/fc1aca9cf51ed2f2c11748fa797370027babd82f87829c7a8e6dbe720145/packaging-20.4.tar.gz";
413 sha256 = "1y3rc1ams1i25calk6b9jf1gl85ix5a23a146swjvhdr8x7zfms3";
614 414 };
615 415 format = "setuptools";
616 416 doCheck = false;
@@ -622,7 +422,7 b' self: super: {'
622 422 self."six"
623 423 ];
624 424 meta = {
625 license = [ pkgs.lib.licenses.bsdOriginal { fullName = "BSD or Apache License, Version 2.0"; } pkgs.lib.licenses.asl20 ];
425 license = [ { fullName = "BSD-2-Clause or Apache-2.0"; } pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.asl20 ];
626 426 };
627 427 };
628 428 "pastedeploy" = super.buildPythonPackage rec {
@@ -655,51 +455,12 b' self: super: {'
655 455 checkInputs = [];
656 456 nativeBuildInputs = [];
657 457 propagatedBuildInputs = [
658 self."scandir"
659 458 self."six"
660 459 ];
661 460 meta = {
662 461 license = [ pkgs.lib.licenses.mit ];
663 462 };
664 463 };
665 "pexpect" = super.buildPythonPackage rec {
666 pname = "pexpect";
667 version = "4.8.0";
668 src = fetchurl {
669 url = "https://files.pythonhosted.org/packages/e5/9b/ff402e0e930e70467a7178abb7c128709a30dfb22d8777c043e501bc1b10/pexpect-4.8.0.tar.gz";
670 sha256 = "032cg337h8awydgypz6f4wx848lw8dyrj4zy988x0lyib4ws8rgw";
671 };
672 format = "setuptools";
673 doCheck = false;
674 buildInputs = [];
675 checkInputs = [];
676 nativeBuildInputs = [];
677 propagatedBuildInputs = [
678 self."ptyprocess"
679 ];
680 meta = {
681 license = [ pkgs.lib.licenses.isc { fullName = "ISC License (ISCL)"; } ];
682 };
683 };
684 "pickleshare" = super.buildPythonPackage rec {
685 pname = "pickleshare";
686 version = "0.7.5";
687 src = fetchurl {
688 url = "https://files.pythonhosted.org/packages/d8/b6/df3c1c9b616e9c0edbc4fbab6ddd09df9535849c64ba51fcb6531c32d4d8/pickleshare-0.7.5.tar.gz";
689 sha256 = "1jmghg3c53yp1i8cm6pcrm280ayi8621rwyav9fac7awjr3kss47";
690 };
691 format = "setuptools";
692 doCheck = false;
693 buildInputs = [];
694 checkInputs = [];
695 nativeBuildInputs = [];
696 propagatedBuildInputs = [
697 self."pathlib2"
698 ];
699 meta = {
700 license = [ pkgs.lib.licenses.mit ];
701 };
702 };
703 464 "plaster" = super.buildPythonPackage rec {
704 465 pname = "plaster";
705 466 version = "1.0";
@@ -765,26 +526,6 b' self: super: {'
765 526 license = [ pkgs.lib.licenses.mit ];
766 527 };
767 528 };
768 "prompt-toolkit" = super.buildPythonPackage rec {
769 pname = "prompt-toolkit";
770 version = "1.0.18";
771 src = fetchurl {
772 url = "https://files.pythonhosted.org/packages/c5/64/c170e5b1913b540bf0c8ab7676b21fdd1d25b65ddeb10025c6ca43cccd4c/prompt_toolkit-1.0.18.tar.gz";
773 sha256 = "09h1153wgr5x2ny7ds0w2m81n3bb9j8hjb8sjfnrg506r01clkyx";
774 };
775 format = "setuptools";
776 doCheck = false;
777 buildInputs = [];
778 checkInputs = [];
779 nativeBuildInputs = [];
780 propagatedBuildInputs = [
781 self."six"
782 self."wcwidth"
783 ];
784 meta = {
785 license = [ pkgs.lib.licenses.bsdOriginal ];
786 };
787 };
788 529 "psutil" = super.buildPythonPackage rec {
789 530 pname = "psutil";
790 531 version = "5.7.0";
@@ -802,23 +543,6 b' self: super: {'
802 543 license = [ pkgs.lib.licenses.bsdOriginal ];
803 544 };
804 545 };
805 "ptyprocess" = super.buildPythonPackage rec {
806 pname = "ptyprocess";
807 version = "0.6.0";
808 src = fetchurl {
809 url = "https://code.rhodecode.com/upstream/ptyprocess/artifacts/download/0-c8b019b1-c4d3-46ac-a0ad-1206ec3fb3cb.tar.gz?sha256=50394f2c5e117fcab4360bf99c8bc40be7211ee1a5860aeb3809b44249550c3e";
810 sha256 = "0ghcam4l5d0973mhm1m5w4g23rqbqj5rry8b6ssclzqibqn4yfah";
811 };
812 format = "setuptools";
813 doCheck = false;
814 buildInputs = [];
815 checkInputs = [];
816 nativeBuildInputs = [];
817 propagatedBuildInputs = [];
818 meta = {
819 license = [ { fullName = "ISC License (ISCL)"; } ];
820 };
821 };
822 546 "py" = super.buildPythonPackage rec {
823 547 pname = "py";
824 548 version = "1.8.1";
@@ -864,10 +588,7 b' self: super: {'
864 588 doCheck = false;
865 589 buildInputs = [];
866 590 checkInputs = [];
867 nativeBuildInputs = [
868 self."pycparser"
869 self."cffi"
870 ];
591 nativeBuildInputs = [];
871 592 propagatedBuildInputs = [
872 593 self."cffi"
873 594 self."six"
@@ -878,10 +599,10 b' self: super: {'
878 599 };
879 600 "pygments" = super.buildPythonPackage rec {
880 601 pname = "pygments";
881 version = "2.4.2";
602 version = "2.6.1";
882 603 src = fetchurl {
883 url = "https://files.pythonhosted.org/packages/7e/ae/26808275fc76bf2832deb10d3a3ed3107bc4de01b85dcccbe525f2cd6d1e/Pygments-2.4.2.tar.gz";
884 sha256 = "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748";
604 url = "https://files.pythonhosted.org/packages/6e/4d/4d2fe93a35dfba417311a4ff627489a947b01dc0cc377a3673c00cf7e4b2/Pygments-2.6.1.tar.gz";
605 sha256 = "0i4gnd4q0mgkq0dp5wymn7ca8zjd8fgp63139svs6jf2c6h48wv4";
885 606 };
886 607 format = "setuptools";
887 608 doCheck = false;
@@ -929,7 +650,6 b' self: super: {'
929 650 self."hupper"
930 651 self."plaster"
931 652 self."plaster-pastedeploy"
932 self."repoze.lru"
933 653 self."setuptools"
934 654 self."translationstring"
935 655 self."venusian"
@@ -938,7 +658,7 b' self: super: {'
938 658 self."zope.interface"
939 659 ];
940 660 meta = {
941 license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
661 license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } { fullName = "Repoze Public License"; } ];
942 662 };
943 663 };
944 664 "pytest" = super.buildPythonPackage rec {
@@ -960,11 +680,9 b' self: super: {'
960 680 propagatedBuildInputs = [
961 681 self."atomicwrites"
962 682 self."attrs"
963 self."funcsigs"
964 683 self."importlib-metadata"
965 684 self."more-itertools"
966 685 self."packaging"
967 self."pathlib2"
968 686 self."pluggy"
969 687 self."py"
970 688 self."six"
@@ -991,7 +709,7 b' self: super: {'
991 709 self."pytest"
992 710 ];
993 711 meta = {
994 license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.mit ];
712 license = [ pkgs.lib.licenses.mit pkgs.lib.licenses.bsdOriginal ];
995 713 };
996 714 };
997 715 "pytest-profiling" = super.buildPythonPackage rec {
@@ -1080,10 +798,10 b' self: super: {'
1080 798 };
1081 799 "redis" = super.buildPythonPackage rec {
1082 800 pname = "redis";
1083 version = "3.4.1";
801 version = "3.5.3";
1084 802 src = fetchurl {
1085 url = "https://files.pythonhosted.org/packages/ef/2e/2c0f59891db7db087a7eeaa79bc7c7f2c039e71a2b5b0a41391e9d462926/redis-3.4.1.tar.gz";
1086 sha256 = "07yaj0j9fs7xdkg5bg926fa990khyigjbp31si8ai20vj8sv7kqd";
803 url = "https://files.pythonhosted.org/packages/b3/17/1e567ff78c83854e16b98694411fe6e08c3426af866ad11397cddceb80d3/redis-3.5.3.tar.gz";
804 sha256 = "18h5b87g15x3j6pb1h2q27ri37p2qpvc9n2wgn5yl3b6m3y0qzhf";
1087 805 };
1088 806 format = "setuptools";
1089 807 doCheck = false;
@@ -1109,12 +827,12 b' self: super: {'
1109 827 nativeBuildInputs = [];
1110 828 propagatedBuildInputs = [];
1111 829 meta = {
1112 license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
830 license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } { fullName = "Repoze Public License"; } ];
1113 831 };
1114 832 };
1115 833 "rhodecode-vcsserver" = super.buildPythonPackage rec {
1116 834 pname = "rhodecode-vcsserver";
1117 version = "4.19.0";
835 version = "5.0.0";
1118 836 src = ./.;
1119 837 format = "setuptools";
1120 838 doCheck = false;
@@ -1132,14 +850,10 b' self: super: {'
1132 850 self."dogpile.cache"
1133 851 self."dogpile.core"
1134 852 self."dulwich"
1135 self."gevent"
1136 853 self."gprof2dot"
1137 self."greenlet"
1138 854 self."gunicorn"
1139 855 self."hg-evolve"
1140 856 self."hgsubversion"
1141 self."ipdb"
1142 self."ipython"
1143 857 self."mercurial"
1144 858 self."mock"
1145 859 self."msgpack-python"
@@ -1157,7 +871,6 b' self: super: {'
1157 871 self."repoze.lru"
1158 872 self."simplejson"
1159 873 self."six"
1160 self."subprocess32"
1161 874 self."subvertpy"
1162 875 self."translationstring"
1163 876 self."waitress"
@@ -1167,7 +880,7 b' self: super: {'
1167 880 self."zope.interface"
1168 881 ];
1169 882 meta = {
1170 license = [ { fullName = "GPL V3"; } { fullName = "GNU General Public License v3 or later (GPLv3+)"; } ];
883 license = [ { fullName = "GNU General Public License v3 or later (GPLv3+)"; } { fullName = "GPL V3"; } ];
1171 884 };
1172 885 };
1173 886 "scandir" = super.buildPythonPackage rec {
@@ -1223,40 +936,23 b' self: super: {'
1223 936 };
1224 937 "setuptools-scm" = super.buildPythonPackage rec {
1225 938 pname = "setuptools-scm";
1226 version = "3.5.0";
939 version = "4.1.2";
1227 940 src = fetchurl {
1228 url = "https://files.pythonhosted.org/packages/4b/c1/118ec08816737cc46b4dd93b22f7a138fbfb14b53f4b4718fd9983e70a50/setuptools_scm-3.5.0-py2.py3-none-any.whl";
1229 sha256 = "13z30zcwzp1g9g27xv91yrhhbsx2ljw0xkvb36vkx9708cyxn8qd";
941 url = "https://files.pythonhosted.org/packages/ad/d3/e54f8b4cde0f6fb4f231629f570c1a33ded18515411dee6df6fe363d976f/setuptools_scm-4.1.2-py2.py3-none-any.whl";
942 sha256 = "09jqn78qd7w5hik4v3hg4mw3byl0jm8hkwd5swgcxxx5xcp8w9b9";
1230 943 };
1231 944 format = "wheel";
1232 945 doCheck = false;
1233 946 buildInputs = [];
1234 947 checkInputs = [];
1235 948 nativeBuildInputs = [];
1236 propagatedBuildInputs = [];
949 propagatedBuildInputs = [
950 self."setuptools"
951 ];
1237 952 meta = {
1238 953 license = [ pkgs.lib.licenses.mit ];
1239 954 };
1240 955 };
1241 "simplegeneric" = super.buildPythonPackage rec {
1242 pname = "simplegeneric";
1243 version = "0.8.1";
1244 src = fetchurl {
1245 url = "https://files.pythonhosted.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip";
1246 sha256 = "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw";
1247 };
1248 format = "setuptools";
1249 doCheck = false;
1250 buildInputs = [];
1251 checkInputs = [];
1252 nativeBuildInputs = [
1253 pkgs."unzip"
1254 ];
1255 propagatedBuildInputs = [];
1256 meta = {
1257 license = [ pkgs.lib.licenses.zpl21 ];
1258 };
1259 };
1260 956 "simplejson" = super.buildPythonPackage rec {
1261 957 pname = "simplejson";
1262 958 version = "3.16.0";
@@ -1271,15 +967,15 b' self: super: {'
1271 967 nativeBuildInputs = [];
1272 968 propagatedBuildInputs = [];
1273 969 meta = {
1274 license = [ { fullName = "Academic Free License (AFL)"; } pkgs.lib.licenses.mit ];
970 license = [ pkgs.lib.licenses.mit { fullName = "Academic Free License (AFL)"; } ];
1275 971 };
1276 972 };
1277 973 "six" = super.buildPythonPackage rec {
1278 974 pname = "six";
1279 version = "1.11.0";
975 version = "1.15.0";
1280 976 src = fetchurl {
1281 url = "https://files.pythonhosted.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
1282 sha256 = "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h";
977 url = "https://files.pythonhosted.org/packages/6b/34/415834bfdafca3c5f451532e8a8d9ba89a21c9743a0c59fbd0205c7f9426/six-1.15.0.tar.gz";
978 sha256 = "0n82108wxn5giff50hd9ykjhd3zl7cndabdasi6568yvbh1rqqrh";
1283 979 };
1284 980 format = "setuptools";
1285 981 doCheck = false;
@@ -1291,23 +987,6 b' self: super: {'
1291 987 license = [ pkgs.lib.licenses.mit ];
1292 988 };
1293 989 };
1294 "subprocess32" = super.buildPythonPackage rec {
1295 pname = "subprocess32";
1296 version = "3.5.4";
1297 src = fetchurl {
1298 url = "https://files.pythonhosted.org/packages/32/c8/564be4d12629b912ea431f1a50eb8b3b9d00f1a0b1ceff17f266be190007/subprocess32-3.5.4.tar.gz";
1299 sha256 = "17f7mvwx2271s1wrl0qac3wjqqnrqag866zs3qc8v5wp0k43fagb";
1300 };
1301 format = "setuptools";
1302 doCheck = false;
1303 buildInputs = [];
1304 checkInputs = [];
1305 nativeBuildInputs = [];
1306 propagatedBuildInputs = [];
1307 meta = {
1308 license = [ pkgs.lib.licenses.psfl ];
1309 };
1310 };
1311 990 "subvertpy" = super.buildPythonPackage rec {
1312 991 pname = "subvertpy";
1313 992 version = "0.10.1";
@@ -1322,7 +1001,7 b' self: super: {'
1322 1001 nativeBuildInputs = [];
1323 1002 propagatedBuildInputs = [];
1324 1003 meta = {
1325 license = [ pkgs.lib.licenses.lgpl21Plus pkgs.lib.licenses.gpl2Plus ];
1004 license = [ pkgs.lib.licenses.gpl2Plus pkgs.lib.licenses.lgpl21Plus ];
1326 1005 };
1327 1006 };
1328 1007 "termcolor" = super.buildPythonPackage rec {
@@ -1342,26 +1021,21 b' self: super: {'
1342 1021 license = [ pkgs.lib.licenses.mit ];
1343 1022 };
1344 1023 };
1345 "traitlets" = super.buildPythonPackage rec {
1346 pname = "traitlets";
1347 version = "4.3.3";
1024 "toml" = super.buildPythonPackage rec {
1025 pname = "toml";
1026 version = "0.10.1";
1348 1027 src = fetchurl {
1349 url = "https://files.pythonhosted.org/packages/75/b0/43deb021bc943f18f07cbe3dac1d681626a48997b7ffa1e7fb14ef922b21/traitlets-4.3.3.tar.gz";
1350 sha256 = "1xsrwgivpkxlbr4dfndfsi098s29yqgswgjc1qqn69yxklvfw8yh";
1028 url = "https://files.pythonhosted.org/packages/da/24/84d5c108e818ca294efe7c1ce237b42118643ce58a14d2462b3b2e3800d5/toml-0.10.1.tar.gz";
1029 sha256 = "03wbqm5cn685cwx2664hjdpz370njl7lf0yal8s0dkp5w4mn2swj";
1351 1030 };
1352 1031 format = "setuptools";
1353 1032 doCheck = false;
1354 1033 buildInputs = [];
1355 1034 checkInputs = [];
1356 1035 nativeBuildInputs = [];
1357 propagatedBuildInputs = [
1358 self."decorator"
1359 self."enum34"
1360 self."ipython-genutils"
1361 self."six"
1362 ];
1036 propagatedBuildInputs = [];
1363 1037 meta = {
1364 license = [ pkgs.lib.licenses.bsdOriginal ];
1038 license = [ pkgs.lib.licenses.mit ];
1365 1039 };
1366 1040 };
1367 1041 "translationstring" = super.buildPythonPackage rec {
@@ -1400,16 +1074,18 b' self: super: {'
1400 1074 };
1401 1075 "waitress" = super.buildPythonPackage rec {
1402 1076 pname = "waitress";
1403 version = "1.3.1";
1077 version = "1.4.4";
1404 1078 src = fetchurl {
1405 url = "https://files.pythonhosted.org/packages/a6/e6/708da7bba65898e5d759ade8391b1077e49d07be0b0223c39f5be04def56/waitress-1.3.1.tar.gz";
1406 sha256 = "1iysl8ka3l4cdrr0r19fh1cv28q41mwpvgsb81ji7k4shkb0k3i7";
1079 url = "https://files.pythonhosted.org/packages/9a/32/90a74e5ab5fd4fa4bd051a51eb9a8f63bbbf3e00a00dc5cf73ebd4ddb46a/waitress-1.4.4.tar.gz";
1080 sha256 = "0qdjrwgfah09izsvll05c75fyfj1wmzpmblpn1nar1vli983dd0v";
1407 1081 };
1408 1082 format = "setuptools";
1409 1083 doCheck = false;
1410 1084 buildInputs = [];
1411 1085 checkInputs = [];
1412 nativeBuildInputs = [];
1086 nativeBuildInputs = [
1087 self."setuptools"
1088 ];
1413 1089 propagatedBuildInputs = [];
1414 1090 meta = {
1415 1091 license = [ pkgs.lib.licenses.zpl21 ];
@@ -1417,10 +1093,10 b' self: super: {'
1417 1093 };
1418 1094 "wcwidth" = super.buildPythonPackage rec {
1419 1095 pname = "wcwidth";
1420 version = "0.1.9";
1096 version = "0.2.4";
1421 1097 src = fetchurl {
1422 url = "https://files.pythonhosted.org/packages/25/9d/0acbed6e4a4be4fc99148f275488580968f44ddb5e69b8ceb53fc9df55a0/wcwidth-0.1.9.tar.gz";
1423 sha256 = "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf";
1098 url = "https://files.pythonhosted.org/packages/2e/30/268d9d3ed18439b6983a8e630cd52d81fd7460a152d6e801d1b8394e51a1/wcwidth-0.2.4.tar.gz";
1099 sha256 = "13z4a332pvrmn930y1fk4ry82mccsvjxjdpk8lk882rnw5p5nswc";
1424 1100 };
1425 1101 format = "setuptools";
1426 1102 doCheck = false;
@@ -1434,10 +1110,10 b' self: super: {'
1434 1110 };
1435 1111 "webob" = super.buildPythonPackage rec {
1436 1112 pname = "webob";
1437 version = "1.8.5";
1113 version = "1.8.6";
1438 1114 src = fetchurl {
1439 url = "https://files.pythonhosted.org/packages/9d/1a/0c89c070ee2829c934cb6c7082287c822e28236a4fcf90063e6be7c35532/WebOb-1.8.5.tar.gz";
1440 sha256 = "11khpzaxc88q31v25ic330gsf56fwmbdc9b30br8mvp0fmwspah5";
1115 url = "https://files.pythonhosted.org/packages/2a/32/5f3f43d0784bdd9392db0cb98434d7cd23a0d8a420c4d243ad4cb8517f2a/WebOb-1.8.6.tar.gz";
1116 sha256 = "026i3z99nr3px75isa9mbnky5i7rffiv4d124h5kxfjjsxz92fma";
1441 1117 };
1442 1118 format = "setuptools";
1443 1119 doCheck = false;
@@ -1473,10 +1149,10 b' self: super: {'
1473 1149 };
1474 1150 "zipp" = super.buildPythonPackage rec {
1475 1151 pname = "zipp";
1476 version = "1.2.0";
1152 version = "3.1.0";
1477 1153 src = fetchurl {
1478 url = "https://files.pythonhosted.org/packages/78/08/d52f0ea643bc1068d6dc98b412f4966a9b63255d20911a23ac3220c033c4/zipp-1.2.0.tar.gz";
1479 sha256 = "1c91lnv1bxjimh8as27hz7bghsjkkbxn1d37xq7in9c82iai0167";
1154 url = "https://files.pythonhosted.org/packages/ce/8c/2c5f7dc1b418f659d36c04dec9446612fc7b45c8095cc7369dd772513055/zipp-3.1.0.tar.gz";
1155 sha256 = "15pxxs9gp1lcghbl5426fk823h764a5d04cra267kxlqbkby96f5";
1480 1156 };
1481 1157 format = "setuptools";
1482 1158 doCheck = false;
@@ -1487,9 +1163,7 b' self: super: {'
1487 1163 self."wheel"
1488 1164 self."setuptools-scm"
1489 1165 ];
1490 propagatedBuildInputs = [
1491 self."contextlib2"
1492 ];
1166 propagatedBuildInputs = [];
1493 1167 meta = {
1494 1168 license = [ pkgs.lib.licenses.mit ];
1495 1169 };
@@ -1515,10 +1189,10 b' self: super: {'
1515 1189 };
1516 1190 "zope.interface" = super.buildPythonPackage rec {
1517 1191 pname = "zope.interface";
1518 version = "4.6.0";
1192 version = "5.1.0";
1519 1193 src = fetchurl {
1520 url = "https://files.pythonhosted.org/packages/4e/d0/c9d16bd5b38de44a20c6dc5d5ed80a49626fafcb3db9f9efdc2a19026db6/zope.interface-4.6.0.tar.gz";
1521 sha256 = "1rgh2x3rcl9r0v0499kf78xy86rnmanajf4ywmqb943wpk50sg8v";
1194 url = "https://files.pythonhosted.org/packages/af/d2/9675302d7ced7ec721481f4bbecd28a390a8db4ff753d28c64057b975396/zope.interface-5.1.0.tar.gz";
1195 sha256 = "03nrl6b8cb600dnnh46y149awvrm0gxyqgwq5hdw3lvys8mw9r20";
1522 1196 };
1523 1197 format = "setuptools";
1524 1198 doCheck = false;
@@ -1,5 +1,5 b''
1 1 { pkgs ? (import <nixpkgs> {})
2 , pythonPackages ? "python27Packages"
2 , pythonPackages ? "python37Packages"
3 3 }:
4 4
5 5 with pkgs.lib;
@@ -28,6 +28,8 b' pkgs.stdenv.mkDerivation {'
28 28 pip2nix.pip2nix
29 29 pip2nix.pip
30 30 pip2nix.pip-tools
31 pip2nix.cython
32 pip2nix.flit
31 33
32 34 # compile using ffi
33 35 pkgs.libffi
@@ -3,14 +3,14 b''
3 3 # our custom configobj
4 4 https://code.rhodecode.com/upstream/configobj/artifacts/download/0-012de99a-b1e1-4f64-a5c0-07a98a41b324.tar.gz?md5=6a513f51fe04b2c18cf84c1395a7c626#egg=configobj==5.0.6
5 5
6 dogpile.cache==0.9.0
6 dogpile.cache==0.9.2
7 7 dogpile.core==0.4.1
8 8 decorator==4.1.2
9 9 dulwich==0.13.0
10 10 hgsubversion==1.9.3
11 hg-evolve==9.1.0
11 hg-evolve==10.0.0
12 12
13 mercurial==5.1.1
13 mercurial==5.4.1
14 14 msgpack-python==0.5.6
15 15
16 16 pastedeploy==2.1.0
@@ -18,28 +18,27 b' pyramid==1.10.4'
18 18 pygit2==0.28.2
19 19
20 20 repoze.lru==0.7
21 redis==3.4.1
21 redis==3.5.3
22 22 simplejson==3.16.0
23 23 subvertpy==0.10.1
24 24
25 six==1.11.0
25 six==1.15.0
26 26 translationstring==1.3
27 webob==1.8.5
27 webob==1.8.6
28 28 zope.deprecation==4.4.0
29 zope.interface==4.6.0
29 zope.interface==5.1.0
30 30
31 31 ## http servers
32 gevent==1.5.0
33 greenlet==0.4.15
34 gunicorn==19.9.0
35 waitress==1.3.1
36
37 ## debug
38 ipdb==0.13.2
39 ipython==5.10.0
32 #gevent==20.6.0
33 #greenlet==0.4.16
34 gunicorn==20.0.4
35 waitress==1.4.4
40 36
41 37 ## test related requirements
42 38 -r requirements_test.txt
43 39
44 40 ## uncomment to add the debug libraries
41 #ipdb==0.13.2
42 #ipython==7.15.0
43
45 44 #-r requirements_debug.txt
@@ -3,19 +3,17 b''
3 3 atomicwrites==1.4.0
4 4 attrs==19.3.0
5 5 contextlib2==0.6.0.post1
6 cffi==1.12.3
6 cffi==1.14.0
7 7 hupper==1.10.2
8 importlib-metadata==1.6.0
9 packaging==20.3
8 importlib-metadata==1.6.1
9 packaging==20.4
10 10 pathlib2==2.3.5
11 pygments==2.4.2
11 pygments==2.6.1
12 12 pyparsing==2.4.7
13 13 psutil==5.7.0
14 14 pluggy==0.13.1
15 15 scandir==1.10.0
16 16 setproctitle==1.1.10
17 17 venusian==1.2.0
18 wcwidth==0.1.9
19
20 # ptyprocess backport, pypi version doesn't support egg/source installs on python 2.X
21 https://code.rhodecode.com/upstream/ptyprocess/artifacts/download/0-c8b019b1-c4d3-46ac-a0ad-1206ec3fb3cb.tar.gz?sha256=50394f2c5e117fcab4360bf99c8bc40be7211ee1a5860aeb3809b44249550c3e#egg=ptyprocess==0.6.0
18 wcwidth==0.2.4
19 toml==0.10.1
@@ -77,7 +77,7 b' test_requirements = _get_requirements('
77 77
78 78 def get_version():
79 79 version = pkgutil.get_data('vcsserver', 'VERSION')
80 return str(version.strip())
80 return version.decode().strip()
81 81
82 82
83 83 # additional files that goes into package itself
@@ -88,8 +88,7 b' package_data = {'
88 88 }
89 89
90 90 description = 'Version Control System Server'
91 keywords = ' '.join([
92 'CLI', 'RhodeCode', 'RhodeCode Enterprise', 'RhodeCode Tools'])
91 keywords = ' '.join(['Version Control System'])
93 92
94 93 # README/DESCRIPTION generation
95 94 readme_file = 'README.rst'
@@ -2,45 +2,42 b''
2 2 # environment.
3 3
4 4 { pkgs ? (import <nixpkgs> {})
5 , pythonPackages ? "python27Packages"
5 , pythonPackages ? "python37Packages"
6 6 , doCheck ? false
7 7 }:
8 8
9 9 let
10 10
11 vcsserver = import ./default.nix {
11 # Full runtime environment without the actual Python package
12 env = import ./default.nix {
12 13 inherit
13 14 doCheck;
15 pythonExternalOverrides = self: super: {
16 rhodecode-vcsserver = null;
17 };
14 18 };
15 19
16 vcs-pythonPackages = vcsserver.pythonPackages;
17
18 in vcsserver.override (attrs: rec {
19 # Avoid that we dump any sources into the store when entering the shell and
20 # make development a little bit more convenient.
21 src = null;
22
23 # Add dependencies which are useful for the development environment.
24 buildInputs =
20 # The python package with full runtime environment as dependency for nix-shell
21 package = (import ./default.nix {
22 inherit
23 doCheck;
24 pythonExternalOverrides = self: super: {
25 rhodecode-vcsserver = super.rhodecode-vcsserver.overridePythonAttrs(attrs: {
26 nativeBuildInputs = with self;
27 attrs.nativeBuildInputs ++
25 28 attrs.buildInputs ++
26 (with vcs-pythonPackages; [
29 attrs.propagatedBuildInputs ++ [
30 env
31 pytest
27 32 ipdb
28 ]);
33 ipython
34 ];
35 });
36 };
37 }).passthru.pythonPackages.rhodecode-vcsserver;
29 38
30 # place to inject some required libs from develop installs
31 propagatedBuildInputs =
32 attrs.propagatedBuildInputs ++
33 [];
34
35 # Make sure we execute both hooks
36 shellHook = ''
37 runHook preShellHook
38 runHook postShellHook
39 '';
40
41 preShellHook = ''
42 echo "Entering vcsserver-shell"
43
39 in package.overridePythonAttrs(attrs: {
40 postShellHook= ''
44 41 # Custom prompt to distinguish from other dev envs.
45 42 export PS1="\n\[\033[1;32m\][vcsserver-shell:\w]$\[\033[0m\] "
46 43
@@ -48,19 +45,6 b' in vcsserver.override (attrs: rec {'
48 45 export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive"
49 46 export LC_ALL="en_US.UTF-8"
50 47
51 # Setup a temporary directory.
52 tmp_path=$(mktemp -d)
53 export PATH="${pkgs.subversion}/bin:${pkgs.git}/bin:${vcs-pythonPackages.mercurial}/bin:$tmp_path/bin:$PATH"
54 export PYTHONPATH="$tmp_path/${vcs-pythonPackages.python.sitePackages}:$PYTHONPATH"
55 mkdir -p $tmp_path/${vcs-pythonPackages.python.sitePackages}
56
57 # Develop installation
58 echo "[BEGIN]: develop install of rhodecode-vcsserver"
59 python setup.py develop --prefix $tmp_path --allow-hosts ""
60 '';
61
62 postShellHook = ''
63
64 48 '';
65 49
66 50 })
General Comments 0
You need to be logged in to leave comments. Login now