diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-10-25 21:50:59 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-10-25 21:50:59 +0300 |
| commit | 6ff203663e696b74e711ab09d6f4b35c2c332f0f (patch) | |
| tree | 4bf2c77c62fa60febba527a76b1ecffaa0a00a0d /gnu/packages/web.scm | |
| parent | 408a4ed071c9c52de207d799a698781d49fa727d (diff) | |
| parent | a0751e3250dfea7e52468c8090e18c3118d93a60 (diff) | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/packages/web.scm')
| -rw-r--r-- | gnu/packages/web.scm | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 967d4328b5..abdd8cacdb 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de> -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Raoul Jean Pierre Bonnal <ilpuccio.febo@gmail.com> @@ -408,6 +408,7 @@ the same, being completely separated from the Internet.") "--with-pcre-jit" "--with-debug" "--with-stream" + "--with-stream_ssl_module" ;; Even when not cross-building, we pass the ;; --crossbuild option to avoid customizing for the ;; kernel version on the build machine. @@ -7629,18 +7630,15 @@ compressed JSON header blocks. `("GUILE_LOAD_PATH" ":" prefix (,path)) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath))))))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("uglify-js" ,uglify-js) - ("pkg-config" ,pkg-config) - ("guile" ,@(assoc-ref (package-native-inputs guix) "guile")))) + (list autoconf automake uglify-js pkg-config + (lookup-package-native-input guix "guile"))) (inputs - `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) - ("guix" ,guix) - ("guile-zlib" ,guile-zlib) - ("guile-commonmark" ,guile-commonmark) - ("guile-json" ,guile-json-4) - ("bash-minimal" ,bash-minimal))) + (list (lookup-package-native-input guix "guile") + guix + guile-zlib + guile-commonmark + guile-json-4 + bash-minimal)) (home-page "https://github.com/UMCUGenetics/hpcguix-web") (synopsis "Web interface for cluster deployments of Guix") (description "Hpcguix-web provides a web interface to the list of packages |