From c64d46d3ceb9baac1108bf33e47e18a91c43e53d Mon Sep 17 00:00:00 2001 From: pjotrp Date: Mon, 29 Jan 2018 11:01:49 +0000 Subject: Updates --- gn/packages/javascript.scm | 6 +++--- gn/packages/phewas.scm | 4 ++-- gn/packages/sambamba.scm | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gn/packages/javascript.scm b/gn/packages/javascript.scm index 74509d6..7fc82af 100644 --- a/gn/packages/javascript.scm +++ b/gn/packages/javascript.scm @@ -10,10 +10,10 @@ #:use-module (srfi srfi-1)) (define-public javascript-twitter-post-fetcher - (let ((commit "12d1693980ef836af4d5eee74a0aec5c65b8e6c3")) + (let ((commit "27440ffebd4c1ba7abc9aec92a581155715f2e4e")) (package (name "javascript-twitter-post-fetcher") - (version (string-append "17.0.2" "-" (string-take commit 7))) + (version (string-append "17.0.3" "-" (string-take commit 7))) (source (origin (method git-fetch) (uri (git-reference @@ -22,7 +22,7 @@ (file-name (string-append name "-" commit)) (sha256 (base32 - "1afs5dd3mbih016vganvm9bcmn3cg3cvwh34hhk5n04qvb2aphdm")))) + "159z8izf510086d8sa79k4mml6sw1gycb1r1r9ri1kyw2k9knmqa")))) (build-system trivial-build-system) (native-inputs `(("source" ,source))) (arguments diff --git a/gn/packages/phewas.scm b/gn/packages/phewas.scm index 75d5227..2e91aff 100644 --- a/gn/packages/phewas.scm +++ b/gn/packages/phewas.scm @@ -118,14 +118,14 @@ genome-wide association studies in structured populations.") (define-public r-fgsea (package (name "r-fgsea") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (bioconductor-uri "fgsea" version)) (sha256 (base32 - "049p2hqsq8iqradqm63ahbn2y6f4y1ys4piz1j6cr00fcfm041jq")))) + "187c8xckx0s1p19i85nsiapgb3mppjqxp7zyld5hqyjvw3zcdj50")))) (build-system r-build-system) ; (native-inputs ; `(("gfortran" ,gfortran))) diff --git a/gn/packages/sambamba.scm b/gn/packages/sambamba.scm index c2759fa..ee6a973 100644 --- a/gn/packages/sambamba.scm +++ b/gn/packages/sambamba.scm @@ -92,7 +92,7 @@ ;; The current build compiles htslib statically into the ;; executable. On top of that, we need to patch the latest ;; version of htslib to have it working with Sambamba. - (and + (and (copy-recursively (assoc-ref inputs "htslib-src") "htslib") (copy-recursively (assoc-ref inputs "dlang-undeaD-src") "undeaD") (copy-recursively (assoc-ref inputs "biod-src") "BioD")))) -- cgit v1.2.3 From b84bf9090c2400eb83fca6ee0ea1b50a2fef4ab9 Mon Sep 17 00:00:00 2001 From: pjotrp Date: Tue, 30 Jan 2018 10:25:08 +0000 Subject: Gunicorn with inotify --- gn/packages/genenetwork.scm | 1 + gn/packages/python.scm | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm index 479f694..705c511 100644 --- a/gn/packages/genenetwork.scm +++ b/gn/packages/genenetwork.scm @@ -185,6 +185,7 @@ location of a putative QTL.") ("git" ,git) ("which" ,which) ("grep" ,grep) + ("inotify-tools" ,inotify-tools) ("r" ,r) ("r-ctl" ,r-ctl) ("r-phewas" ,r-phewas) diff --git a/gn/packages/python.scm b/gn/packages/python.scm index d489b7a..9678504 100644 --- a/gn/packages/python.scm +++ b/gn/packages/python.scm @@ -125,7 +125,9 @@ functions.") (base32 "08mnl5l1p47q5wk38d7mafnhsqk50yba0l9kvc2vwrx61jgidqgf")))) (build-system python-build-system) - (arguments `(#:tests? #f)) ;; No tests. + (arguments `( + #:python ,python-2 ; GN2 is still python2 + #:tests? #f)) ;; No tests. (home-page "http://gunicorn.org") (synopsis ".") -- cgit v1.2.3 From f4e392ce9252e67304b74289fef0568ac1d66ac6 Mon Sep 17 00:00:00 2001 From: pjotrp Date: Tue, 30 Jan 2018 11:13:34 +0000 Subject: Gunicorn support with inotify --- gn/packages/genenetwork.scm | 3 ++- gn/packages/python.scm | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm index 705c511..ae49460 100644 --- a/gn/packages/genenetwork.scm +++ b/gn/packages/genenetwork.scm @@ -182,10 +182,11 @@ location of a putative QTL.") "0ji929xgzypyhchcfy9xa1sz04w322ibs2khc8s3qiddxjqdglrz")))) (propagated-inputs `( ;; propagated for development purposes ("python" ,python-2) ;; probably superfluous + ("coreutils" ,coreutils) ("git" ,git) + ("vim" ,vim) ("which" ,which) ("grep" ,grep) - ("inotify-tools" ,inotify-tools) ("r" ,r) ("r-ctl" ,r-ctl) ("r-phewas" ,r-phewas) diff --git a/gn/packages/python.scm b/gn/packages/python.scm index 9678504..848cf8d 100644 --- a/gn/packages/python.scm +++ b/gn/packages/python.scm @@ -112,8 +112,34 @@ functions.") (license license:expat)) ) +(define-public python-inotify ; guix candidate +(package + (name "python-inotify") + (version "0.2.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "inotify" version)) + (sha256 + (base32 + "043sbm9q8ca4fhn19knwpsxgzfgm5ik75m0bl7dp9hjy6p3v3zzn")))) + (build-system python-build-system) + (propagated-inputs + `(("inotify-tools" ,inotify-tools))) + (arguments `(#:tests? #f)) ;; No tests. + (home-page "https://pypi.python.org/pypi/inotify") + (synopsis + "Python inotify.") + (description + "Python inotify.") + (license license:gpl2)) +) + +(define-public python2-inotify + (package-with-python2 python-inotify)) + + (define-public gunicorn ; guix candidate - ; python-plotly, python-requests, python-pytz (package (name "gunicorn") (version "19.7.1") @@ -125,6 +151,10 @@ functions.") (base32 "08mnl5l1p47q5wk38d7mafnhsqk50yba0l9kvc2vwrx61jgidqgf")))) (build-system python-build-system) + ; (inputs + ; `(("python2-inotify" ,python2-inotify))) + (propagated-inputs + `(("inotify-tools" ,inotify-tools))) (arguments `( #:python ,python-2 ; GN2 is still python2 #:tests? #f)) ;; No tests. @@ -136,7 +166,7 @@ functions.") (license license:expat)) ) -(define-public python2-flask-sqlalchemy +(define-public python2-flask-sqlalchemy (package-with-python2 python-flask-sqlalchemy)) (define-public python-xlsxwriter ; guix ready -- cgit v1.2.3