aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner2019-10-18 06:47:02 -0500
committerEfraim Flashner2019-10-18 07:27:02 -0500
commit728f5f6b9c90d33c95f511684957057f87c08d73 (patch)
tree7b101708e9bddf65210aa72cb14124056ffe2344
parentc8009a204cf8c049314b3dda94ac9673fbbb7418 (diff)
downloadguix-bioinformatics-728f5f6b9c90d33c95f511684957057f87c08d73.tar.gz
fixup repo for guix pull
* gn/packages/cwl.scm: GN's python-setuptools renamed to python-setuptools-old,re-enable import. * gn/packages/genenetwork.scm (my-deploy)[inputs]: Replace search-bootstrap-binary with bootstrap-executable.
-rw-r--r--gn/packages/cwl.scm2
-rw-r--r--gn/packages/genenetwork.scm8
2 files changed, 5 insertions, 5 deletions
diff --git a/gn/packages/cwl.scm b/gn/packages/cwl.scm
index dddaa8a..84251a4 100644
--- a/gn/packages/cwl.scm
+++ b/gn/packages/cwl.scm
@@ -13,7 +13,7 @@
#:use-module (gnu packages serialization)
#:use-module (gnu packages time)
#:use-module (gnu packages version-control)
- ; #:use-module (gn packages python)
+ #:use-module (gn packages python)
#:use-module (guix download)
#:use-module (guix packages)
#:use-module (guix git-download)
diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm
index 836da8d..3ca1456 100644
--- a/gn/packages/genenetwork.scm
+++ b/gn/packages/genenetwork.scm
@@ -31,7 +31,7 @@
#:use-module (gn packages gemma)
#:use-module (gn packages javascript)
#:use-module (gn packages phewas)
- #:use-module (gn packages python)
+ #:use-module (gn packages python)
#:use-module (gn packages python24)
#:use-module (gn packages statistics))
@@ -60,14 +60,14 @@
;; wrap-program uses `which' to find bash for the wrapper
;; shebang, but it can't know about the bootstrap bash in
;; the store, since it's not named "bash". Help it out a
- ;; bit by providing a symlink it this package's output.
+ ;; bit by providing a symlink to this package's output.
(symlink bash (string-append out "/bash"))
(setenv "PATH" out)
(wrap-program foo `("GUIX_FOO" prefix ("hello")))
(wrap-program foo `("GUIX_BAR" prefix ("world")))
#t))))
- (inputs `(("bash" ,(search-bootstrap-binary "bash"
- (%current-system)))))
+ (inputs `(("bash" ,(bootstrap-executable "bash"
+ (%current-system)))))
(home-page #f)
(synopsis #f)