From 0c0dc72ac00ac0e2cb7abd6f46e37df3a1af1c62 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sun, 1 Jan 2023 20:46:06 +0000 Subject: gnu: Add vger. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (vger): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/web.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f31a573e22..619030c120 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -59,6 +59,7 @@ ;;; Copyright © 2022 Pradana Aumars ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 jgart +;;; Copyright © 2023 Paul A. Patience ;;; ;;; This file is part of GNU Guix. ;;; @@ -147,6 +148,7 @@ (define-module (gnu packages web) #:use-module (gnu packages imagemagick) #:use-module (gnu packages kde) #:use-module (gnu packages kerberos) + #:use-module (gnu packages libbsd) #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages libunistring) @@ -8064,6 +8066,48 @@ (define-public gmnisrv (license (list license:gpl3+ license:bsd-3)))) ;; for ini.c and ini.h +(define-public vger + (package + (name "vger") + (version "2.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://tildegit.org/solene/vger") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jiwzn5dqadwq4ih3vzld66yq23gqsf7281sllh29bf6kmf9dz2k")))) + (build-system gnu-build-system) + (arguments + (list #:test-target "test" + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-makefile + (lambda _ + (substitute* "Makefile" + (("\\binstall -o root -g wheel vger ") + "install vger ") + (("\\binstall -o root -g wheel vger\\.8 ") + "install -m 644 vger.8 ")))) + (add-before 'install 'make-install-dirs + (lambda _ + (mkdir-p (string-append #$output "/bin")) + (mkdir-p (string-append #$output "/man/man8"))))))) + (inputs + (list libbsd)) + (home-page "https://tildegit.org/solene/vger") + (synopsis "Gemini protocol server") + (description "Vger is a Gemini protocol server that supports chroots, +virtualhosts, CGI, default language choice, redirections and MIME-type +detection. It delegates TLS support to an external daemon, for example +@command{stunnel} on @command{inetd}.") + (license license:bsd-2))) + (define-public libzim (package (name "libzim") -- cgit v1.2.3 From 35eaba00e659a16279daf7f356119e10198afa84 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sun, 1 Jan 2023 21:08:43 +0000 Subject: gnu: Add gophernicus. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (gophernicus): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/web.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 619030c120..6285d1a2e2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7474,6 +7474,73 @@ (define-public perl-html-tidy in Perl but is not nearly as capable as @code{HTML::Tidy}.") (license license:artistic2.0))) +(define-public gophernicus + ;; Contains some unreleased fixes. + (let ((commit "da3390089c2a856db1ab2e3bd9751b9a9101a33a") + (revision "0")) + (package + (name "gophernicus") + (version (git-version "3.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gophernicus/gophernicus") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0a7kpymwqcsqzszdxvcqppbg61bpyg9f7raj783pldm4kf2wjyij")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ; No tests + #:configure-flags + ;; Listener and hostname used only in configuration files, which + ;; we don't install. + ;; This is what's done in the release.sh script. + #~(list "--listener=none" "--hostname=HOSTNAME") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-version + (lambda _ + (substitute* "Makefile.in" + (("^(VERSION += ).*" _ prefix) + (string-append prefix #$version "\n"))) + ;; This is done in the release.sh script. + (substitute* "README.md" + (("^(This release: Version )DEVEL\\b.*" _ prefix) + (string-append prefix #$version "\n")) + (("^NOTE: The master branch is rolling Development\\b.*") + "")))) + (replace 'configure + ;; The configure script is hand-written, not from GNU autotools. + (lambda* (#:key configure-flags #:allow-other-keys) + (setenv "CC" #$(cc-for-target)) + (setenv "HOSTCC" "gcc") + (apply invoke "./configure" + (string-append "--prefix=" #$output) + configure-flags)))))) + ;; TODO: Make configure script find libwrap. + ;;(inputs + ;; (list tcp-wrappers)) + (home-page "https://gophernicus.org/") + (synopsis "Gopher protocol server") + (description + "Gophernicus is a Gopher protocol server. Its features include: +@itemize +@item written with security in mind; +@item automatically generated Gopher menus; +@item gophertags for virtually renaming directories; +@item personal gopherspaces, located in @file{~/public_gopher/}; +@item virtual hosting; +@item CGI support; +@item output filtering and PHP support; +@item charset support and conversions; +@item selector rewriting; +@item session tracking and statistics; +@item TLS/SSL and proxy support. +@end itemize") + (license license:bsd-2)))) + (define-public geomyidae (package (name "geomyidae") -- cgit v1.2.3 From 9f5a248fc96cf1bff38d1fbc2ca76a61648e25b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Jan 2023 01:00:01 +0100 Subject: gnu: nginx: Update to 1.23.3. * gnu/packages/web.scm (nginx): Update to 1.23.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6285d1a2e2..d4df02204a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -387,14 +387,14 @@ (define-public nginx ;; Track the ‘mainline’ branch. Upstream considers it more reliable than ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) - (version "1.23.2") + (version "1.23.3") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "0ihbkfcqlqadzkdk813raq15qqrahss1gdd81bkswanpsdrc4358")))) + "0m5s8a04jlpv6qhk09sfqbj4rxj38g6923w12j5y3ymrvf3mgjvm")))) (build-system gnu-build-system) (inputs (list libxml2 libxslt openssl pcre zlib)) (arguments -- cgit v1.2.3 From 92b6f227a079690a50d0c379f07211d0df86c7ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Jan 2023 01:00:02 +0100 Subject: gnu: nginx-documentation: Update to 1.23.3-2916-178f55cf631a. * gnu/packages/web.scm (nginx-documentation): Update to 1.23.3-2916-178f55cf631a. --- gnu/packages/web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d4df02204a..c3180d4e29 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -483,9 +483,9 @@ (define-public nginx (define-public nginx-documentation ;; This documentation should be relevant for the current nginx package. - (let ((version "1.23.1") - (revision 2898) - (changeset "0b7e004b5061")) + (let ((version "1.23.3") + (revision 2916) + (changeset "178f55cf631a")) (package (name "nginx-documentation") (version (simple-format #f "~A-~A-~A" version revision changeset)) @@ -497,7 +497,7 @@ (define-public nginx-documentation (file-name (string-append name "-" version)) (sha256 (base32 - "027q7gnx7k3hgj7qana44g383fvvj6ndz1kavr30mj2z87cnq3dp")))) + "0b03dnniwm3p3gd76vqs6lj2z4blqmb7y4lhn9vg7xjz0yqgzvn2")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite -- cgit v1.2.3 From 35955bafc54d225ef7515a9f469be86508a75343 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Jan 2023 01:00:01 +0100 Subject: gnu: go-github-com-itchyny-gojq: Update to 0.12.11. * gnu/packages/web.scm (go-github-com-itchyny-gojq): Update to 0.12.11. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c3180d4e29..b0198946fa 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4927,7 +4927,7 @@ (define-public go-github-com-itchyny-timefmt-go (define-public go-github-com-itchyny-gojq (package (name "go-github-com-itchyny-gojq") - (version "0.12.9") + (version "0.12.11") (source (origin (method git-fetch) @@ -4936,7 +4936,7 @@ (define-public go-github-com-itchyny-gojq (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1m4zchhhi2428r1v0qz08drac4s63mag1pwcqzsf6n495yc3g0h0")))) + (base32 "1dqmnxnipi497nx9x10ifack09w41579svryss5q2w5wxy0pg764")))) (build-system go-build-system) (inputs (list go-github-com-google-go-cmp-cmp -- cgit v1.2.3 From a5a990d07429cb836c3811930900d6cebdbfb35f Mon Sep 17 00:00:00 2001 From: André Batista Date: Thu, 19 Jan 2023 13:48:01 -0300 Subject: gnu: lighttpd: Update to 1.4.68. * gnu/packages/web.scm (lighttpd): Update to 1.4.68. Signed-off-by: Efraim Flashner --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b0198946fa..32bda0b5be 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -839,7 +839,7 @@ (define-public nginx-rtmp-module (define-public lighttpd (package (name "lighttpd") - (version "1.4.65") + (version "1.4.68") (source (origin (method url-fetch) (uri (string-append "https://download.lighttpd.net/lighttpd/" @@ -847,7 +847,7 @@ (define-public lighttpd "lighttpd-" version ".tar.xz")) (sha256 (base32 - "1gi84fsc7x4d7r5vpg4pcwfk6j80wxvv64m94d041g4zca5ac3xz")))) + "111kb3lkcvbxw46dnsrgx9pfbdpzb807ikkn9pd1lgmnaap3fvz5")))) (build-system gnu-build-system) (arguments (list #:configure-flags -- cgit v1.2.3 From e1dbac04c3b89670ef726a0dafd390e87c6c754f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 22 Jan 2023 17:58:11 +0100 Subject: gnu: hpcguix-web: Update to 0.3.0. * gnu/packages/web.scm (hpcguix-web): Update to 0.3.0. [inputs]: Add GUILE-SYNTAX-HIGHLIGHT. [arguments]: In 'wrap-program' phase, take guile-syntax-highlight into account. * gnu/tests/web.scm (%hpcguix-web-specs): Remove 'define'. * doc/guix.texi (Web Services): Adjust accordingly. --- doc/guix.texi | 12 ++++++------ gnu/packages/web.scm | 11 +++++++---- gnu/tests/web.scm | 7 +++---- 3 files changed, 16 insertions(+), 14 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/doc/guix.texi b/doc/guix.texi index d7e2311a65..507a0d3ee4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -30322,14 +30322,15 @@ Data type for the hpcguix-web service configuration. @table @asis @item @code{specs} A gexp (@pxref{G-Expressions}) specifying the hpcguix-web service -configuration. The main items available in this spec are: +configuration as an @code{hpcguix-web-configuration} record. The main +fields of that record type are: @table @asis @item @code{title-prefix} (default: @code{"hpcguix | "}) The page title prefix. @item @code{guix-command} (default: @code{"guix"}) -The @command{guix} command. +The @command{guix} command to use in examples that appear on HTML pages. @item @code{package-filter-proc} (default: @code{(const #t)}) A procedure specifying how to filter packages that are displayed. @@ -30369,10 +30370,9 @@ A typical hpcguix-web service declaration looks like this: (service hpcguix-web-service-type (hpcguix-web-configuration (specs - #~(define site-config - (hpcweb-configuration - (title-prefix "Guix-HPC - ") - (menu '(("/about" "ABOUT")))))))) + #~(hpcweb-configuration + (title-prefix "Guix-HPC - ") + (menu '(("/about" "ABOUT"))))))) @end lisp @quotation Note diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 32bda0b5be..6de462e921 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 ;;; Copyright © 2013 Aljosha Papsch -;;; Copyright © 2014-2022 Ludovic Courtès +;;; Copyright © 2014-2023 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus ;;; Copyright © 2018 Raoul Jean Pierre Bonnal @@ -7710,7 +7710,7 @@ (define-public nghttp2 (define-public hpcguix-web (package (name "hpcguix-web") - (version "0.2.0") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -7719,7 +7719,7 @@ (define-public hpcguix-web (file-name (git-file-name name version)) (sha256 (base32 - "1l856d1vr63ns1sp9fm6v97p71mx00769k6lwzqzppsb9clksnwp")))) + "1g1sd5d6fhrblqk3rc8hzkk1sxyiilbb45kdgbrfg7ccd1sbic30")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -7744,9 +7744,11 @@ (define-public hpcguix-web (bs (assoc-ref inputs "guile-bytestructures")) (json (assoc-ref inputs "guile-json")) (zlib (assoc-ref inputs "guile-zlib")) + (syntax (assoc-ref inputs "guile-syntax-highlight")) (guile-cm (assoc-ref inputs "guile-commonmark")) - (deps (list guile gcrypt git bs zlib guile-cm guix json)) + (deps (list guile gcrypt git bs zlib guile-cm + syntax guix json)) (effective (read-line (open-pipe* OPEN_READ @@ -7776,6 +7778,7 @@ (define-public hpcguix-web guile-zlib guile-commonmark guile-json-4 + guile-syntax-highlight bash-minimal)) (home-page "https://github.com/UMCUGenetics/hpcguix-web") (synopsis "Web interface for cluster deployments of Guix") diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 7a585e618d..16dc6bea49 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2020-2021 Ludovic Courtès +;;; Copyright © 2017, 2020-2021, 2023 Ludovic Courtès ;;; Copyright © 2017, 2019 Christopher Baines ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2018 Pierre-Antoine Rouby @@ -419,9 +419,8 @@ (define marionette (define %hpcguix-web-specs ;; Server config gexp. - #~(define site-config - (hpcweb-configuration - (title-prefix "[TEST] HPCGUIX-WEB")))) + #~(hpcweb-configuration + (title-prefix "[TEST] HPCGUIX-WEB"))) (define %hpcguix-web-os (simple-operating-system -- cgit v1.2.3 From 4da229d777dab4e31b9e1f582635ea0590efb713 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 23 Jan 2023 16:40:12 +0100 Subject: gnu: woof: Update to 20220202. * gnu/packages/web.scm (woof): Update to 20220202. [source]: Change to Github. [arguments]: Update source path, change to python3, remove chmod. [inputs]: Change to python3. --- gnu/packages/web.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6de462e921..b0bacf9982 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner ;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2016 Ben Woodcroft -;;; Copyright © 2016 Clément Lassieur +;;; Copyright © 2016, 2023 Clément Lassieur ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016–2022 Arun Isaac ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice @@ -5026,15 +5026,16 @@ (define-public uhttpmock (define-public woof (package (name "woof") - (version "2012-05-31") + (version "20220202") (source (origin - (method url-fetch) - (uri (string-append - "http://www.home.unix-ag.org/simon/woof-" - version ".py")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/simon-budig/woof") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0wjmjhpg6xlid33yi59j47q2qadz20sijrqsjahj30vngz856hyq")))) + "0rm8xs5dhy42jhjpx30vwnvps2rnmrh8scfr89j6dnihc6mpjkmn")))) (build-system trivial-build-system) (arguments '(#:modules ((guix build utils)) @@ -5047,11 +5048,10 @@ (define-public woof (python (assoc-ref %build-inputs "python"))) (mkdir-p bin) (with-directory-excursion bin - (copy-file source "woof") - (patch-shebang "woof" (list (string-append python "/bin"))) - (chmod "woof" #o555)) + (copy-file (in-vicinity source "woof") "woof") + (patch-shebang "woof" (list (string-append python "/bin")))) #t)))) - (inputs `(("python" ,python-2))) + (inputs (list python)) (home-page "http://www.home.unix-ag.org/simon/woof.html") (synopsis "Single file web server") (description "Woof (Web Offer One File) is a small simple web server that -- cgit v1.2.3 From 4d2e35ebf8ccadd07967578b49a1f71f940ab9f3 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Sun, 18 Dec 2022 23:01:41 +0000 Subject: gnu: Add nginx-module-vts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Depends on nginx http_stub_status_module. * gnu/packages/web.scm (nginx-module-vts): New variable. (nginx)[arguments]: Add "--with-http_stub_status_module" to #:configure-flags. Signed-off-by: Ludovic Courtès --- gnu/packages/web.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b0bacf9982..7817373421 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -60,6 +60,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Paul A. Patience +;;; Copyright © 2022 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -412,6 +413,7 @@ (define-public nginx "--with-debug" "--with-stream" "--with-stream_ssl_module" + "--with-http_stub_status_module" ;; Even when not cross-building, we pass the ;; --crossbuild option to avoid customizing for the ;; kernel version on the build machine. @@ -836,6 +838,57 @@ (define-public nginx-rtmp-module stream. Remote control of the module is possible over HTTP.") (license license:bsd-2))) +(define-public nginx-module-vts + (package + (inherit nginx) + (name "nginx-module-vts") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vozlt/nginx-module-vts") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "017298vpp1ra16xyfdbsczdrz0b0y67x6adkzcc98y6gb3kg52n7")))) + (build-system gnu-build-system) + (inputs + `(("nginx-sources" ,(package-source nginx)) + ,@(package-inputs nginx))) + (arguments + (substitute-keyword-arguments + `(#:make-flags '("modules") ;Only build this module not all of nginx. + ,@(package-arguments nginx)) + ((#:configure-flags flags) + #~(cons "--add-dynamic-module=." #$flags)) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'unpack-nginx-sources + (lambda _ + (begin + ;; The nginx source code is part of the module’s source. + (format #t "decompressing nginx source code~%") + (invoke "tar" "xvf" #$(this-package-input "nginx-sources") + ;; This package's LICENSE file would be + ;; overwritten with the one from nginx when + ;; unpacking the nginx source, so rename the nginx + ;; one when unpacking. + "--transform=s,/LICENSE$,/LICENSE.nginx," + "--strip-components=1")))) + (replace 'install + (lambda _ + (let ((modules-dir (string-append #$output + "/etc/nginx/modules"))) + (install-file "objs/ngx_http_vhost_traffic_status_module.so" modules-dir)))) + (delete 'fix-root-dirs) + (delete 'install-man-page))))) + (home-page "https://github.com/vozlt/nginx-module-vts") + (synopsis "NGINX module for monitoring virtual host traffic status") + (description "This NGINX module provides access to virtual host status information, +similar to live activity monitoring provided with NGINX plus.") + (license license:bsd-2))) + (define-public lighttpd (package (name "lighttpd") -- cgit v1.2.3 From 99efb55cd4cee39ba5aca259585fcea8c9f52fca Mon Sep 17 00:00:00 2001 From: Lilah Tascheter Date: Fri, 6 Jan 2023 13:09:26 -0600 Subject: gnu: castor: Fix compilation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Castor no longer compiles with latest packaged LibreSSL; latest OpenSSL, however, does compile. * gnu/packages/web.scm (castor)[inputs]: Replace libressl with openssl. Signed-off-by: Ludovic Courtès --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7817373421..a29f53108c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6604,7 +6604,7 @@ (define-public castor cairo gdk-pixbuf gtk+ - libressl + openssl-3.0 pango)) (home-page "https://git.sr.ht/~julienxx/castor") (synopsis "Graphical client for plain-text protocols") -- cgit v1.2.3 From 157b94ead7ea64c945b8dc11f8a8800350ef53a5 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 2 Feb 2023 14:04:48 -0500 Subject: gnu: Add wasm3. * gnu/packages/web.scm (wasm3): New variable. --- gnu/packages/web.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a29f53108c..c527ff80df 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -61,6 +61,7 @@ ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Paul A. Patience ;;; Copyright © 2022 Bruno Victal +;;; Copyright © 2023 David Thompson ;;; ;;; This file is part of GNU Guix. ;;; @@ -1557,6 +1558,53 @@ (define-public wabt other systems that want to manipulate WebAssembly files.") (license license:asl2.0))) +(define-public wasm3 + (package + (name "wasm3") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wasm3/wasm3") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "07zzmk776j8ydyxhrnnjiscbhhmz182a62r6aix6kfk5kq2cwia2")))) + (build-system cmake-build-system) + (arguments + ;; The default WASI option "uvwasi" causes CMake to initiate a 'git + ;; clone' which cannot happen within the build container. + '(#:configure-flags '("-DBUILD_WASI=simple") + ;; No check target. There are tests but they require a network + ;; connection to download the WebAssembly core test suite. + #:tests? #f + ;; There is no install target. Instead, we have to manually copy the + ;; wasm3 build artifacts to the output directory. + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bindir (string-append out "/bin")) + (includedir (string-append out "/include")) + (libdir (string-append out "/lib"))) + (mkdir-p bindir) + (mkdir-p includedir) + (mkdir-p libdir) + (copy-file "wasm3" (string-append bindir "/wasm3")) + (for-each (lambda (header) + (copy-file header + (string-append includedir "/" + (basename header)))) + (find-files "../source/source" "\\.h$")) + (copy-file "source/libm3.a" + (string-append libdir "/libm3.a")))))))) + (home-page "https://github.com/wasm3/wasm3") + (synopsis "WebAssembly interpreter") + (description "WASM3 is a fast WebAssembly interpreter.") + (license license:expat))) + (define-public websocketpp (package (name "websocketpp") -- cgit v1.2.3