diff options
| -rw-r--r-- | gn/packages/genenetwork.scm | 19 | ||||
| -rw-r--r-- | gn/packages/python24.scm | 3 | ||||
| -rw-r--r-- | gn/packages/web.scm | 7 |
3 files changed, 21 insertions, 8 deletions
diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm index 1c2e8d2..08d070b 100644 --- a/gn/packages/genenetwork.scm +++ b/gn/packages/genenetwork.scm @@ -29,8 +29,8 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages vim) #:use-module (gnu packages web) - #:use-module (gnu packages xml) #:use-module (gnu packages wget) + #:use-module (gnu packages xml) #:use-module (gn packages bioinformatics) #:use-module (gn packages crates-io) #:use-module (gn packages elixir) @@ -40,7 +40,8 @@ #:use-module (gn packages phewas) #:use-module (gn packages python) #:use-module (gn packages python24) - #:use-module (gn packages statistics)) + #:use-module (gn packages statistics) + #:use-module (gn packages web)) @@ -686,6 +687,14 @@ written in C") (base32 "1s735dj8kf98gf5w58p10zzyc5766gn27j4j5yh07ksadg7h1kdi")))) (build-system gnu-build-system) + (propagated-inputs + `(("ghostscript" ,ghostscript) + ("graphviz" ,graphviz-2.26) + ("httpd" ,httpd) + ("python24" ,python-2.4) + ("mod-python-24" ,mod-python-24) + ("python-piddle" ,python24-piddle) + ("wget" ,wget))) (arguments `(#:tests? #f ; no tests #:phases @@ -728,12 +737,6 @@ written in C") (lambda* (#:key outputs #:allow-other-keys) (copy-recursively "." (assoc-ref outputs "out")) #t))))) - (inputs - `(("ghostscript" ,ghostscript) - ("graphviz" ,graphviz-2.26) - ("python24" ,python-2.4) - ("python-piddle" ,python24-piddle) - ("wget" ,wget))) (home-page "http://www.genenetwork.org/webqtl/main.py") (synopsis "Combined database and data analysis software resource for systems genetics") diff --git a/gn/packages/python24.scm b/gn/packages/python24.scm index d9b5694..ce666c6 100644 --- a/gn/packages/python24.scm +++ b/gn/packages/python24.scm @@ -14,6 +14,7 @@ #:use-module (gnu packages onc-rpc) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages readline) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) #:use-module (srfi srfi-1)) @@ -97,6 +98,8 @@ read read ssl ssl tcl tcl tk tk ,(version-major+minor (package-version tcl)) ,(v (list (search-path-specification (variable "PYTHONPATH") (files '("lib/python2.4/site-packages"))))) + (propagated-inputs + `(("readline" ,readline))) (inputs `(("libnsl" ,libnsl) ("libtirpc" ,libtirpc) diff --git a/gn/packages/web.scm b/gn/packages/web.scm index 4ea5625..8b44e23 100644 --- a/gn/packages/web.scm +++ b/gn/packages/web.scm @@ -7,6 +7,7 @@ #:use-module (gnu packages onc-rpc) #:use-module (gn packages python24) #:use-module (gnu packages python) + #:use-module (gnu packages readline) #:use-module (gnu packages web) #:use-module (guix packages) #:use-module (guix download) @@ -203,6 +204,7 @@ extensive prebuilt components, and powerful plugins built on jQuery.") #t))))) (inputs `(("httpd" ,httpd) + ("readline" ,readline) ("python" ,python-2))) ; does not seem to build with python3.7+ (native-inputs `(("flex" ,(@ (gnu packages flex) flex)))) (home-page "http://modpython.org/") @@ -283,12 +285,17 @@ connections and other data between hits and access to Apache internals.") `(("autoconf" ,autoconf) ("automake" ,automake) ("flex" ,(@ (gnu packages flex) flex)))) + (propagated-inputs + `( + ("readline" ,readline) + )) (inputs `(("httpd" ,httpd) ("libnsl" ,libnsl) ("libtirpc" ,libtirpc) ("python" ,python-2.4))))) + (define-public web-font-awesome (package (inherit font-awesome) |