diff options
| author | pjotrp | 2017-12-27 11:57:21 +0000 |
|---|---|---|
| committer | pjotrp | 2017-12-27 11:57:21 +0000 |
| commit | c5b1220c4bc1526134854138c4cdadc9ce1e3d57 (patch) | |
| tree | aa37318c3e2ce022a689b4f686cc41244d731832 | |
| parent | 37cb61531ac7868e6ad1b9a15dd01105e9d8f63d (diff) | |
| parent | ec789d387958641d249149f5e444e23a3d2b824d (diff) | |
| download | guix-bioinformatics-c5b1220c4bc1526134854138c4cdadc9ce1e3d57.tar.gz | |
Merge branch 'master' of gitlab.com:genenetwork/guix-bioinformatics
| -rw-r--r-- | gn/packages/javascript.scm | 8 | ||||
| -rw-r--r-- | gn/packages/python.scm | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/gn/packages/javascript.scm b/gn/packages/javascript.scm index ff1190a..74509d6 100644 --- a/gn/packages/javascript.scm +++ b/gn/packages/javascript.scm @@ -10,19 +10,19 @@ #:use-module (srfi srfi-1)) (define-public javascript-twitter-post-fetcher - (let ((commit "377c050def3a1076c15cb24fd20b71f801d0e78f")) + (let ((commit "12d1693980ef836af4d5eee74a0aec5c65b8e6c3")) (package (name "javascript-twitter-post-fetcher") - (version (string-append "16.0.3" "-" (string-take commit 7))) + (version (string-append "17.0.2" "-" (string-take commit 7))) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/genenetwork/Twitter-Post-Fetcher.git") + (url "https://github.com/jasonmayes/Twitter-Post-Fetcher.git") (commit commit))) (file-name (string-append name "-" commit)) (sha256 (base32 - "05w2wiqw84lb778nkivn421m1kk6h66xk4cjjqng1bri3d2kfzjv")))) + "1afs5dd3mbih016vganvm9bcmn3cg3cvwh34hhk5n04qvb2aphdm")))) (build-system trivial-build-system) (native-inputs `(("source" ,source))) (arguments diff --git a/gn/packages/python.scm b/gn/packages/python.scm index 34d0134..d489b7a 100644 --- a/gn/packages/python.scm +++ b/gn/packages/python.scm @@ -58,7 +58,9 @@ "0nhan2qvrw7b7gg5zddwa22kybdv3x1g26vkd7q8lvnkgzrs4dga")))) (build-system python-build-system) (arguments - '(#:phases + `(#:python ,python-2 ; apparently incompatible with Python 3 + #:tests? #f + #:phases (modify-phases %standard-phases (delete 'check) (add-after 'install 'check @@ -68,7 +70,9 @@ (add-installed-pythonpath inputs outputs) (zero? (system* "python" "-m" "rpy2.tests" "-v"))))))) (propagated-inputs - `(("python2-six" ,python2-six))) + `(("python2-six" ,python2-six) + ("python2-singledispatch" ,python2-singledispatch) + )) (inputs `(("readline" ,readline) ("icu4c" ,icu4c) @@ -77,7 +81,6 @@ ("r-survival" ,r-survival))) (native-inputs `(("zlib" ,zlib))) - (arguments `(#:tests? #f)) ;; No tests. (home-page "http://rpy.sourceforge.net/") (synopsis "Python interface to the R language") (description "rpy2 is a redesign and rewrite of rpy. It is providing a |