Update python package
more/packages/gnuzilla.scm
55 | 55 | #:use-module (gnu packages libffi) | |
56 | 56 | #:use-module (gnu packages libreoffice) | |
57 | 57 | #:use-module (gnu packages linux) | |
58 | + | #:use-module (gnu packages llvm) | |
58 | 59 | #:use-module (gnu packages perl) | |
59 | 60 | #:use-module (gnu packages pkg-config) | |
60 | 61 | #:use-module (gnu packages pulseaudio) | |
… | |||
79 | 80 | (define-public firefox | |
80 | 81 | (package | |
81 | 82 | (name "firefox") | |
82 | - | (version "57.0") | |
83 | + | (version "57.0.4") | |
83 | 84 | (source (origin | |
84 | 85 | (method url-fetch) | |
85 | 86 | (uri (string-append "https://archive.mozilla.org/pub/firefox/" | |
… | |||
87 | 88 | version ".source.tar.xz")) | |
88 | 89 | (sha256 | |
89 | 90 | (base32 | |
90 | - | "13xvxzpp5l3amrd6jcpnn7d1q7wpf80dsiw0qp4z51xyal0z0fk0")) | |
91 | + | "0crvqkwyf1zjlkayv0qqnvvz9vvbz0qmc2ghd3cmfp7xmdlyvk4p")) | |
91 | 92 | (modules '((guix build utils))) | |
92 | 93 | (snippet | |
93 | 94 | '(begin | |
… | |||
145 | 146 | "--disable-crashreporter" | |
146 | 147 | "--disable-updater" | |
147 | 148 | "--disable-tests"; Remove if we want to test | |
149 | + | "--disable-stylo"; FIXME | |
148 | 150 | "--enable-application=browser" | |
149 | 151 | "--enable-optimize=-O2" | |
150 | 152 | "--with-pthreads" | |
… | |||
180 | 182 | (srcdir (string-append "../" (basename abs-srcdir))) | |
181 | 183 | (flags `(,(string-append "--prefix=" out) | |
182 | 184 | ,(string-append "--with-l10n-base=" | |
183 | - | abs-srcdir "/l10n") | |
185 | + | abs-srcdir "/intl/l10n") | |
184 | 186 | ,@configure-flags))) | |
185 | 187 | (setenv "SHELL" bash) | |
186 | 188 | (setenv "CONFIG_SHELL" bash) | |
… | |||
237 | 239 | ("autoconf" ,autoconf-2.13) | |
238 | 240 | ("which" ,which) | |
239 | 241 | ("rust" ,rustc) | |
240 | - | ("cargo" ,cargo))) | |
242 | + | ("cargo" ,cargo) | |
243 | + | ("clang-3.9.1" ,clang-3.9.1) | |
244 | + | ("llvm-3.9.1" ,llvm-3.9.1))) | |
241 | 245 | (home-page "https://mozilla.org") | |
242 | 246 | (synopsis "Web browser") | |
243 | 247 | (description "") |
more/packages/python.scm
26 | 26 | #:use-module (gnu packages maths) | |
27 | 27 | #:use-module (gnu packages networking) | |
28 | 28 | #:use-module (gnu packages python) | |
29 | + | #:use-module (gnu packages python-crypto) | |
30 | + | #:use-module (gnu packages python-web) | |
31 | + | #:use-module (gnu packages time) | |
29 | 32 | #:use-module (gnu packages tls) | |
30 | 33 | #:use-module (guix packages) | |
31 | 34 | #:use-module (guix download) | |
… | |||
57 | 60 | (define-public python-cachetools | |
58 | 61 | (package | |
59 | 62 | (name "python-cachetools") | |
60 | - | (version "2.0.0") | |
63 | + | (version "2.0.1") | |
61 | 64 | (source (origin | |
62 | 65 | (method url-fetch) | |
63 | 66 | (uri (pypi-uri "cachetools" version)) | |
64 | 67 | (sha256 | |
65 | 68 | (base32 | |
66 | - | "0a56ydsvsri1r19ny55g0x7jsgjl9n02vnxbhfz0vhhd4h174nki")))) | |
69 | + | "0pdw2fr29pxlyn1g5fhdrrqbpn0iw062nv716ngdqvdx7hnizq7d")))) | |
67 | 70 | (build-system python-build-system) | |
68 | 71 | (home-page "https://github.com/tkem/cachetools") | |
69 | 72 | (synopsis "Memoizing collections and decorators including lru_cache") | |
… | |||
123 | 126 | the basic TCP/IP protocols.") | |
124 | 127 | (license license:bsd-3))) | |
125 | 128 | ||
129 | + | ;; According to pypi, should work with py3 | |
126 | 130 | (define-public python2-rpyc | |
127 | 131 | (package | |
128 | 132 | (name "python2-rpyc") | |
129 | - | (version "3.3.0") | |
133 | + | (version "3.4.4") | |
130 | 134 | (source (origin | |
131 | 135 | (method url-fetch) | |
132 | 136 | (uri (pypi-uri "rpyc" version)) | |
133 | 137 | (sha256 | |
134 | 138 | (base32 | |
135 | - | "0jwbxxf5f8l05pwh7ilg380y4pqv3nxibaszbwpl9gzh2i9q9yj3")))) | |
139 | + | "1iw1nkyh8r55xqafl14lp7lih38b5fdqid05s6cp4zd62821v6d8")))) | |
136 | 140 | (build-system python-build-system) | |
137 | 141 | (native-inputs | |
138 | 142 | `(("nose" ,python2-nose))) | |
… | |||
150 | 154 | remote objects can be manipulated as if they were local.") | |
151 | 155 | (license license:expat))) | |
152 | 156 | ||
157 | + | ;; According to pypi, should work with py3 | |
153 | 158 | (define-public python2-progressbar | |
154 | 159 | (package | |
155 | 160 | (name "python2-progressbar") | |
… | |||
189 | 194 | (define-public python-progressbar2 | |
190 | 195 | (package | |
191 | 196 | (name "python-progressbar2") | |
192 | - | (version "3.20.0") | |
197 | + | (version "3.34.3") | |
193 | 198 | (source (origin | |
194 | 199 | (method url-fetch) | |
195 | 200 | (uri (pypi-uri "progressbar2" version)) | |
196 | 201 | (sha256 | |
197 | 202 | (base32 | |
198 | - | "1xz5l3598bl2r1j8h6dqljbjf44f2d137ppi0l381adz4zd38vd1")))) | |
203 | + | "1gigwmr60bgvjg2b4w93nww065dc4af8bq40b4hr9n9f54jp3w5x")))) | |
199 | 204 | (build-system python-build-system) | |
200 | 205 | (native-inputs | |
201 | 206 | `(("pytest-runner" ,python-pytest-runner) | |
… | |||
219 | 224 | (define-public python-mulpyplexer | |
220 | 225 | (package | |
221 | 226 | (name "python-mulpyplexer") | |
222 | - | (version "0.07") | |
227 | + | (version "0.08") | |
223 | 228 | (source (origin | |
224 | 229 | (method url-fetch) | |
225 | 230 | (uri (pypi-uri "mulpyplexer" version)) | |
226 | 231 | (sha256 | |
227 | 232 | (base32 | |
228 | - | "1j5gm913adc8f0mn9y6a9wm9h78jb7ykr8i00yysfcy6ah2ilp9v")))) | |
233 | + | "1zn5d1vyhfjp8x9z5mr9gv8m8gmi3s3jv3kqb790xzi1kqi0p4ya")))) | |
229 | 234 | (build-system python-build-system) | |
230 | 235 | (home-page "https://github.com/zardus/mulpyplexer") | |
231 | 236 | (synopsis "Multiplex interactions with lists of python objects") | |
… | |||
243 | 248 | (method git-fetch) | |
244 | 249 | (uri (git-reference | |
245 | 250 | (url "https://github.com/zardus/ana.git") | |
246 | - | (commit "94928f773661eaa5a6c2dec40dad199c70daedab"))) | |
251 | + | (commit "6d37cf9288839c5536ed2075f206d8d2a80c5906"))) | |
247 | 252 | (sha256 | |
248 | 253 | (base32 | |
249 | - | "0f2wdhs0xwpnk9lznxl96b2yzcz1641wbqrh1aid7q2pm60v6dhv")) | |
254 | + | "15mvylgfzmsj0n62m6r5xpqzp6qp4nmp9r3j93g0f64z894kqk0q")) | |
250 | 255 | (file-name (string-append name "-" version)))) | |
251 | 256 | (build-system python-build-system) | |
252 | 257 | (native-inputs | |
253 | 258 | `(("nose" ,python-nose))) | |
254 | - | (arguments | |
255 | - | `(#:phases | |
256 | - | (modify-phases %standard-phases | |
257 | - | (add-before 'build 'fix-python3-import | |
258 | - | (lambda _ | |
259 | - | (substitute* "ana/datalayer.py" | |
260 | - | (("import cPickle as pickle") "import pickle"))))))) | |
261 | 259 | (home-page "https://github.com/zardus/ana") | |
262 | 260 | (synopsis "Provide easy distributed data storage for python objects") | |
263 | 261 | (description "ANA is a project to provide easy distributed data storage for | |
… | |||
269 | 267 | (license license:bsd-2))) | |
270 | 268 | ||
271 | 269 | (define-public python2-ana | |
272 | - | (package | |
273 | - | (inherit (package-with-python2 python-ana)) | |
274 | - | (arguments | |
275 | - | `(#:python ,python-2)))) | |
270 | + | (package-with-python2 python-ana)) | |
276 | 271 | ||
277 | 272 | (define-public python-plumbum | |
278 | 273 | (package | |
279 | 274 | (name "python-plumbum") | |
280 | - | (version "1.6.3") | |
281 | - | (source | |
282 | - | (origin | |
283 | - | (method url-fetch) | |
284 | - | (uri (pypi-uri "plumbum" version)) | |
285 | - | (sha256 | |
286 | - | (base32 "083kikr1f7qzpp5jllss97dy8d6249v7ia3wg9i0a6wz8l4ffj82")))) | |
275 | + | (version "1.6.5") | |
276 | + | (source (origin | |
277 | + | (method url-fetch) | |
278 | + | (uri (pypi-uri "plumbum" version)) | |
279 | + | (sha256 | |
280 | + | (base32 | |
281 | + | "1vjbl9qy9fkl3vwiiwpaafmyxfks2sc3b3dhkp4vdgk2pdcv1ayq")))) | |
287 | 282 | (build-system python-build-system) | |
288 | 283 | (native-inputs | |
289 | 284 | `(("pytest" ,python-pytest))) | |
… | |||
358 | 353 | (name "python-cymruwhois") | |
359 | 354 | (version "1.6") | |
360 | 355 | (source (origin | |
361 | - | (method url-fetch) | |
362 | - | (uri (pypi-uri "cymruwhois" version)) | |
363 | - | (sha256 | |
364 | - | (base32 | |
365 | - | "0m7jgpglkjd0lsyw64lfw6qxdm0fg0f54145f79kq4rk1vjqbh5n")))) | |
356 | + | (method url-fetch) | |
357 | + | (uri (pypi-uri "cymruwhois" version)) | |
358 | + | (sha256 | |
359 | + | (base32 | |
360 | + | "0m7jgpglkjd0lsyw64lfw6qxdm0fg0f54145f79kq4rk1vjqbh5n")))) | |
366 | 361 | (build-system python-build-system) | |
367 | 362 | (native-inputs | |
368 | 363 | `(("python-nose" ,python-nose))) | |
… | |||
377 | 372 | (define-public python-ripe-atlas-sagan | |
378 | 373 | (package | |
379 | 374 | (name "python-ripe-atlas-sagan") | |
380 | - | (version "1.2.1") | |
375 | + | (version "1.2.2") | |
381 | 376 | (source (origin | |
382 | - | (method url-fetch) | |
383 | - | (uri (pypi-uri "ripe.atlas.sagan" version)) | |
384 | - | (sha256 | |
385 | - | (base32 | |
386 | - | "0mc5f50jj61q5z92765gnqhifila2bdngaybzrh6hycz1x6lz0ra")))) | |
377 | + | (method url-fetch) | |
378 | + | (uri (pypi-uri "ripe.atlas.sagan" version)) | |
379 | + | (sha256 | |
380 | + | (base32 | |
381 | + | "1pww7f4kh9cgd9qm7hbnkxg2cvj7mcmwhsan97cl5pd0xqxxnvw3")))) | |
387 | 382 | (build-system python-build-system) | |
388 | 383 | (propagated-inputs | |
389 | 384 | `(("cryptography" ,python-cryptography) | |
… | |||
403 | 398 | (name "python-socketio-client") | |
404 | 399 | (version "0.7.2") | |
405 | 400 | (source (origin | |
406 | - | (method url-fetch) | |
407 | - | (uri (pypi-uri "socketIO-client" version)) | |
408 | - | (sha256 | |
409 | - | (base32 | |
410 | - | "1hfjfhyxgql1ndda1bagg8niy8m28byd2r0yq4l7zycwlzxq9kb4")))) | |
401 | + | (method url-fetch) | |
402 | + | (uri (pypi-uri "socketIO-client" version)) | |
403 | + | (sha256 | |
404 | + | (base32 | |
405 | + | "1hfjfhyxgql1ndda1bagg8niy8m28byd2r0yq4l7zycwlzxq9kb4")))) | |
411 | 406 | (build-system python-build-system) | |
412 | 407 | (propagated-inputs | |
413 | 408 | `(("websocket-client" ,python-websocket-client) | |
414 | 409 | ("requests" ,python-requests))) | |
415 | 410 | (native-inputs | |
416 | 411 | `(("coverage" ,python-coverage) | |
417 | - | ("nose" ,python-nose))) | |
412 | + | ("nose" ,python-nose))) | |
418 | 413 | (arguments '(#:tests? #f)); requires network | |
419 | 414 | (home-page "") | |
420 | 415 | (synopsis "") | |
… | |||
429 | 424 | (name "python-linecache2") | |
430 | 425 | (version "1.0.0") | |
431 | 426 | (source (origin | |
432 | - | (method url-fetch) | |
433 | - | (uri (pypi-uri "linecache2" version)) | |
434 | - | (sha256 | |
435 | - | (base32 | |
436 | - | "0z79g3ds5wk2lvnqw0y2jpakjf32h95bd9zmnvp7dnqhf57gy9jb")))) | |
427 | + | (method url-fetch) | |
428 | + | (uri (pypi-uri "linecache2" version)) | |
429 | + | (sha256 | |
430 | + | (base32 | |
431 | + | "0z79g3ds5wk2lvnqw0y2jpakjf32h95bd9zmnvp7dnqhf57gy9jb")))) | |
437 | 432 | (build-system python-build-system) | |
438 | 433 | (arguments '(#:tests? #f)); circular dependency with unittest2 | |
439 | 434 | (propagated-inputs | |
… | |||
451 | 446 | (name "python-traceback2") | |
452 | 447 | (version "1.4.0") | |
453 | 448 | (source (origin | |
454 | - | (method url-fetch) | |
455 | - | (uri (pypi-uri "traceback2" version)) | |
456 | - | (sha256 | |
457 | - | (base32 | |
458 | - | "0c1h3jas1jp1fdbn9z2mrgn3jj0hw1x3yhnkxp7jw34q15xcdb05")))) | |
449 | + | (method url-fetch) | |
450 | + | (uri (pypi-uri "traceback2" version)) | |
451 | + | (sha256 | |
452 | + | (base32 | |
453 | + | "0c1h3jas1jp1fdbn9z2mrgn3jj0hw1x3yhnkxp7jw34q15xcdb05")))) | |
459 | 454 | (build-system python-build-system) | |
460 | 455 | (arguments '(#:tests? #f)); circular dependency with unittest2 | |
461 | 456 | (propagated-inputs | |
… | |||
474 | 469 | (name "python-argparse") | |
475 | 470 | (version "1.4.0") | |
476 | 471 | (source (origin | |
477 | - | (method url-fetch) | |
478 | - | (uri (pypi-uri "argparse" version)) | |
479 | - | (sha256 | |
480 | - | (base32 | |
481 | - | "1r6nznp64j68ih1k537wms7h57nvppq0szmwsaf99n71bfjqkc32")))) | |
472 | + | (method url-fetch) | |
473 | + | (uri (pypi-uri "argparse" version)) | |
474 | + | (sha256 | |
475 | + | (base32 | |
476 | + | "1r6nznp64j68ih1k537wms7h57nvppq0szmwsaf99n71bfjqkc32")))) | |
482 | 477 | (build-system python-build-system) | |
483 | 478 | (home-page "") | |
484 | 479 | (synopsis "") | |
… | |||
493 | 488 | (inherit python-unittest2) | |
494 | 489 | (version "1.1.0") | |
495 | 490 | (source (origin | |
496 | - | (method url-fetch) | |
497 | - | (uri (pypi-uri "unittest2" version)) | |
498 | - | (sha256 | |
499 | - | (base32 | |
500 | - | "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212")))) | |
491 | + | (method url-fetch) | |
492 | + | (uri (pypi-uri "unittest2" version)) | |
493 | + | (sha256 | |
494 | + | (base32 | |
495 | + | "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212")))) | |
501 | 496 | (arguments | |
502 | 497 | `(#:phases | |
503 | - | (modify-phases %standard-phases | |
504 | - | (add-before 'check 'disable-failures | |
505 | - | (lambda _ | |
506 | - | (substitute* "unittest2/test/test_result.py" | |
507 | - | (("testGet") "dontTestGet")) | |
508 | - | (substitute* "unittest2/test/test_loader.py" | |
509 | - | (("test_loadTestsFromNames__relative_malformed_name") "dontTest") | |
510 | - | (("test_loadTestsFromName__relative_malformed_name") "dontTest2"))))))) | |
498 | + | (modify-phases %standard-phases | |
499 | + | (add-before 'check 'disable-failures | |
500 | + | (lambda _ | |
501 | + | (substitute* "unittest2/test/test_result.py" | |
502 | + | (("testGet") "dontTestGet")) | |
503 | + | (substitute* "unittest2/test/test_loader.py" | |
504 | + | (("test_loadTestsFromNames__relative_malformed_name") "dontTest") | |
505 | + | (("test_loadTestsFromName__relative_malformed_name") "dontTest2"))))))) | |
511 | 506 | (propagated-inputs | |
512 | 507 | `(("traceback2" ,python-traceback2) | |
513 | - | ("six" ,python-six) | |
514 | - | ("argparse" ,python-argparse))))) | |
508 | + | ("six" ,python-six) | |
509 | + | ("argparse" ,python-argparse))))) | |
515 | 510 | ||
516 | 511 | (define-public python2-unittest2-fix | |
517 | 512 | (package-with-python2 python-unittest2-fix)) | |
… | |||
521 | 516 | (name "python-funcsigs") | |
522 | 517 | (version "1.0.2") | |
523 | 518 | (source (origin | |
524 | - | (method url-fetch) | |
525 | - | (uri (pypi-uri "funcsigs" version)) | |
526 | - | (sha256 | |
527 | - | (base32 | |
528 | - | "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7")))) | |
519 | + | (method url-fetch) | |
520 | + | (uri (pypi-uri "funcsigs" version)) | |
521 | + | (sha256 | |
522 | + | (base32 | |
523 | + | "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7")))) | |
529 | 524 | (build-system python-build-system) | |
530 | 525 | (native-inputs | |
531 | 526 | `(("unittest2" ,python-unittest2-fix))) | |
… | |||
540 | 535 | (define-public python-ripe-atlas-cousteau | |
541 | 536 | (package | |
542 | 537 | (name "python-ripe-atlas-cousteau") | |
543 | - | (version "1.4") | |
538 | + | (version "1.4.1") | |
544 | 539 | (source (origin | |
545 | - | (method url-fetch) | |
546 | - | (uri (pypi-uri "ripe.atlas.cousteau" version)) | |
547 | - | (sha256 | |
548 | - | (base32 | |
549 | - | "0lhaanxs3hxlw1d0ma6rpx54p91v0kxvmxa82h86r6j5whdckq21")))) | |
540 | + | (method url-fetch) | |
541 | + | (uri (pypi-uri "ripe.atlas.cousteau" version)) | |
542 | + | (sha256 | |
543 | + | (base32 | |
544 | + | "1964qllddqqh1sz9psmmb84ahqdy499vavm9wdn0k2v7q6y0vm0p")))) | |
550 | 545 | (build-system python-build-system) | |
551 | 546 | (propagated-inputs | |
552 | 547 | `(("websocket-client" ,python-websocket-client) | |
… | |||
570 | 565 | (define-public python-ripe-atlas-tools | |
571 | 566 | (package | |
572 | 567 | (name "python-ripe-atlas-tools") | |
573 | - | (version "2.1") | |
568 | + | (version "2.2.3") | |
574 | 569 | (source (origin | |
575 | - | (method url-fetch) | |
576 | - | (uri (pypi-uri "ripe.atlas.tools" version)) | |
577 | - | (sha256 | |
578 | - | (base32 | |
579 | - | "07h9cjxxp0dx4p32dhf5j3cciiap7sc32hb1byljkll5lv4vm9l5")))) | |
570 | + | (method url-fetch) | |
571 | + | (uri (pypi-uri "ripe.atlas.tools" version)) | |
572 | + | (sha256 | |
573 | + | (base32 | |
574 | + | "1afcf56fyvsxb0i15v43804rqnn0xdp33achds84axnd1rl1375g")))) | |
580 | 575 | (build-system python-build-system) | |
581 | 576 | (propagated-inputs | |
582 | 577 | `(("pyopenssl" ,python-pyopenssl) | |
… | |||
590 | 585 | ("coverage" ,python-coverage))) | |
591 | 586 | (arguments | |
592 | 587 | `(#:tests? #f; tests can't load dependencies | |
593 | - | #:phases | |
594 | - | (modify-phases %standard-phases | |
595 | - | (add-before 'check 'update-dependency | |
596 | - | (lambda _ | |
597 | - | (substitute* "setup.py" | |
598 | - | (("==1.2") "==1.2.1"))))))) | |
588 | + | #:phases | |
589 | + | (modify-phases %standard-phases | |
590 | + | (add-before 'check 'update-dependency | |
591 | + | (lambda _ | |
592 | + | ;; Change dependency version to match what we have in guix | |
593 | + | (substitute* "setup.py" | |
594 | + | (("==1.2") "==1.2.2") | |
595 | + | (("==1.4") "==1.4.1")) | |
596 | + | #t))))) | |
599 | 597 | (home-page "") | |
600 | 598 | (synopsis "") | |
601 | 599 | (description "") | |
… | |||
621 | 619 | (synopsis "") | |
622 | 620 | (description "") | |
623 | 621 | (license license:asl2.0))) | |
622 | + | ||
623 | + | (define-public python-web.py | |
624 | + | (package | |
625 | + | (name "python-web.py") | |
626 | + | (version "0.40.dev0") | |
627 | + | (source (origin | |
628 | + | (method url-fetch) | |
629 | + | (uri (pypi-uri "web.py" version)) | |
630 | + | (sha256 | |
631 | + | (base32 | |
632 | + | "18v91c4s683r7a797a8k9p56r1avwplbbcb3l6lc746xgj6zlr6l")))) | |
633 | + | (build-system python-build-system) | |
634 | + | (home-page "http://webpy.org/") | |
635 | + | (synopsis "") | |
636 | + | (description "") | |
637 | + | (license license:public-domain))) | |
638 | + | ||
639 | + | (define-public python2-web.py | |
640 | + | (package-with-python2 python-web.py)) |