From patchwork Mon Dec 2 13:03:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Josep Bigorra X-Patchwork-Id: 34377 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 66AE427BBE9; Mon, 2 Dec 2024 13:05:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 344D827BBE2 for ; Mon, 2 Dec 2024 13:05:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tI66v-00087T-9Z; Mon, 02 Dec 2024 08:05:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tI66r-00086s-CU for guix-patches@gnu.org; Mon, 02 Dec 2024 08:05:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tI66o-0008CU-NM for guix-patches@gnu.org; Mon, 02 Dec 2024 08:05:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=Date:From:MIME-Version:To:Subject; bh=a2C/0MRSy0tTaFxaF8sok4iylrDWNJno8NLTrqSD6So=; b=VIomfrb7VLPPMNYWpzDDd+siK5Haey/wp42EJiGvzLdCC3ms/BYfcxFV/MU0YtFLngoDQfGH+SfxlQLJ53ke4EBMwKqeg9/pO//1CZYI5R+sDwNwtVgU27GmOnj0GZHb/vkEwOJUzjsDNxZlVsSggcLaqB5BxIu6hRlRXXPHwVHQblK0UkO70YGaKPTPXIZOuoaLI0hpB03xf5TGM6/227Hlp69VASM8qxzdSsrI/ZhPD35MvvzbfhLh/+3tZysdZfHCFVf/rC+dCSSE7ieu5goBJvjeQi6lfnCaLyTbgsGqb0FRS7LDU3UZcgpzJPYYEHlHCjzGHOpx2jotpH/9rA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tI66o-00077R-9p for guix-patches@gnu.org; Mon, 02 Dec 2024 08:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74649] [PATCH] Update Artanis to 1.0.0 Resent-From: Josep Bigorra Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Dec 2024 13:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74649 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74649@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173314465027272 (code B ref -1); Mon, 02 Dec 2024 13:05:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Dec 2024 13:04:10 +0000 Received: from localhost ([127.0.0.1]:54647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tI65x-00075l-43 for submit@debbugs.gnu.org; Mon, 02 Dec 2024 08:04:10 -0500 Received: from lists.gnu.org ([209.51.188.17]:59118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tI65u-00075c-AL for submit@debbugs.gnu.org; Mon, 02 Dec 2024 08:04:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tI65q-0007h4-2b for guix-patches@gnu.org; Mon, 02 Dec 2024 08:04:05 -0500 Received: from mail-oi1-x22d.google.com ([2607:f8b0:4864:20::22d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tI65l-0007jy-JL for guix-patches@gnu.org; Mon, 02 Dec 2024 08:04:01 -0500 Received: by mail-oi1-x22d.google.com with SMTP id 5614622812f47-3ea53011deaso1664614b6e.1 for ; Mon, 02 Dec 2024 05:03:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733144635; x=1733749435; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=a2C/0MRSy0tTaFxaF8sok4iylrDWNJno8NLTrqSD6So=; b=Eyn54pWJYFeRW/k607GhuLCiHnkGyK/HP7VcjFCMkMAbWVJV4S+dZems4vI+8PJb6r TbFtmTL5OydQlnPmuHLoLsDsCR71Bsx74yPRPuSyOfTKlIt8MWwA4h1nDPAo+kFjoFTV cvLKvMCaE8p6LSYOHB1p52NvEpYLy7O/MtKpOyryaNY8A2EI13UHY49YA1Ihxve441bM n64Or3k/RKXKrS55XTQ2CACbIKMVXAEp5x8szKyYcIuCR2S2HuG3M4FmqAaLwgp85jSE LZtURgdc5Ze5A3jfiIsR6DXUY/dO3JUMp1JwCWmUOy+OtpsttcgEpLaFMgx6VIBqoyf+ i1NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733144635; x=1733749435; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=a2C/0MRSy0tTaFxaF8sok4iylrDWNJno8NLTrqSD6So=; b=pZG/nz0nrj/41JyeHMSP5OnEMjvbrhhrj9wFSQPt8guos7JpU9/LpsatHnw++DitYi Nnn9Snk0td/m0cz0r3RB11oLFdifNUF/ruZmdbt2UWKSxFeq7q1/s1fZjUchEmX+NmJh i5tb15f+9YSfNRQHPoLYUiXcccJuF1tJgDp18RGvmzR99B2gvmbK3aNKgaXWgbptLhmu dRhEgVw/fZX8I0wD9qrPDCwFAYTuNsJBA4L/NdHSYBiVsQeJBpKNwvOXp/+AnYSbZFzw gWjodpigXKE4VZTbNEr5Wk+8Rhw6tww/F/XUex/brFh1RZITB+30u6ZUxycX/0ws6XS5 v6vg== X-Gm-Message-State: AOJu0YzccY/U1FpVzp0fMai7G8d5VGTrc2KkHBI737NKXT4yQtR51sB/ rrERXESqvFUmF/K1/1NB/ywODb5JbcFeG5AqEzdfNfUIzAgeQSvTcIE5Au9xDREJXHu5NXi0U6B 0nxiqpCQtlMchRJ+ESZgtjeLLeGnw X-Gm-Gg: ASbGncs3+SKFZ4EuLGsi2zjd71DONjK0ckAvGVcbPUuqCujTD1wEgIFSjZVmpeukePT m/O0Cqi3a7uku9cHGCq7a4JRIdmlU8Q== X-Google-Smtp-Source: AGHT+IH3oF4ynTWDK+9TSYYnUZwp6oHi/9yAQSn/o32xgeA0q4qnWwFEsrHsM6R//EA6Dt9wSmMB7xgq1mqjE6lyKPI= X-Received: by 2002:a05:6808:13c8:b0:3ea:69df:c256 with SMTP id 5614622812f47-3ea6db6d6a0mr19921849b6e.2.1733144635152; Mon, 02 Dec 2024 05:03:55 -0800 (PST) MIME-Version: 1.0 From: Josep Bigorra Date: Mon, 2 Dec 2024 14:03:42 +0100 Message-ID: Received-SPF: pass client-ip=2607:f8b0:4864:20::22d; envelope-from=jjbigorra@gmail.com; helo=mail-oi1-x22d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi all! I am submitting an update to Artanis, after noticing on Guix an old version is in the repos. Hope I didn't miss anything, thanks in advance! Regards, Joe From 2d3c7348ae8a87a6e2d0e921e14768ecf632ca6a Mon Sep 17 00:00:00 2001 Message-ID: <2d3c7348ae8a87a6e2d0e921e14768ecf632ca6a.1733144503.git.jjbigorra@gmail.com> From: Josep Bigorra Date: Mon, 2 Dec 2024 14:01:30 +0100 Subject: [PATCH] update artanis to 1.0.0 --- gnu/packages/guile-xyz.scm | 232 ++++++++++++++++++------------------- 1 file changed, 114 insertions(+), 118 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a21289d368..4db3899352 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2024 Artyom Bologov ;;; Copyright © 2024 Felix Lechner ;;; Copyright © 2024 Alec Barreto +;;; Copyright © 2024 Josep Bigorra ;;; ;;; This file is part of GNU Guix. ;;; @@ -148,122 +149,117 @@ (define-module (gnu packages guile-xyz) (define-public artanis (package - (name "artanis") - (version "0.6") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/artanis/artanis-" - version ".tar.gz")) - (sha256 - (base32 - "1y4mf8vv2fwjg4z8c4d7an5rxi96sh7krk0djnafm2l66i97cj3m")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Unbundle guile-redis and guile-json - (delete-file-recursively "artanis/third-party/json.scm") - (delete-file-recursively "artanis/third-party/json") - (delete-file-recursively "artanis/third-party/redis.scm") - (delete-file-recursively "artanis/third-party/redis") - (substitute* '("artanis/artanis.scm" - "artanis/lpc.scm" - "artanis/oht.scm" - "artanis/tpl/parser.scm") - (("(#:use-module \\()artanis third-party (json\\))" _ - use-module json) - (string-append use-module json))) - (substitute* '("artanis/lpc.scm" - "artanis/session.scm") - (("(#:use-module \\()artanis third-party (redis\\))" _ - use-module redis) - (string-append use-module redis))) - (substitute* "artanis/oht.scm" - (("([[:punct:][:space:]]+)(->json-string)([[:punct:][:space:]]+)" - _ pre json-string post) - (string-append pre - "scm" json-string - post))) - (substitute* "artanis/artanis.scm" - (("[[:punct:][:space:]]+->json-string[[:punct:][:space:]]+") - "")) - #t)))) - (build-system gnu-build-system) - (inputs - (list bash-minimal guile-3.0 nspr nss)) - ;; FIXME the bundled csv contains one more exported procedure - ;; (sxml->csv-string) than guile-csv. The author is maintainer of both - ;; projects. - ;; TODO: Add guile-dbi and guile-dbd optional dependencies. - (propagated-inputs - (list guile-json-3 guile-curl guile-readline guile-redis)) - (native-inputs - (list bash-minimal ;for the `source' builtin - pkg-config - util-linux)) ;for the `script' command - (arguments - `(#:modules (((guix build guile-build-system) - #:select (target-guile-effective-version)) - ,@%default-gnu-modules) - #:imported-modules ((guix build guile-build-system) - ,@%default-gnu-imported-modules) - #:make-flags - ;; TODO: The documentation must be built with the `docs' target. - (let* ((out (assoc-ref %outputs "out")) - ;; We pass guile explicitly here since this executes before the - ;; set-paths phase and therefore guile is not yet in PATH. - (effective-version (target-guile-effective-version - (assoc-ref %build-inputs "guile"))) - (scm (string-append out "/share/guile/site/" effective-version)) - (go (string-append out "/lib/guile/" effective-version "/site-ccache"))) - ;; Don't use (%site-dir) for site paths. - (list (string-append "MOD_PATH=" scm) - (string-append "MOD_COMPILED_PATH=" go))) - #:test-target "test" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-site-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "artanis/commands/help.scm" - (("\\(%site-dir\\)") - (string-append "\"" - (assoc-ref outputs "out") - "/share/guile/site/" - (target-guile-effective-version) - "\""))))) - (add-after 'unpack 'patch-reference-to-libnss - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "artanis/security/nss.scm" - (("ffi-binding \"libnss3\"") - (string-append - "ffi-binding \"" - (assoc-ref inputs "nss") "/lib/nss/libnss3.so" - "\"")) - (("ffi-binding \"libssl3\"") - (string-append - "ffi-binding \"" (assoc-ref inputs "nss") "/lib/nss/libssl3.so\""))))) - (add-before 'install 'substitute-root-dir - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" ;ignore the execution of bash.bashrc - ((" /etc/bash.bashrc") " /dev/null")) - (substitute* "Makefile" ;set the root of config files to OUT - ((" /etc") (string-append " " out "/etc"))) - (mkdir-p (string-append out "/bin")) ))) - (add-after 'install 'wrap-art - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (effective-version (target-guile-effective-version)) - (bin (string-append out "/bin")) - (scm (string-append out "/share/guile/site/" effective-version)) - (go (string-append out "/lib/guile/" effective-version - "/site-ccache"))) - (wrap-program (string-append bin "/art") - `("GUILE_LOAD_PATH" ":" prefix - (,scm ,(getenv "GUILE_LOAD_PATH"))) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))))))) - (synopsis "Web application framework written in Guile") - (description "GNU Artanis is a web application framework written in Guile + (name "artanis") + (version "1.0.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/artanis/artanis-" + version ".tar.gz")) + (sha256 + (base32 + "05sigqvm04x0r1gwpwrxjffb3i13bss3ff24frr477zqm54wv5d8")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* '("artanis/artanis.scm" + "artanis/lpc.scm" + "artanis/oht.scm" + "artanis/tpl/parser.scm") + (("(#:use-module \\()artanis third-party (json\\))" _ + use-module json) + (string-append use-module json))) + (substitute* '("artanis/lpc.scm" + "artanis/session.scm") + (("(#:use-module \\()artanis third-party (redis\\))" _ + use-module redis) + (string-append use-module redis))) + (substitute* "artanis/oht.scm" + (("([[:punct:][:space:]]+)(->json-string)([[:punct:][:space:]]+)" + _ pre json-string post) + (string-append pre + "scm" json-string + post))) + (substitute* "artanis/artanis.scm" + (("[[:punct:][:space:]]+->json-string[[:punct:][:space:]]+") + "")) + #t)))) + (build-system gnu-build-system) + (inputs + (list bash-minimal guile-3.0 nspr nss)) + ;; FIXME the bundled csv contains one more exported procedure + ;; (sxml->csv-string) than guile-csv. The author is maintainer of both + ;; projects. + ;; TODO: Add guile-dbi and guile-dbd optional dependencies. + (propagated-inputs + (list guile-json-4 guile-curl guile-readline guile-redis)) + (native-inputs + (list bash-minimal ;for the `source' builtin + pkg-config + util-linux)) ;for the `script' command + (arguments + `(#:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%default-gnu-modules) + #:imported-modules ((guix build guile-build-system) + ,@%default-gnu-imported-modules) + #:make-flags + ;; TODO: The documentation must be built with the `docs' target. + (let* ((out (assoc-ref %outputs "out")) + ;; We pass guile explicitly here since this executes before the + ;; set-paths phase and therefore guile is not yet in PATH. + (effective-version (target-guile-effective-version + (assoc-ref %build-inputs "guile"))) + (scm (string-append out "/share/guile/site/" effective-version)) + (go (string-append out "/lib/guile/" effective-version "/site-ccache"))) + ;; Don't use (%site-dir) for site paths. + (list (string-append "MOD_PATH=" scm) + (string-append "MOD_COMPILED_PATH=" go))) + #:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-site-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "artanis/commands/help.scm" + (("\\(%site-dir\\)") + (string-append "\"" + (assoc-ref outputs "out") + "/share/guile/site/" + (target-guile-effective-version) + "\""))))) + (add-after 'unpack 'patch-reference-to-libnss + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "artanis/security/nss.scm" + (("ffi-binding \"libnss3\"") + (string-append + "ffi-binding \"" + (assoc-ref inputs "nss") "/lib/nss/libnss3.so" + "\"")) + (("ffi-binding \"libssl3\"") + (string-append + "ffi-binding \"" (assoc-ref inputs "nss") "/lib/nss/libssl3.so\""))))) + (add-before 'install 'substitute-root-dir + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" ;ignore the execution of bash.bashrc + ((" /etc/bash.bashrc") " /dev/null")) + (substitute* "Makefile" ;set the root of config files to OUT + ((" /etc") (string-append " " out "/etc"))) + (mkdir-p (string-append out "/bin")) ))) + (add-after 'install 'wrap-art + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (effective-version (target-guile-effective-version)) + (bin (string-append out "/bin")) + (scm (string-append out "/share/guile/site/" effective-version)) + (go (string-append out "/lib/guile/" effective-version + "/site-ccache"))) + (wrap-program (string-append bin "/art") + `("GUILE_LOAD_PATH" ":" prefix + (,scm ,(getenv "GUILE_LOAD_PATH"))) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix + (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))))))) + (synopsis "Web application framework written in Guile") + (description "GNU Artanis is a web application framework written in Guile Scheme. A web application framework (WAF) is a software framework that is designed to support the development of dynamic websites, web applications, web services and web resources. The framework aims to alleviate the overhead @@ -271,8 +267,8 @@ (define-public artanis provides several tools for web development: database access, templating frameworks, session management, URL-remapping for RESTful, page caching, and more.") - (home-page "https://www.gnu.org/software/artanis/") - (license (list license:gpl3+ license:lgpl3+)))) ;dual license + (home-page "https://www.gnu.org/software/artanis/") + (license (list license:gpl3+ license:lgpl3+)))) ;dual license (define-public guilescript (package -- 2.46.0