From patchwork Tue Dec 27 16:23:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 45620 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 9099827BBE9; Wed, 28 Dec 2022 02:40:33 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 6232127BBED for ; Wed, 28 Dec 2022 02:40:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAMMO-0003d2-Ca; Tue, 27 Dec 2022 21:40:04 -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 1pAMMM-0003cf-AU for guix-patches@gnu.org; Tue, 27 Dec 2022 21:40:03 -0500 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 1pAMMM-0000br-1D for guix-patches@gnu.org; Tue, 27 Dec 2022 21:40:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAMML-0007kZ-IS for guix-patches@gnu.org; Tue, 27 Dec 2022 21:40:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH v2 1/2] gnu: Add gnulib. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Dec 2022 02:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60358@debbugs.gnu.org Received: via spool by 60358-submit@debbugs.gnu.org id=B60358.167219515729715 (code B ref 60358); Wed, 28 Dec 2022 02:40:01 +0000 Received: (at 60358) by debbugs.gnu.org; 28 Dec 2022 02:39:17 +0000 Received: from localhost ([127.0.0.1]:56879 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAMLd-0007jA-9g for submit@debbugs.gnu.org; Tue, 27 Dec 2022 21:39:17 -0500 Received: from planete-kraus.eu ([89.234.140.182]:55286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAMLb-0007j1-KF for 60358@debbugs.gnu.org; Tue, 27 Dec 2022 21:39:16 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 6d7a8255 for <60358@debbugs.gnu.org>; Wed, 28 Dec 2022 02:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= in-reply-to:references:from:date:subject:to:message-id :mime-version; s=dkim; bh=D7CY9e85DfujMFXQ3kxsSGyD4yY=; b=WhVVk3 20M4X09/8LlqVwZbyWKyE9jqTuPpWIEuIn1rZ2rWwlAZ+10NU8UTOmkUekFaFM1E 0IQCijkPjR9GC+MmwhHAGKDJGoI7kAdvCC/+cd47cyfoenpbRMSXjo2349qES2Lt hulbWGN0A5EddCcd8W/NSvpfTSIaQtsEU2phY= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ed81f6d8 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Wed, 28 Dec 2022 02:39:11 +0000 (UTC) In-Reply-To: <5c64afba3acb7820763eb5a4bf2567fc4b12ad77.camel@gmail.com> References: <5c64afba3acb7820763eb5a4bf2567fc4b12ad77.camel@gmail.com> Date: Tue, 27 Dec 2022 17:23:30 +0100 Message-ID: <39b658dda4fef7c90037de4ab69896cb5c37ae6d.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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/build-tools.scm (gnulib): New variable. (gnulib-checkout): New function. It returns a package with a specific commit of gnulib. --- gnu/packages/build-tools.scm | 58 ++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) base-commit: 0cb8f7125b19264b01962c1249c3df4c5ce85aa9 diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..5b4fc71429 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -38,6 +38,7 @@ (define-module (gnu packages build-tools) #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix git) #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages adns) @@ -48,11 +49,13 @@ (define-module (gnu packages build-tools) #:use-module (gnu packages cpp) #:use-module (gnu packages elf) #:use-module (gnu packages linux) + #:use-module (gnu packages lisp) #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages ninja) #:use-module (gnu packages package-management) #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) @@ -803,3 +806,58 @@ (define-public genie same settings to multiple projects. It supports generating projects using GNU Makefiles, JSON Compilation Database, and experimentally Ninja.") (license license:bsd-3)))) + +(define-public (gnulib-checkout gl-version gl-commit gl-hash) + "Return as a package the exact gnulib checkout." + (package + (name "gnulib") + (version (git-version gl-version "1" gl-commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/gnulib.git") + (commit gl-commit))) + (file-name (git-file-name name version)) + (sha256 (base32 gl-hash)))) + (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda _ + (install-file "gnulib-tool" + (string-append #$output "/bin")) + (copy-recursively "." + (string-append + #$output + "/share/gnulib/" + #$gl-commit))))) + #:tests? #f)) ;; Tests are syntax and indentation checks for the + ;; maintainer. + (inputs ;; Shebangs for some auxiliary build files. + (list python perl clisp)) + (home-page "https://www.gnu.org/software/gnulib/") + (synopsis "Source files to share among distributions") + (description + "Gnulib is a central location for common infrastructure needed by GNU +packages. It provides a wide variety of functionality, e.g., portability +across many systems, working with Unicode strings, cryptographic computation, +and much more. The code is intended to be shared at the level of source +files, rather than being a standalone library that is distributed, built, and +installed. The included @command{gnulib-tool} script helps with using Gnulib +code in other packages. Gnulib also includes copies of licensing and +maintenance-related files, for convenience.") + (native-search-paths + (list (search-path-specification + (variable "GNULIB_SRCDIR") + (files (list (string-append "share/gnulib/" gl-commit)))))) + (license (list license:lgpl2.0+ license:gpl3+)))) + +(define-public gnulib + (gnulib-checkout + "2022-12-27" + "fde75446490e18d2539817ca418ab8adf73b02d3" + "0fjbdhwi9025wyq39rwc2j6aazfmagx056kkbvxx6bs97i80dcim")) From patchwork Wed Dec 28 02:20:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 45619 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 E4B5427BBEB; Wed, 28 Dec 2022 02:40:32 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 7C46427BBE9 for ; Wed, 28 Dec 2022 02:40:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAMMO-0003dK-Rm; Tue, 27 Dec 2022 21:40:04 -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 1pAMMM-0003cg-BB for guix-patches@gnu.org; Tue, 27 Dec 2022 21:40:03 -0500 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 1pAMMM-0000dR-3L for guix-patches@gnu.org; Tue, 27 Dec 2022 21:40:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAMML-0007kg-UZ for guix-patches@gnu.org; Tue, 27 Dec 2022 21:40:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH v2 2/2] gnu: guile-gnutls: Update to 3.7.11. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Dec 2022 02:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60358@debbugs.gnu.org Received: via spool by 60358-submit@debbugs.gnu.org id=B60358.167219516329735 (code B ref 60358); Wed, 28 Dec 2022 02:40:01 +0000 Received: (at 60358) by debbugs.gnu.org; 28 Dec 2022 02:39:23 +0000 Received: from localhost ([127.0.0.1]:56881 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAMLh-0007jU-SX for submit@debbugs.gnu.org; Tue, 27 Dec 2022 21:39:23 -0500 Received: from planete-kraus.eu ([89.234.140.182]:55286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAMLc-0007j1-Nt for 60358@debbugs.gnu.org; Tue, 27 Dec 2022 21:39:18 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 7552b303 for <60358@debbugs.gnu.org>; Wed, 28 Dec 2022 02:39:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= in-reply-to:references:from:date:subject:to:message-id :mime-version; s=dkim; bh=RgOH7HdLEEpTHbwdyu0GeIKVmhM=; b=hGIrup nolR73uEzCpptx91PnRCtZ9EBOH8VchT6U+jyp1kQcY6EAjz0WzzDQVjnXQiRrxl p8crGQdQOmlxicLfGM32/77/rt8kjN3gzgBIzEmLzhp+Vl+Yp8xmamdWImD6d4Z+ wtttTkHx12VZG6TzpwTf2i4DqstdMm04kH4U4= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ac109ca8 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Wed, 28 Dec 2022 02:39:13 +0000 (UTC) In-Reply-To: <5c64afba3acb7820763eb5a4bf2567fc4b12ad77.camel@gmail.com> References: <5c64afba3acb7820763eb5a4bf2567fc4b12ad77.camel@gmail.com> Date: Wed, 28 Dec 2022 03:20:54 +0100 Message-ID: <865c55e780549ba03e66c7012965253a45da05fe.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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/tls.scm (guile-gnutls) [phases]: Patch-shebang autopull.sh and autogen.sh. * gnu/packages/tls.scm (guile-gnutls) [native-inupts]: Add gnulib and git. --- gnu/packages/tls.scm | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..d0f8ca8a15 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -56,6 +56,7 @@ (define-module (gnu packages tls) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) + #:use-module (gnu packages build-tools) #:use-module (gnu packages check) #:use-module (gnu packages curl) #:use-module (gnu packages dns) @@ -80,6 +81,7 @@ (define-module (gnu packages tls) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) + #:use-module (gnu packages version-control) #:use-module (gnu packages base) #:use-module (srfi srfi-1)) @@ -381,7 +383,7 @@ (define-public guile-gnutls ;; This package supersedes the Guile bindings that came with GnuTLS until ;; version 3.7.8 included. (name "guile-gnutls") - (version "3.7.9") + (version "3.7.11") (home-page "https://gitlab.com/gnutls/guile/") (source (origin (method git-fetch) @@ -390,21 +392,28 @@ (define-public guile-gnutls (commit (string-append "v" version)))) (sha256 (base32 - "00sfpqjmd263ka51fq4xf7nvaaxyfqsr3r8fj94jgx45q6q6n6wq")) + "06d7v3i0d9ayp7zqk1rsy4z0wfpq69n0r54f1xrppb9gn7q9iva6")) (file-name (git-file-name name version)) (patches (search-patches "gnutls-cross.patch")))) (build-system gnu-build-system) (arguments - '(#:configure-flags - ;; Tell the build system that we want Guile bindings installed to - ;; the output instead of Guiles own module directory. - (list "--disable-static" - (string-append "--with-guile-site-dir=" - "$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)") - (string-append "--with-guile-site-ccache-dir=" - "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache") - (string-append "--with-guile-extension-dir=" - "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions")))) + (list + #:configure-flags + ;; Tell the build system that we want Guile bindings installed to the + ;; output instead of Guiles own module directory. + #~(list "--disable-static" + (string-append "--with-guile-site-dir=" + "$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)") + (string-append "--with-guile-site-ccache-dir=" + "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache") + (string-append "--with-guile-extension-dir=" + "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-more-shebangs + (lambda _ + (for-each patch-shebang + '("autopull.sh" "autogen.sh"))))))) (native-inputs (list autoconf automake @@ -412,7 +421,9 @@ (define-public guile-gnutls pkg-config texinfo gnutls ;XXX: 'guile-snarf' invokes the native 'cpp' - guile-3.0)) + guile-3.0 + gnulib ; gnulib requires git even if nothing is downloaded. + git)) (inputs (list gnutls-latest guile-3.0))