diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-09-09 17:40:35 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-09-09 17:40:35 +0200 |
| commit | 0aeb13485055975d71ec8283040f007c79599bba (patch) | |
| tree | a06139136c809b00d166d6d66bdf757f20566704 /gnu/packages/web.scm | |
| parent | b03f270e3d5ab5315b50ef3ebac35735cc28d4a2 (diff) | |
| parent | 0084744b3af0a6f8e125120143f57567902339a8 (diff) | |
| download | gnu-guix-0aeb13485055975d71ec8283040f007c79599bba.tar gnu-guix-0aeb13485055975d71ec8283040f007c79599bba.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/web.scm')
| -rw-r--r-- | gnu/packages/web.scm | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 001644c195..53d886cf0d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3823,15 +3823,17 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (define-public r-httpuv (package (name "r-httpuv") - (version "1.4.4.1") + (version "1.4.5") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "12kwq10xa8glrip7rai9xb4hnpysng00g2l0rw7swfzq5lk4z966")))) + "1ddpcarzf694h0gy5pdz7l5glqfv4hr9dmxb4vw7yqd0bga174gi")))) (build-system r-build-system) - (native-inputs `(("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-rcpp" ,r-rcpp) + ("pkg-config" ,pkg-config))) (propagated-inputs `(("r-bh" ,r-bh) ("r-later" ,r-later) @@ -6706,10 +6708,11 @@ compressed JSON header blocks. (license l:expat))) (define-public hpcguix-web - (let ((commit "87cb51611c0f1fd3863b830614ab1364599cf1ca")) + (let ((commit "9ff40fcc77f248901d861756dbbddc80270c380c") + (revision "2")) (package (name "hpcguix-web") - (version (git-version "0.0.1" "1" commit)) + (version (git-version "0.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6718,7 +6721,7 @@ compressed JSON header blocks. (file-name (git-file-name name version)) (sha256 (base32 - "0p66fl8r3v73v13fqg9rbqbzbdzvyznchxbq2s1jwq6qfsn2w3gr")))) + "0lxcj9s3wxrv1l7lrxxx374jwzx7h60gxwkbgr46lzcbgvb3k26s")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -6739,10 +6742,13 @@ compressed JSON header blocks. (let* ((out (assoc-ref outputs "out")) (guix (assoc-ref inputs "guix")) (guile (assoc-ref inputs "guile")) + (gcrypt (assoc-ref inputs "guile-gcrypt")) + (git (assoc-ref inputs "guile-git")) + (bs (assoc-ref inputs "guile-bytestructures")) (json (assoc-ref inputs "guile-json")) (guile-cm (assoc-ref inputs "guile-commonmark")) - (deps (list guile guile-cm guix json)) + (deps (list guile gcrypt git bs guile-cm guix json)) (effective (read-line (open-pipe* OPEN_READ |