diff options
| author | Pjotr Prins | 2017-02-19 05:08:38 -0600 |
|---|---|---|
| committer | Pjotr Prins | 2017-02-19 05:08:38 -0600 |
| commit | f2ac1a3fa8cca726a272b1eb67ddf28ec87198f6 (patch) | |
| tree | 59983961c9f965389eb204f125e45a38f319652c | |
| parent | 0747984b10a05d674d34bc5491e76e6d8f39989c (diff) | |
| download | guix-bioinformatics-gn-dev.tar.gz | |
Preparing GN2 for an new release. Disabling numarray dependencygn-dev
| -rw-r--r-- | gn/packages/genenetwork.scm | 10 | ||||
| -rw-r--r-- | gn/packages/python.scm | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm index dfbba02..a7c1999 100644 --- a/gn/packages/genenetwork.scm +++ b/gn/packages/genenetwork.scm @@ -175,20 +175,20 @@ location of a putative QTL.") (license license:agpl3+)))) (define-public genenetwork2 - (let ((commit "a8fcff44d3bd768d02e7ed0c80b84d2516bdad2a")) + (let ((commit "dab2425d6395c900b1d90ae224f039edfc560061")) (package (name "genenetwork2") (version (string-append "2.0-" (string-take commit 7) )) (source (origin (method git-fetch) (uri (git-reference - ;; (url "https://github.com/genenetwork/genenetwork2.git") - (url "https://github.com/genenetwork/genenetwork2_diet.git") + (url "https://github.com/genenetwork/genenetwork2.git") + ;; (url "https://github.com/genenetwork/genenetwork2_diet.git") (commit commit))) (file-name (string-append name "-" (string-take commit 7))) (sha256 (base32 - "1zs6jgrpwzxmfjz03whnaw8q6h8f53mycl440p058gfn8x7pd618")))) + "1jsifrqriqwj2sx8pywwrjxxl6hpzjc323ng06sp2ix6vsszrc6s")))) (propagated-inputs `( ;; propagated for development purposes ("python" ,python-2) ;; probably superfluous ("r" ,r) @@ -210,7 +210,7 @@ location of a putative QTL.") ("python2-setuptools" ,python2-setuptools) ("python2-scipy" ,python2-scipy) ("python2-mysqlclient" ,python2-mysqlclient) - ("python2-numarray" ,python2-numarray) + ; ("python2-numarray" ,python2-numarray) ("python2-numpy" ,python2-numpy) ("python2-pandas" ,python2-pandas) ("python2-parallel" ,python2-parallel) diff --git a/gn/packages/python.scm b/gn/packages/python.scm index 7dbd968..a243d67 100644 --- a/gn/packages/python.scm +++ b/gn/packages/python.scm @@ -450,6 +450,8 @@ version ".tgz")) (base32 "0x1i4j7yni7k4p9kjxs1lgln1psdmyrz65wp2yr35yn292iw2vbg")))) (build-system python-build-system) + (native-inputs + `(("python2-setuptools" ,python2-setuptools))) (arguments `(#:python ,python-2 #:tests? #f)) ; no 'setup.py test' really! |