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: 14533 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))