From patchwork Mon Jul 3 22:28:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51530 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 D6C0227BBE9; Mon, 3 Jul 2023 23:29:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 090B827BBE2 for ; Mon, 3 Jul 2023 23:29:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGS2a-0007n5-Bs; Mon, 03 Jul 2023 18:29:04 -0400 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 1qGS2Y-0007lO-MS for guix-patches@gnu.org; Mon, 03 Jul 2023 18:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qGS2Y-0001lj-E8 for guix-patches@gnu.org; Mon, 03 Jul 2023 18:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGS2Y-0007su-9w for guix-patches@gnu.org; Mon, 03 Jul 2023 18:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64449] [PATCH 1/4] gnu: lua-ossl: Update to 20220711. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2023 22:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64449 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64449@debbugs.gnu.org Cc: Bruno Victal X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168842334030296 (code B ref -1); Mon, 03 Jul 2023 22:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jul 2023 22:29:00 +0000 Received: from localhost ([127.0.0.1]:34611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGS2W-0007sY-2i for submit@debbugs.gnu.org; Mon, 03 Jul 2023 18:29:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:42898) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGS2T-0007sQ-Aa for submit@debbugs.gnu.org; Mon, 03 Jul 2023 18:28:59 -0400 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 1qGS2T-0007l0-1b for guix-patches@gnu.org; Mon, 03 Jul 2023 18:28:57 -0400 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGS2R-0001k5-EW for guix-patches@gnu.org; Mon, 03 Jul 2023 18:28:56 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id 2B08F209A6 for ; Tue, 4 Jul 2023 00:28:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 884E180099; Tue, 4 Jul 2023 00:28:48 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 3cQH0bHX7CjP; Tue, 4 Jul 2023 00:28:48 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id D232280098; Tue, 4 Jul 2023 00:28:47 +0200 (CEST) From: Bruno Victal Date: Mon, 3 Jul 2023 23:28:40 +0100 Message-Id: <929a9821646da834563938ccd5aa52cf68efede0.1688423261.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=185.26.107.240; envelope-from=mirai@makinata.eu; helo=smtpmciv4.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 The homepage seems frozen in time whilst the issue tracker at has been receiving new releases. * gnu/packages/lua.scm (make-lua-ossl): Update to 20220711. Switch upstream URL. --- gnu/packages/lua.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) base-commit: cf7e0267adfc3cb83e477c2aebb61060c3c0cfd6 diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 63a4bd5455..67df8dc31e 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -370,14 +370,16 @@ (define-public lua5.2-filesystem (define (make-lua-ossl name lua) (package (name name) - (version "20170903") + (version "20220711") (source (origin - (method url-fetch) - (uri (string-append "https://25thandclement.com/~william/" - "projects/releases/luaossl-" version ".tgz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/wahern/luaossl") + (commit (string-append "rel-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "10392bvd0lzyibipblgiss09zlqh3a5zgqg1b9lgbybpqb9cv2k3")))) + "1a9pgmc6fbhgh1m9ksz9fq057yzz46npqgakcsy9vngg47xacfdb")))) (build-system gnu-build-system) (arguments `(#:make-flags From patchwork Mon Jul 3 22:28:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51532 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 9290027BBEA; Mon, 3 Jul 2023 23:30:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7911B27BBE2 for ; Mon, 3 Jul 2023 23:30:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGS3b-0007uH-1b; Mon, 03 Jul 2023 18:30:07 -0400 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 1qGS3X-0007tx-Ik for guix-patches@gnu.org; Mon, 03 Jul 2023 18:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qGS3X-00020O-4i for guix-patches@gnu.org; Mon, 03 Jul 2023 18:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGS3W-0007v8-P0 for guix-patches@gnu.org; Mon, 03 Jul 2023 18:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64449] [PATCH 2/4] gnu: lua-ossl: Use G-expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2023 22:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64449 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64449@debbugs.gnu.org Cc: Bruno Victal X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168842334430336 (code B ref -1); Mon, 03 Jul 2023 22:30:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jul 2023 22:29:04 +0000 Received: from localhost ([127.0.0.1]:34615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGS2Z-0007tC-F4 for submit@debbugs.gnu.org; Mon, 03 Jul 2023 18:29:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:42912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGS2W-0007sb-Ef for submit@debbugs.gnu.org; Mon, 03 Jul 2023 18:29:01 -0400 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 1qGS2W-0007lB-8I for guix-patches@gnu.org; Mon, 03 Jul 2023 18:29:00 -0400 Received: from smtpm4.myservices.hosting ([185.26.105.235]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGS2U-0001ka-7H for guix-patches@gnu.org; Mon, 03 Jul 2023 18:28:59 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id F286720CB2 for ; Tue, 4 Jul 2023 00:28:56 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 3BB7D8009A; Tue, 4 Jul 2023 00:28:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id MdfAbfBVN83R; Tue, 4 Jul 2023 00:28:52 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 5834180098; Tue, 4 Jul 2023 00:28:52 +0200 (CEST) From: Bruno Victal Date: Mon, 3 Jul 2023 23:28:41 +0100 Message-Id: <5b2cf0e69a8a546b3d4dfc65a043a04c81d1a190.1688423261.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=185.26.105.235; envelope-from=mirai@makinata.eu; helo=smtpm4.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 Dropped obsolete flag due to . * gnu/packages/lua.scm (make-lua-ossl): Use G-Expressions. [arguments]: Drop obsolete flag. --- gnu/packages/lua.scm | 99 ++++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 44 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 67df8dc31e..2214790751 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2022 Luis Henrique Gomes Higino ;;; Copyright © 2022 Leo Nikkilä ;;; Copyright © 2023 Yovan Naumovski +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -368,54 +369,64 @@ (define-public lua5.2-filesystem (make-lua-filesystem "lua5.2-filesystem" lua-5.2)) (define (make-lua-ossl name lua) - (package - (name name) - (version "20220711") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/wahern/luaossl") - (commit (string-append "rel-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1a9pgmc6fbhgh1m9ksz9fq057yzz46npqgakcsy9vngg47xacfdb")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags - (let ((out (assoc-ref %outputs "out")) - (lua-api-version ,(version-major+minor (package-version lua)))) - (list ,(string-append "CC=" (cc-for-target)) - "CFLAGS='-D HAVE_SYS_SYSCTL_H=0'" ; sys/sysctl.h is deprecated - (string-append "prefix=" out) - (string-append "LUA_APIS=" lua-api-version))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (lua-version ,(version-major+minor (package-version lua)))) - (setenv "LUA_CPATH" - (string-append out "/lib/lua/" lua-version "/?.so;;")) - (setenv "LUA_PATH" - (string-append out "/share/lua/" lua-version "/?.lua;;")) - (with-directory-excursion "regress" - (for-each (lambda (f) - (invoke "lua" f)) - (find-files "." "^[0-9].*\\.lua$")))) - #t))))) - (inputs - (list lua openssl)) - (home-page "https://25thandclement.com/~william/projects/luaossl.html") - (synopsis "OpenSSL bindings for Lua") - (description "The luaossl extension module for Lua provides comprehensive, + (let ((lua-api-version (version-major+minor (package-version lua)))) + (package + (name name) + (version "20220711") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wahern/luaossl") + (commit (string-append "rel-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1a9pgmc6fbhgh1m9ksz9fq057yzz46npqgakcsy9vngg47xacfdb")))) + (build-system gnu-build-system) + (arguments + (list + #:make-flags + #~(list #$(string-append "CC=" (cc-for-target)) + #$(string-append "LUA_APIS=" lua-api-version) + (string-append "prefix=" #$output)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-luajit-test + (lambda _ + ;; This test is only meaningful for luajit. + ;; + (unless (string-prefix? "luajit" #$(package-name lua)) + (delete-file "regress/104-interposition-discarded.lua")))) + (add-after 'unpack 'remove-cqueues-test + (lambda _ + ;; XXX: This test depends on cqueues and cqueues has a test + ;; that depends on lua-ossl. + (delete-file "regress/148-custom-extensions.lua"))) + (delete 'configure) + (delete 'check) ; place 'check after 'install + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "LUA_CPATH" + (string-append #$output "/lib/lua/" + #$lua-api-version "/?.so;;")) + (setenv "LUA_PATH" + (string-append #$output "/share/lua/" + #$lua-api-version "/?.lua;;")) + (with-directory-excursion "regress" + (for-each (lambda (f) + (invoke "lua" f)) + (find-files "." "^[0-9].*\\.lua$"))))))))) + (inputs + (list lua openssl)) + (home-page "https://25thandclement.com/~william/projects/luaossl.html") + (synopsis "OpenSSL bindings for Lua") + (description "The luaossl extension module for Lua provides comprehensive, low-level bindings to the OpenSSL library, including support for certificate and key management, key generation, signature verification, and deep bindings to the distinguished name, alternative name, and X.509v3 extension interfaces. It also binds OpenSSL's bignum, message digest, HMAC, cipher, and CSPRNG interfaces.") - (license license:expat))) + (license license:expat)))) (define-public lua-ossl (make-lua-ossl "lua-ossl" lua)) From patchwork Mon Jul 3 22:28:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51533 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 F18BA27BBEA; Mon, 3 Jul 2023 23:38:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 3CAC727BBE2 for ; Mon, 3 Jul 2023 23:38:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGSBI-0000pF-5o; Mon, 03 Jul 2023 18:38:04 -0400 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 1qGSBG-0000nl-OA for guix-patches@gnu.org; Mon, 03 Jul 2023 18:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qGSBG-0004UH-Fs for guix-patches@gnu.org; Mon, 03 Jul 2023 18:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGSBG-00088A-Bu for guix-patches@gnu.org; Mon, 03 Jul 2023 18:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64449] [PATCH 3/4] gnu: lua-cqueues: Update to 20200726. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2023 22:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64449 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64449@debbugs.gnu.org Cc: Bruno Victal X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168842382931171 (code B ref -1); Mon, 03 Jul 2023 22:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jul 2023 22:37:09 +0000 Received: from localhost ([127.0.0.1]:34624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGSAP-00086g-9z for submit@debbugs.gnu.org; Mon, 03 Jul 2023 18:37:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:47712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGSAM-00086W-Ju for submit@debbugs.gnu.org; Mon, 03 Jul 2023 18:37:07 -0400 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 1qGSAM-0000Tb-DV for guix-patches@gnu.org; Mon, 03 Jul 2023 18:37:06 -0400 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGSAK-0004Ih-Kj for guix-patches@gnu.org; Mon, 03 Jul 2023 18:37:06 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id F056B20DF0 for ; Tue, 4 Jul 2023 00:37:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id DA7BB80099; Tue, 4 Jul 2023 00:28:56 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 6Hqi1B4iA-sx; Tue, 4 Jul 2023 00:28:56 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 4E07980098; Tue, 4 Jul 2023 00:28:56 +0200 (CEST) From: Bruno Victal Date: Mon, 3 Jul 2023 23:28:42 +0100 Message-Id: <034fd7be85869c9ce24c01a318e2f4873199bb21.1688423261.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=185.26.107.238; envelope-from=mirai@makinata.eu; helo=smtpmciv2.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 The releases list in the homepage is outdated. * gnu/packages/lua.scm (make-lua-cqueues): Update to 20200726. Switch upstream URL. --- gnu/packages/lua.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 2214790751..c061959c2f 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -487,14 +487,16 @@ (define-public lua5.2-sec (define (make-lua-cqueues name lua lua-ossl) (package (name name) - (version "20171014") + (version "20200726") (source (origin - (method url-fetch) - (uri (string-append "https://25thandclement.com/~william/" - "projects/releases/cqueues-" version ".tgz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/wahern/cqueues") + (commit (string-append "rel-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1dabhpn6r0hlln8vx9hxm34pfcm46qzgpb2apmziwg5z51fi4ksb")))) + "17gwqndlga6gnishgs6wk8cvgwzanddr42yikkg2xd4nanhcg8z9")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -559,7 +561,9 @@ (define (make-lua-cqueues name lua lua-ossl) ;; Regression tests that require LuaJIT '("44-resolvers-gc.lua" - "51-join-defunct-thread.lua") + "51-join-defunct-thread.lua" + "73-starttls-buffering.lua" + "87-alpn-disappears.lua") ;; Regression tests that require Lua 5.3 (if (not (equal? lua-version "5.3")) From patchwork Mon Jul 3 22:28:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51531 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 2D6E627BBE9; Mon, 3 Jul 2023 23:30:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 A1C5D27BBE2 for ; Mon, 3 Jul 2023 23:30:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGS3c-0007uU-09; Mon, 03 Jul 2023 18:30:08 -0400 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 1qGS3X-0007u4-W3 for guix-patches@gnu.org; Mon, 03 Jul 2023 18:30:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qGS3X-00022n-L5 for guix-patches@gnu.org; Mon, 03 Jul 2023 18:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGS3X-0007vI-Gd for guix-patches@gnu.org; Mon, 03 Jul 2023 18:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64449] [PATCH 4/4] gnu: lua-cqueues: Refactor package definition. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2023 22:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64449 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64449@debbugs.gnu.org Cc: Bruno Victal X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168842335630365 (code B ref -1); Mon, 03 Jul 2023 22:30:03 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jul 2023 22:29:16 +0000 Received: from localhost ([127.0.0.1]:34618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGS2m-0007th-2z for submit@debbugs.gnu.org; Mon, 03 Jul 2023 18:29:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:54708) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGS2j-0007tY-Qi for submit@debbugs.gnu.org; Mon, 03 Jul 2023 18:29:14 -0400 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 1qGS2j-0007oN-KN for guix-patches@gnu.org; Mon, 03 Jul 2023 18:29:13 -0400 Received: from smtpm3.myservices.hosting ([185.26.105.234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGS2h-0001oN-Gn for guix-patches@gnu.org; Mon, 03 Jul 2023 18:29:13 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id D1DEE20FB2 for ; Tue, 4 Jul 2023 00:29:09 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 22BAE8009B; Tue, 4 Jul 2023 00:29:06 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id BeM48HFRgh5W; Tue, 4 Jul 2023 00:29:05 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 7B0828009A; Tue, 4 Jul 2023 00:29:05 +0200 (CEST) From: Bruno Victal Date: Mon, 3 Jul 2023 23:28:43 +0100 Message-Id: <6481d9abe50694624c0f63d3abf8f4348deac449.1688423261.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=185.26.105.234; envelope-from=mirai@makinata.eu; helo=smtpm3.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 * gnu/packages/lua.scm (make-lua-cqueues): Use G-Expressions. Drop obsolete phases. --- gnu/packages/lua.scm | 149 ++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 93 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index c061959c2f..0fe14a3b5e 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -485,108 +485,71 @@ (define-public lua5.2-sec (make-lua-sec "lua5.2-sec" lua-5.2)) (define (make-lua-cqueues name lua lua-ossl) - (package - (name name) - (version "20200726") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/wahern/cqueues") - (commit (string-append "rel-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "17gwqndlga6gnishgs6wk8cvgwzanddr42yikkg2xd4nanhcg8z9")))) - (build-system gnu-build-system) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (ice-9 string-fun)) - #:make-flags - (let ((out (assoc-ref %outputs "out")) - (lua-api-version ,(version-major+minor (package-version lua)))) - (list ,(string-append "CC=" (cc-for-target)) - (string-append "LUA_APIS=" lua-api-version))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check) - (replace 'install - (lambda* (#:key make-flags outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (apply invoke "make" "install" - (append make-flags - (list (string-append "DESTDIR=" out) - "prefix=")))))) - (add-after 'install 'check - (lambda* (#:key inputs outputs make-flags #:allow-other-keys) - (let* - ((lua-version ,(version-major+minor (package-version lua))) - (env-suffix (if (equal? lua-version "5.1") - "" - (string-append - "_" - (string-replace-substring lua-version "." "_")))) - - (lua-ossl (assoc-ref inputs "lua-ossl")) - (out (assoc-ref outputs "out")) - - (lua-cpath (lambda (p) - (string-append p "/lib/lua/" lua-version "/?.so"))) - (lua-path (lambda (p) - (string-append p "/share/lua/" lua-version "/?.lua")))) - ;; The test suite sets Lua-version-specific search-path variables - ;; when available so we must do the same, as these take - ;; precedence over the generic "LUA_CPATH" and "LUA_PATH" - (setenv (string-append "LUA_CPATH" env-suffix) - (string-append - (string-join (map lua-cpath (list out lua-ossl)) ";") - ";;")) - (setenv (string-append "LUA_PATH" env-suffix) - (string-append - (string-join (map lua-path (list out lua-ossl)) ";") - ";;")) - - ;; Skip regression tests we expect to fail - (with-directory-excursion "regress" - (for-each (lambda (f) - (rename-file f (string-append f ".skip"))) - (append - ;; Regression tests that require network - ;; connectivity + (let ((lua-api-version (version-major+minor (package-version lua)))) + (package + (name name) + (version "20200726") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wahern/cqueues") + (commit (string-append "rel-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17gwqndlga6gnishgs6wk8cvgwzanddr42yikkg2xd4nanhcg8z9")))) + (build-system gnu-build-system) + (arguments + (list + #:make-flags + #~(list #$(string-append "CC=" (cc-for-target)) + #$(string-append "LUA_APIS=" lua-api-version) + (string-append "prefix=" #$output)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-luajit-tests + (lambda _ + ;; Regression tests that require LuaJIT. + (unless (string-prefix? "luajit" #$(package-name lua)) + (with-directory-excursion "regress" + (for-each delete-file + '("44-resolvers-gc.lua" + "51-join-defunct-thread.lua" + "73-starttls-buffering.lua" + "87-alpn-disappears.lua")))))) + (add-after 'unpack 'remove-networking-tests + (lambda _ + ;; Regression tests that require network connectivity. + (with-directory-excursion "regress" + (for-each delete-file '("22-client-dtls.lua" "30-starttls-completion.lua" "62-noname.lua" - "153-dns-resolvers.lua") - - ;; Regression tests that require LuaJIT - '("44-resolvers-gc.lua" - "51-join-defunct-thread.lua" - "73-starttls-buffering.lua" - "87-alpn-disappears.lua") - - ;; Regression tests that require Lua 5.3 - (if (not (equal? lua-version "5.3")) - '("152-thread-integer-passing.lua") - '())))) - - (apply invoke "make" "check" make-flags))))))) - (native-inputs - (list m4)) - (inputs - (list lua openssl)) - (propagated-inputs - (list lua-ossl)) - (home-page "https://25thandclement.com/~william/projects/cqueues.html") - (synopsis "Event loop for Lua using continuation queues") - (description "The cqueues extension module for Lua implements an event loop + "153-dns-resolvers.lua"))))) + (add-after 'unpack 'remove-lua5.3-test + (lambda _ + ;; Regression tests that require Lua 5.3 or higher. + (unless #$(version>=? lua-api-version "5.3") + (delete-file "regress/152-thread-integer-passing.lua")))) + (delete 'configure)))) + (native-inputs + (list m4)) + (inputs + (list lua openssl)) + (propagated-inputs + (list lua-ossl)) + (home-page "https://25thandclement.com/~william/projects/cqueues.html") + (synopsis "Event loop for Lua using continuation queues") + (description "The cqueues extension module for Lua implements an event loop that operates through the yielding and resumption of coroutines. It is designed to be non-intrusive, composable, and embeddable within existing applications.") - (license license:expat))) + (license license:expat)))) (define-public lua-cqueues (make-lua-cqueues "lua-cqueues" lua lua-ossl)) +;; Note: cqueues principally targets Lua 5.2 and above. +;; (define-public lua5.1-cqueues (make-lua-cqueues "lua5.1-cqueues" lua-5.1 lua5.1-ossl))