From patchwork Tue Dec 27 16:23:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 45602 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 2A5E727BBE9; Tue, 27 Dec 2022 17:05: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 40ADA27BBEB for ; Tue, 27 Dec 2022 17:05:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pADNx-00049e-Mi; Tue, 27 Dec 2022 12:05:05 -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 1pADNv-00049P-4q for guix-patches@gnu.org; Tue, 27 Dec 2022 12:05: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 1pADNu-0002yC-HF for guix-patches@gnu.org; Tue, 27 Dec 2022 12:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pADNt-0007BS-Py for guix-patches@gnu.org; Tue, 27 Dec 2022 12:05:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH] gnu: Add gnulib. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Dec 2022 17:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60358@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167216069627596 (code B ref -1); Tue, 27 Dec 2022 17:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Dec 2022 17:04:56 +0000 Received: from localhost ([127.0.0.1]:56386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pADNn-0007B1-Iq for submit@debbugs.gnu.org; Tue, 27 Dec 2022 12:04:56 -0500 Received: from lists.gnu.org ([209.51.188.17]:39160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pADNl-0007At-G7 for submit@debbugs.gnu.org; Tue, 27 Dec 2022 12:04:54 -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 1pADNi-00048f-3C for guix-patches@gnu.org; Tue, 27 Dec 2022 12:04:51 -0500 Received: from planete-kraus.eu ([2a00:5881:4008:2810::309]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1pADNf-0002vI-Jk for guix-patches@gnu.org; Tue, 27 Dec 2022 12:04:49 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 21a26af0 for ; Tue, 27 Dec 2022 17:04:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:mime-version:content-type :content-transfer-encoding:to:message-id; s=dkim; bh=8gxFvhhhOk1 Q9NlRbzleNxRIzas=; b=vE9GkCKCLaSrIC2ohjbcuOKBIwKAtbDeionPCZASiwR xXCtpnfEgcjjNXc1HYyjTg+PJ4sfP2W5KzgdLxIxShIcaxCOsH754nPzykXKWd4S 1wr680/8N/SfzWf6UBfB2mlz/n5w+kpZd1+WElC/Wie+ByZK4wNtjUlvh7QhXjE8 = Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id f35e0b05 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Tue, 27 Dec 2022 17:04:35 +0000 (UTC) Date: Tue, 27 Dec 2022 17:23:30 +0100 MIME-Version: 1.0 Message-ID: User-Agent: Evolution 3.46.0 Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu 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, SPF_HELO_PASS=-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: , 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-latest): New variable. This one always tracks the latest upstream commit, so don’t use it as an input. (gnulib): New variable. This is a "recent" snapshot. --- gnu/packages/build-tools.scm | 71 ++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) base-commit: 8f93a1e01a879ae026678dd92c18e2a2a49be540 diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..062956f685 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,71 @@ (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)))) + +;; Gnulib is a source code library. The developers encourage you to develop +;; your programs with the latest commit of gnulib. However, gnulib is also +;; used to bootstrap some GNU programs. To avoid rebuilding the world when a +;; new gnulib commit is pushed, gnulib as a native input must use a known +;; snapshot of the library. + +(define-public gnulib-latest + ;; Use this to develop. + (package + (name "gnulib-latest") + (version "latest") + (source + (git-checkout + (url "https://git.savannah.gnu.org/git/gnulib.git"))) + (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-srcdir"))))) + #: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 "GNU portability library") + (description + "Gnulib is a library that provides common functions from the glibc to your +programs, in order to enhance portability across operating systems. It also +provides common maintainer tools for gnu packages. This package always tracks +the latest commit in gnulib. @strong{For packages dependencies, please use the +@code{gnulib} package instead.} The latter provides a recent enough snapshot.") + (native-search-paths + (list + (search-path-specification + (variable "GNULIB_SRCDIR") + (files (list "share/gnulib-srcdir"))))) + (license + (list license:lgpl2.0+ license:gpl3+)))) + +(define-public gnulib + ;; Use this as a native input. + (package + (inherit gnulib-latest) + (name "gnulib") + (version "2022-12-27") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/gnulib.git") + (commit "fde75446490e18d2539817ca418ab8adf73b02d3"))) + (sha256 + (base32 + "0fjbdhwi9025wyq39rwc2j6aazfmagx056kkbvxx6bs97i80dcim")))) + (synopsis "GNU portability library") + (description + "Gnulib is a library that provides common functions from the glibc to your +programs, in order to enhance portability across operating systems. It also +provides common maintainer tools for gnu packages. This package provides a +recent snapshot of gnulib."))) From patchwork Fri Dec 30 11:30: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: 45700 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 DACFD27BBEB; Fri, 30 Dec 2022 11:45:59 +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 78F7427BBE9 for ; Fri, 30 Dec 2022 11:45:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pBDpG-000719-TR; Fri, 30 Dec 2022 06:45:27 -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 1pBDot-0006t1-QN for guix-patches@gnu.org; Fri, 30 Dec 2022 06:45:08 -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 1pBDot-00069M-6g for guix-patches@gnu.org; Fri, 30 Dec 2022 06:45:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pBDos-0005Jv-Ol for guix-patches@gnu.org; Fri, 30 Dec 2022 06:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH v4 2/3] gnu: gnulib: Enable tests. References: In-Reply-To: Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Dec 2022 11:45:02 +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 Cc: Liliana Marie Prikler Received: via spool by 60358-submit@debbugs.gnu.org id=B60358.167240067320379 (code B ref 60358); Fri, 30 Dec 2022 11:45:02 +0000 Received: (at 60358) by debbugs.gnu.org; 30 Dec 2022 11:44:33 +0000 Received: from localhost ([127.0.0.1]:33648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBDoO-0005Ic-QC for submit@debbugs.gnu.org; Fri, 30 Dec 2022 06:44:33 -0500 Received: from planete-kraus.eu ([89.234.140.182]:39758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBDoI-0005Hz-3Y for 60358@debbugs.gnu.org; Fri, 30 Dec 2022 06:44:27 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 0047fb39; Fri, 30 Dec 2022 11:44:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:to:cc:message-id:mime-version; s=dkim; bh=xYq/XG5k zEXMhfgsT4iVf3k7aww=; b=W1vF/gnMIUqPWon9r8hFpPSejFKchoFg25GBrgD5 GF/JeeSR6awyi1lFeHQ9YdfvwrvjBdxRbmny2ONXFtn7uyDzo6T7YRRHUduyaMyA d/dIcAALFNfsTYIfR2tEx7u1dkcEfDn9prFXQPOkfOOk+DYGIZLsCcBKny4Qyc0g B2o= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 8dee6878 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 30 Dec 2022 11:44:20 +0000 (UTC) Date: Fri, 30 Dec 2022 12:30:54 +0100 Message-ID: <5447da6c7608ffc02eec8ecfd83f9e7d78a29926.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-checkout) [fix-tests]: New phase. Create a git repository so that every file is committed. * gnu/packages/build-tools.scm (gnulib-checkout): [disable-failing-tests]: New phase. * gnu/packages/build-tools.scm (gnulib-checkout): [install]: Delete the fake git repository. * gnu/packages/build-tools.scm (gnulib-checkout): [native-inputs]: Add more tools for the tests. --- gnu/packages/build-tools.scm | 54 +++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index bde4ee0973..5fa2b7234c 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -43,11 +43,14 @@ (define-module (gnu packages build-tools) #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages adns) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages check) + #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) + #:use-module (gnu packages cppi) #:use-module (gnu packages elf) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) @@ -830,16 +833,59 @@ (define*-public (gnulib-checkout #:key (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "Makefile" + (("-f maint.mk syntax-check") + "_gl-Makefile=yes -f maint.mk syntax-check")) + (invoke "git" "init") + (invoke "git" "config" "user.name" "Guix") + (invoke "git" "config" "user.email" "guix@localhost") + (invoke "git" "add" ".") + (invoke "git" "commit" "-m" + "Syntax checks are only run against committed files, so commit everything."))) + (add-after 'fix-tests 'disable-failing-tests + (lambda _ + (substitute* "cfg.mk" + (("local-checks-to-skip =") + "local-checks-to-skip = \\ + sc_Wundef_boolean \\ + sc_file_system \\ + sc_indent \\ + sc_keep_gnulib_texi_files_mostly_ascii \\ + sc_prohibit_assert_without_use \\ + sc_prohibit_close_stream_without_use \\ + sc_prohibit_defined_have_decl_tests \\ + sc_prohibit_doubled_word \\ + sc_prohibit_empty_lines_at_EOF \\ + sc_prohibit_intprops_without_use \\ + sc_prohibit_openat_without_use \\ + sc_prohibit_test_minus_ao \\ + sc_unportable_grep_q")) + (substitute* "Makefile" + (("sc_check_sym_list") + "disabled_check_sym_list") + (("sc_cpp_indent_check") + "disabled_cpp_indent_check") + (("sc_check_copyright") + "disabled_check_copyright") + (("sc_prohibit_AC_LIBOBJ_in_m4") + "disabled_prohibit_AC_LIBOBJ_in_m4") + (("sc_prefer_ac_check_funcs_once") + "disabled_prefer_ac_check_funcs_once") + (("sc_prohibit_leading_TABs") + "disabled_prohibit_leading_TABs")))) (delete 'configure) (replace 'install (lambda _ (install-file "gnulib-tool" (string-append #$output "/bin")) - (copy-recursively "." (string-append #$output "/src/gnulib/"))))) - #:tests? #f)) ;; Tests are syntax and indentation checks for the - ;; maintainer. And they are failing. + (delete-file-recursively ".git") + (copy-recursively "." (string-append #$output "/src/gnulib/"))))))) (inputs ;; Shebangs for some auxiliary build files. - (list python perl clisp)) + (list python perl clisp + ;; Programs for the tests: + cppi indent git autoconf)) (home-page "https://www.gnu.org/software/gnulib/") (synopsis "Source files to share among distributions") (description 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: 45701 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 557EB27BBE9; Fri, 30 Dec 2022 11:46:03 +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 8387227BBED for ; Fri, 30 Dec 2022 11:45:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pBDpI-00071P-Il; Fri, 30 Dec 2022 06:45:29 -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 1pBDou-0006t0-7j for guix-patches@gnu.org; Fri, 30 Dec 2022 06:45:08 -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 1pBDos-00069J-Ss for guix-patches@gnu.org; Fri, 30 Dec 2022 06:45:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pBDos-0005Jk-Ac for guix-patches@gnu.org; Fri, 30 Dec 2022 06:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH v4 3/3] gnu: guile-gnutls: Update to 3.7.11. References: In-Reply-To: Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Dec 2022 11:45:02 +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 Cc: Liliana Marie Prikler Received: via spool by 60358-submit@debbugs.gnu.org id=B60358.167240066820361 (code B ref 60358); Fri, 30 Dec 2022 11:45:02 +0000 Received: (at 60358) by debbugs.gnu.org; 30 Dec 2022 11:44:28 +0000 Received: from localhost ([127.0.0.1]:33645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBDoJ-0005I9-6X for submit@debbugs.gnu.org; Fri, 30 Dec 2022 06:44:28 -0500 Received: from planete-kraus.eu ([89.234.140.182]:39758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBDoF-0005Hz-L6 for 60358@debbugs.gnu.org; Fri, 30 Dec 2022 06:44:25 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4a51dd32; Fri, 30 Dec 2022 11:44:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:to:cc:message-id:mime-version; s=dkim; bh=zZqN7MKs J2FVFUMZFOWYZrpw8SM=; b=bIX9ibmgeDJmWmiRiw3nv5l6wX9U2Jb059N2fo1t lgh7TkWoR9mYNAGXI74Ij/ybkY/zh+5WLm8UYL0S46uzpI4jRzI6o/PbPLI54bWl aXV3iRaqplWcB1aj/Ci3ofbvxQ4/UlkRs++Y6c7Dmj/mXwiYWLnI9CbqksayneVH DwA= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ab156bb7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 30 Dec 2022 11:44:18 +0000 (UTC) Date: Wed, 28 Dec 2022 03:20:54 +0100 Message-ID: <05e97925f12bd082c00864fe55e51372eebceaa5.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 | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..44a27ef8cb 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,13 @@ (define-public guile-gnutls pkg-config texinfo gnutls ;XXX: 'guile-snarf' invokes the native 'cpp' - guile-3.0)) + guile-3.0 + (gnulib-checkout + #:version "2022-12-06" + #:commit "440b528b1d81dd31b2a2e4dde20d5c837c147811" + #:hash (base32 "15mq43abbnkbamchc9lynrvrd5ql8qacgyx2ph4kkngxf1bz3pqy")) + git ; gnulib requires git even if nothing is downloaded. + )) (inputs (list gnutls-latest guile-3.0)) From patchwork Fri Dec 30 22:05:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 45726 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 2A01027BBED; Fri, 30 Dec 2022 22:39:35 +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 798AA27BBE9 for ; Fri, 30 Dec 2022 22:39:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pBO1q-0003vS-9t; Fri, 30 Dec 2022 17:39:06 -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 1pBO1n-0003vE-BA for guix-patches@gnu.org; Fri, 30 Dec 2022 17:39: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 1pBO1n-0001JG-2p for guix-patches@gnu.org; Fri, 30 Dec 2022 17:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pBO1m-0005OV-Uf for guix-patches@gnu.org; Fri, 30 Dec 2022 17:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH v5 4/5] gnu: gnulib: Regenerate the unicode data. References: In-Reply-To: Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Dec 2022 22:39:02 +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 Cc: Liliana Marie Prikler Received: via spool by 60358-submit@debbugs.gnu.org id=B60358.167243990020652 (code B ref 60358); Fri, 30 Dec 2022 22:39:02 +0000 Received: (at 60358) by debbugs.gnu.org; 30 Dec 2022 22:38:20 +0000 Received: from localhost ([127.0.0.1]:36243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBO15-0005N1-NC for submit@debbugs.gnu.org; Fri, 30 Dec 2022 17:38:20 -0500 Received: from planete-kraus.eu ([89.234.140.182]:35938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBO0z-0005LH-7P for 60358@debbugs.gnu.org; Fri, 30 Dec 2022 17:38:15 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d0ed4870; Fri, 30 Dec 2022 22:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:to:cc:message-id:mime-version; s=dkim; bh=fZJ7BGBo 1WiUOCXtEMOUSf2gEV4=; b=qi2bXg+XeOub4wYAapyD7Y2YNb7uaY9LEQHBL2Jr 0rUr219DPorOMW/+T2ymv2NXZmTwtyDJ25TGeR6KVtz1Ayau8o12F94RPW7nlwTP Ck6xnL6wMKWw0wjC7ihsV31JDy9EqoE02ciAW3/6g3FZkSjhfGHCvs5pM25XXsO6 hdI= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id f2d9d37c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 30 Dec 2022 22:38:11 +0000 (UTC) Date: Fri, 30 Dec 2022 23:05:50 +0100 Message-ID: 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-checkout): [snippet]: Remove generated unicode processors. [regenerate-unicode]: New phase. --- gnu/packages/build-tools.scm | 401 ++++++++++++++++++++++++++++++++++- 1 file changed, 397 insertions(+), 4 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 5fa2b7234c..9592b82130 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -41,6 +41,7 @@ (define-module (gnu packages build-tools) #:use-module (guix git-download) #:use-module (guix git) #:use-module (guix build-system cmake) + #:use-module (guix modules) #:use-module (gnu packages) #:use-module (gnu packages adns) #:use-module (gnu packages autotools) @@ -52,6 +53,7 @@ (define-module (gnu packages build-tools) #:use-module (gnu packages cpp) #:use-module (gnu packages cppi) #:use-module (gnu packages elf) + #:use-module (gnu packages gcc) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages logging) @@ -72,6 +74,7 @@ (define-module (gnu packages build-tools) #:use-module (gnu packages rpc) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) + #:use-module (gnu packages unicode) #:use-module (gnu packages version-control) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -827,7 +830,350 @@ (define*-public (gnulib-checkout #:key (url "https://git.savannah.gnu.org/git/gnulib.git") (commit commit))) (file-name (git-file-name name version)) - (sha256 hash))) + (sha256 hash) + (snippet + (with-imported-modules (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils)) + (for-each delete-file-recursively + `("tests/unicase/test-ignorable.c" + "tests/unicase/test-uc_toupper.c" + "tests/unicase/test-uc_tolower.c" + "tests/unicase/test-cased.c" + "tests/unicase/test-uc_totitle.c" + "tests/unigbrk/test-uc-gbrk-prop.h" + "tests/unictype/test-pr_zero_width.c" + "tests/unictype/test-pr_ascii_hex_digit.c" + "tests/unictype/test-ctype_xdigit.c" + "tests/unictype/test-digit.h" + "tests/unictype/test-pr_grapheme_extend.c" + "tests/unictype/test-ctype_cntrl.c" + "tests/unictype/test-pr_default_ignorable_code_point.c" + "tests/unictype/test-categ_Nd.c" + "tests/unictype/test-decdigit.h" + "tests/unictype/test-pr_currency_symbol.c" + "tests/unictype/test-pr_logical_order_exception.c" + "tests/unictype/test-pr_bidi_common_separator.c" + "tests/unictype/test-pr_space.c" + "tests/unictype/test-pr_ids_trinary_operator.c" + "tests/unictype/test-pr_decimal_digit.c" + "tests/unictype/test-categ_Lo.c" + "tests/unictype/test-categ_Cn.c" + "tests/unictype/test-categ_Mn.c" + "tests/unictype/test-pr_line_separator.c" + "tests/unictype/test-ctype_upper.c" + "tests/unictype/test-pr_extender.c" + "tests/unictype/test-pr_other_default_ignorable_code_point.c" + "tests/unictype/test-pr_uppercase.c" + "tests/unictype/test-categ_Ll.c" + "tests/unictype/test-ctype_alpha.c" + "tests/unictype/test-pr_changes_when_lowercased.c" + "tests/unictype/test-categ_Sm.c" + "tests/unictype/test-pr_variation_selector.c" + "tests/unictype/test-pr_white_space.c" + "tests/unictype/test-pr_ideographic.c" + "tests/unictype/test-joininggroup_of.h" + "tests/unictype/test-ctype_lower.c" + "tests/unictype/test-pr_quotation_mark.c" + "tests/unictype/test-pr_bidi_block_separator.c" + "tests/unictype/test-ctype_blank.c" + "tests/unictype/test-pr_bidi_eur_num_terminator.c" + "tests/unictype/test-pr_bidi_pdf.c" + "tests/unictype/test-pr_deprecated.c" + "tests/unictype/test-pr_grapheme_base.c" + "tests/unictype/test-sy_java_whitespace.c" + "tests/unictype/test-pr_other_alphabetic.c" + "tests/unictype/test-categ_C.c" + "tests/unictype/test-categ_Cc.c" + "tests/unictype/test-pr_id_continue.c" + "tests/unictype/test-pr_changes_when_uppercased.c" + "tests/unictype/test-pr_bidi_control.c" + "tests/unictype/test-pr_changes_when_casemapped.c" + "tests/unictype/test-categ_S.c" + "tests/unictype/test-pr_pattern_white_space.c" + "tests/unictype/test-pr_format_control.c" + "tests/unictype/test-categ_N.c" + "tests/unictype/test-categ_LC.c" + "tests/unictype/test-pr_bidi_arabic_right_to_left.c" + "tests/unictype/test-categ_Nl.c" + "tests/unictype/test-pr_other_uppercase.c" + "tests/unictype/test-pr_other_grapheme_extend.c" + "tests/unictype/test-pr_diacritic.c" + "tests/unictype/test-pr_join_control.c" + "tests/unictype/test-pr_composite.c" + "tests/unictype/test-pr_extended_pictographic.c" + "tests/unictype/test-pr_combining.c" + "tests/unictype/test-categ_Lm.c" + "tests/unictype/test-pr_other_id_continue.c" + "tests/unictype/test-pr_xid_continue.c" + "tests/unictype/test-pr_ids_binary_operator.c" + "tests/unictype/test-pr_bidi_left_to_right.c" + "tests/unictype/test-pr_bidi_non_spacing_mark.c" + "tests/unictype/test-categ_Zl.c" + "tests/unictype/test-pr_sentence_terminal.c" + "tests/unictype/test-categ_Co.c" + "tests/unictype/test-pr_non_break.c" + "tests/unictype/test-pr_math.c" + "tests/unictype/test-ctype_punct.c" + "tests/unictype/test-pr_other_id_start.c" + "tests/unictype/test-ctype_digit.c" + "tests/unictype/test-pr_bidi_eur_num_separator.c" + "tests/unictype/test-pr_id_start.c" + "tests/unictype/test-pr_numeric.c" + "tests/unictype/test-categ_Pe.c" + "tests/unictype/test-pr_lowercase.c" + "tests/unictype/test-pr_hex_digit.c" + "tests/unictype/test-pr_emoji_presentation.c" + "tests/unictype/test-pr_ignorable_control.c" + "tests/unictype/test-categ_Pi.c" + "tests/unictype/test-pr_bidi_boundary_neutral.c" + "tests/unictype/test-pr_changes_when_titlecased.c" + "tests/unictype/test-categ_Cf.c" + "tests/unictype/test-pr_emoji_modifier.c" + "tests/unictype/test-pr_alphabetic.c" + "tests/unictype/test-pr_changes_when_casefolded.c" + "tests/unictype/test-pr_left_of_pair.c" + "tests/unictype/test-pr_radical.c" + "tests/unictype/test-pr_pattern_syntax.c" + "tests/unictype/test-categ_L.c" + "tests/unictype/test-pr_other_lowercase.c" + "tests/unictype/test-categ_Pf.c" + "tests/unictype/test-ctype_print.c" + "tests/unictype/test-pr_bidi_whitespace.c" + "tests/unictype/test-numeric.h" + "tests/unictype/test-pr_paired_punctuation.c" + "tests/unictype/test-pr_emoji_modifier_base.c" + "tests/unictype/test-categ_Ps.c" + "tests/unictype/test-pr_dash.c" + "tests/unictype/test-pr_bidi_european_digit.c" + "tests/unictype/test-categ_P.c" + "tests/unictype/test-pr_grapheme_link.c" + "tests/unictype/test-categ_Lu.c" + "tests/unictype/test-categ_No.c" + "tests/unictype/test-pr_emoji.c" + "tests/unictype/test-categ_M.c" + "tests/unictype/test-pr_regional_indicator.c" + "tests/unictype/test-categ_Zs.c" + "tests/unictype/test-categ_Sk.c" + "tests/unictype/test-sy_c_whitespace.c" + "tests/unictype/test-pr_unified_ideograph.c" + "tests/unictype/test-categ_Cs.c" + "tests/unictype/test-pr_case_ignorable.c" + "tests/unictype/test-categ_Sc.c" + "tests/unictype/test-categ_So.c" + "tests/unictype/test-pr_bidi_hebrew_right_to_left.c" + "tests/unictype/test-categ_Po.c" + "tests/unictype/test-joiningtype_of.h" + "tests/unictype/test-pr_soft_dotted.c" + "tests/unictype/test-categ_Pd.c" + "tests/unictype/test-categ_Z.c" + "tests/unictype/test-categ_Zp.c" + "tests/unictype/test-ctype_space.c" + "tests/unictype/test-pr_emoji_component.c" + "tests/unictype/test-pr_bidi_other_neutral.c" + "tests/unictype/test-pr_other_math.c" + "tests/unictype/test-pr_private_use.c" + "tests/unictype/test-pr_cased.c" + "tests/unictype/test-pr_terminal_punctuation.c" + "tests/unictype/test-categ_Me.c" + "tests/unictype/test-ctype_graph.c" + "tests/unictype/test-pr_unassigned_code_value.c" + "tests/unictype/test-categ_Lt.c" + "tests/unictype/test-categ_Pc.c" + "tests/unictype/test-pr_punctuation.c" + "tests/unictype/test-pr_bidi_segment_separator.c" + "tests/unictype/test-pr_paragraph_separator.c" + "tests/unictype/test-pr_xid_start.c" + "tests/unictype/test-pr_bidi_embedding_or_override.c" + "tests/unictype/test-categ_Mc.c" + "tests/unictype/test-pr_bidi_arabic_digit.c" + "tests/unictype/test-pr_titlecase.c" + "tests/unictype/test-pr_iso_control.c" + "tests/unictype/test-pr_not_a_character.c" + "tests/unictype/test-pr_hyphen.c" + "tests/unictype/test-ctype_alnum.c" + "lib/unicase/ignorable.h" + "lib/unicase/special-casing-table.gperf" + "lib/unicase/tolower.h" + "lib/unicase/toupper.h" + "lib/unicase/tocasefold.h" + "lib/unicase/totitle.h" + "lib/unicase/cased.h" + "lib/uniwidth/width0.h" + "lib/uniwidth/width2.h" + "lib/unigbrk/gbrkprop.h" + "lib/uninorm/composition-table.gperf" + "lib/uninorm/decomposition-table1.h" + "lib/uninorm/decomposition-table2.h" + "lib/uniname/uninames.h" + "lib/uniwbrk/wbrkprop.h" + "lib/unilbrk/lbrktables.c" + "lib/unilbrk/lbrkprop1.h" + "lib/unilbrk/lbrkprop2.h" + "lib/unictype/pr_radical.h" + "lib/unictype/pr_other_math.h" + "lib/unictype/pr_dash.h" + "lib/unictype/pr_combining.h" + "lib/unictype/pr_not_a_character.h" + "lib/unictype/pr_math.h" + "lib/unictype/pr_terminal_punctuation.h" + "lib/unictype/pr_id_start.h" + "lib/unictype/pr_quotation_mark.h" + "lib/unictype/pr_changes_when_titlecased.h" + "lib/unictype/categ_Mc.h" + "lib/unictype/pr_deprecated.h" + "lib/unictype/categ_Cf.h" + "lib/unictype/pr_zero_width.h" + "lib/unictype/pr_emoji_modifier_base.h" + "lib/unictype/ctype_blank.h" + "lib/unictype/joininggroup_of.h" + "lib/unictype/categ_Sk.h" + "lib/unictype/pr_paired_punctuation.h" + "lib/unictype/pr_decimal_digit.h" + "lib/unictype/pr_other_uppercase.h" + "lib/unictype/categ_Cn.h" + "lib/unictype/categ_of.h" + "lib/unictype/sy_c_whitespace.h" + "lib/unictype/pr_composite.h" + "lib/unictype/pr_other_grapheme_extend.h" + "lib/unictype/pr_other_id_continue.h" + "lib/unictype/pr_paragraph_separator.h" + "lib/unictype/pr_bidi_whitespace.h" + "lib/unictype/scripts.h" + "lib/unictype/ctype_graph.h" + "lib/unictype/pr_bidi_arabic_right_to_left.h" + "lib/unictype/categ_Lu.h" + "lib/unictype/pr_hyphen.h" + "lib/unictype/pr_changes_when_casemapped.h" + "lib/unictype/categ_Pe.h" + "lib/unictype/pr_hex_digit.h" + "lib/unictype/pr_id_continue.h" + "lib/unictype/pr_pattern_white_space.h" + "lib/unictype/joiningtype_of.h" + "lib/unictype/ctype_upper.h" + "lib/unictype/pr_extender.h" + "lib/unictype/pr_iso_control.h" + "lib/unictype/ctype_lower.h" + "lib/unictype/categ_Ps.h" + "lib/unictype/categ_Sc.h" + "lib/unictype/ctype_print.h" + "lib/unictype/sy_java_ident.h" + "lib/unictype/ctype_alnum.h" + "lib/unictype/pr_ideographic.h" + "lib/unictype/pr_titlecase.h" + "lib/unictype/categ_N.h" + "lib/unictype/pr_changes_when_casefolded.h" + "lib/unictype/pr_soft_dotted.h" + "lib/unictype/categ_Z.h" + "lib/unictype/categ_Lm.h" + "lib/unictype/categ_P.h" + "lib/unictype/pr_emoji_component.h" + "lib/unictype/pr_space.h" + "lib/unictype/pr_other_lowercase.h" + "lib/unictype/pr_bidi_eur_num_separator.h" + "lib/unictype/pr_bidi_eur_num_terminator.h" + "lib/unictype/ctype_alpha.h" + "lib/unictype/numeric.h" + "lib/unictype/pr_grapheme_base.h" + "lib/unictype/ctype_xdigit.h" + "lib/unictype/pr_bidi_embedding_or_override.h" + "lib/unictype/blocks.h" + "lib/unictype/categ_No.h" + "lib/unictype/pr_ascii_hex_digit.h" + "lib/unictype/pr_bidi_european_digit.h" + "lib/unictype/pr_format_control.h" + "lib/unictype/pr_join_control.h" + "lib/unictype/pr_case_ignorable.h" + "lib/unictype/ctype_space.h" + "lib/unictype/pr_bidi_control.h" + "lib/unictype/pr_diacritic.h" + "lib/unictype/categ_Zs.h" + "lib/unictype/mirror.h" + "lib/unictype/categ_Zl.h" + "lib/unictype/pr_bidi_hebrew_right_to_left.h" + "lib/unictype/decdigit.h" + "lib/unictype/categ_Nd.h" + "lib/unictype/pr_sentence_terminal.h" + "lib/unictype/combiningclass.h" + "lib/unictype/categ_S.h" + "lib/unictype/pr_bidi_arabic_digit.h" + "lib/unictype/digit.h" + "lib/unictype/categ_So.h" + "lib/unictype/pr_changes_when_uppercased.h" + "lib/unictype/pr_other_alphabetic.h" + "lib/unictype/pr_emoji_presentation.h" + "lib/unictype/pr_ignorable_control.h" + "lib/unictype/categ_Cs.h" + "lib/unictype/sy_java_whitespace.h" + "lib/unictype/pr_changes_when_lowercased.h" + "lib/unictype/pr_ids_binary_operator.h" + "lib/unictype/categ_Ll.h" + "lib/unictype/pr_logical_order_exception.h" + "lib/unictype/pr_bidi_pdf.h" + "lib/unictype/sy_c_ident.h" + "lib/unictype/categ_Sm.h" + "lib/unictype/pr_non_break.h" + "lib/unictype/categ_Zp.h" + "lib/unictype/categ_Pc.h" + "lib/unictype/pr_bidi_common_separator.h" + "lib/unictype/pr_grapheme_extend.h" + "lib/unictype/categ_Pd.h" + "lib/unictype/categ_Mn.h" + "lib/unictype/pr_extended_pictographic.h" + "lib/unictype/categ_Lo.h" + "lib/unictype/pr_currency_symbol.h" + "lib/unictype/pr_unassigned_code_value.h" + "lib/unictype/categ_Cc.h" + "lib/unictype/pr_xid_continue.h" + "lib/unictype/pr_numeric.h" + "lib/unictype/categ_LC.h" + "lib/unictype/pr_bidi_segment_separator.h" + "lib/unictype/categ_M.h" + "lib/unictype/ctype_cntrl.h" + "lib/unictype/pr_ids_trinary_operator.h" + "lib/unictype/pr_private_use.h" + "lib/unictype/categ_Pi.h" + "lib/unictype/categ_Lt.h" + "lib/unictype/pr_variation_selector.h" + "lib/unictype/categ_L.h" + "lib/unictype/pr_emoji_modifier.h" + "lib/unictype/pr_alphabetic.h" + "lib/unictype/ctype_punct.h" + "lib/unictype/pr_bidi_boundary_neutral.h" + "lib/unictype/pr_uppercase.h" + "lib/unictype/pr_xid_start.h" + "lib/unictype/categ_Po.h" + "lib/unictype/scripts_byname.gperf" + "lib/unictype/pr_default_ignorable_code_point.h" + "lib/unictype/pr_bidi_non_spacing_mark.h" + "lib/unictype/bidi_of.h" + "lib/unictype/pr_white_space.h" + "lib/unictype/pr_left_of_pair.h" + "lib/unictype/categ_Nl.h" + "lib/unictype/pr_other_id_start.h" + "lib/unictype/categ_C.h" + "lib/unictype/pr_bidi_left_to_right.h" + "lib/unictype/categ_Me.h" + "lib/unictype/pr_cased.h" + "lib/unictype/categ_Pf.h" + "lib/unictype/pr_other_default_ignorable_code_point.h" + "lib/unictype/pr_unified_ideograph.h" + "lib/unictype/pr_grapheme_link.h" + "lib/unictype/pr_pattern_syntax.h" + "lib/unictype/pr_bidi_block_separator.h" + "lib/unictype/categ_Co.h" + "lib/unictype/pr_punctuation.h" + "lib/unictype/pr_bidi_other_neutral.h" + "lib/unictype/pr_line_separator.h" + "lib/unictype/ctype_digit.h" + "lib/unictype/pr_lowercase.h" + "lib/unictype/pr_emoji.h" + "tests/unigbrk/GraphemeBreakTest.txt" + "tests/uninorm/NormalizationTest.txt" + "tests/uniname/UnicodeData.txt" + "tests/uniname/NameAliases.txt" + ;; I could not find a replacement for tests/unigbrk/HangulSyllableNames.txt + "tests/uniwbrk/WordBreakTest.txt"))))))) (build-system gnu-build-system) (arguments (list @@ -876,6 +1222,48 @@ (define*-public (gnulib-checkout #:key (("sc_prohibit_leading_TABs") "disabled_prohibit_leading_TABs")))) (delete 'configure) + (add-after 'unpack 'regenerate-unicode + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "lib" + ;; See the compile-command buffer-local variable in + ;; lib/gen-uni-tables.c + (invoke #+(file-append gcc "/bin/gcc") "-O" "-Wall" "gen-uni-tables.c" + "-Iunictype" "-o" "gen-uni-tables") + (apply invoke + "./gen-uni-tables" + `(,@(map (lambda (f) + (search-input-file inputs f)) + '("share/ucd/UnicodeData.txt" + "share/ucd/PropList.txt" + "share/ucd/DerivedCoreProperties.txt" + "share/ucd/emoji/emoji-data.txt" + "share/ucd/ArabicShaping.txt" + "share/ucd/Scripts.txt" + "share/ucd/Blocks.txt" + "share/ucd/PropList-3.0.1.txt" + "share/ucd/EastAsianWidth.txt" + "share/ucd/LineBreak.txt" + "share/ucd/auxiliary/WordBreakProperty.txt" + "share/ucd/auxiliary/GraphemeBreakProperty.txt" + "share/ucd/CompositionExclusions.txt" + "share/ucd/SpecialCasing.txt" + "share/ucd/CaseFolding.txt")) + #$(package-version ucd))) + (invoke "clisp" "-C" "uniname/gen-uninames.lisp" + (search-input-file inputs "share/ucd/UnicodeData.txt") + "uniname/uninames.h" + (search-input-file inputs "share/ucd/NameAliases.txt")) + (copy-file (search-input-file inputs "share/ucd/NameAliases.txt") + "../tests/uniname/NameAliases.txt") + (copy-file (search-input-file inputs "share/ucd/UnicodeData.txt") + "../tests/uniname/UnicodeData.txt") + (copy-file (search-input-file inputs "share/ucd/NormalizationTest.txt") + "../tests/uninorm/NormalizationTest.txt") + (copy-file (search-input-file inputs "share/ucd/auxiliary/GraphemeBreakTest.txt") + "../tests/unigbrk/GraphemeBreakTest.txt") + (copy-file (search-input-file inputs "share/ucd/auxiliary/WordBreakTest.txt") + "../tests/uniwbrk/WordBreakTest.txt") + (delete-file "gen-uni-tables")))) (replace 'install (lambda _ (install-file "gnulib-tool" @@ -883,9 +1271,14 @@ (define*-public (gnulib-checkout #:key (delete-file-recursively ".git") (copy-recursively "." (string-append #$output "/src/gnulib/"))))))) (inputs ;; Shebangs for some auxiliary build files. - (list python perl clisp - ;; Programs for the tests: - cppi indent git autoconf)) + (list python perl clisp)) + (native-inputs + (list + python perl clisp + ;; Unicode data: + ucd ucd3.0-update1 + ;; Programs for the tests: + cppi indent git autoconf)) (home-page "https://www.gnu.org/software/gnulib/") (synopsis "Source files to share among distributions") (description 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: 45722 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 95B2F27BBE9; Fri, 30 Dec 2022 22:38:35 +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 BC5E427BBEB for ; Fri, 30 Dec 2022 22:38:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pBO0t-0003Y9-OW; Fri, 30 Dec 2022 17:38: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 1pBO0r-0003Xn-DY for guix-patches@gnu.org; Fri, 30 Dec 2022 17:38:05 -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 1pBO0o-0000Yj-Et for guix-patches@gnu.org; Fri, 30 Dec 2022 17:38:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pBO0o-0005Lq-BM for guix-patches@gnu.org; Fri, 30 Dec 2022 17:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH v5 5/5] gnu: guile-gnutls: Update to 3.7.11. References: In-Reply-To: Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Dec 2022 22:38:02 +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 Cc: Liliana Marie Prikler Received: via spool by 60358-submit@debbugs.gnu.org id=B60358.167243988220568 (code B ref 60358); Fri, 30 Dec 2022 22:38:02 +0000 Received: (at 60358) by debbugs.gnu.org; 30 Dec 2022 22:38:02 +0000 Received: from localhost ([127.0.0.1]:36230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBO0m-0005LV-5f for submit@debbugs.gnu.org; Fri, 30 Dec 2022 17:38:01 -0500 Received: from planete-kraus.eu ([89.234.140.182]:35938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBO0j-0005LH-9g for 60358@debbugs.gnu.org; Fri, 30 Dec 2022 17:37:59 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id cd0d3f0b; Fri, 30 Dec 2022 22:37:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:to:cc:message-id:mime-version; s=dkim; bh=zZqN7MKs J2FVFUMZFOWYZrpw8SM=; b=BNL13czHZNZSnKSItpVK1F/cPIS0ZS+sf72RRFVe kJOZLSskiUE83IOXAr0T3EvOysPinTbEh5mjHR/zRuwMuLLOiHJjh1NpBmOIqrEG JqYcHr2NaJTlVUaolZ40vzy0nDls197xsTzRRyVM5rbW1t0wIRniyTqyCpImp4/4 kns= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id fa679602 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 30 Dec 2022 22:37:51 +0000 (UTC) Date: Wed, 28 Dec 2022 03:20:54 +0100 Message-ID: <2fb8065d7f7e08dbc2bd71d05b03c82c43815ca2.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 | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..44a27ef8cb 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,13 @@ (define-public guile-gnutls pkg-config texinfo gnutls ;XXX: 'guile-snarf' invokes the native 'cpp' - guile-3.0)) + guile-3.0 + (gnulib-checkout + #:version "2022-12-06" + #:commit "440b528b1d81dd31b2a2e4dde20d5c837c147811" + #:hash (base32 "15mq43abbnkbamchc9lynrvrd5ql8qacgyx2ph4kkngxf1bz3pqy")) + git ; gnulib requires git even if nothing is downloaded. + )) (inputs (list gnutls-latest guile-3.0))