From patchwork Sat Dec 31 17:33:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 45809 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 447F527BBED; Mon, 2 Jan 2023 19:48:45 +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 BE65E27BBE9 for ; Mon, 2 Jan 2023 19:48:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCQn7-0003Up-Aw; Mon, 02 Jan 2023 14:48:13 -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 1pCQmy-0003U4-UE for guix-patches@gnu.org; Mon, 02 Jan 2023 14:48: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 1pCQmx-0006UV-72 for guix-patches@gnu.org; Mon, 02 Jan 2023 14:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pCQmx-0007Pc-3f for guix-patches@gnu.org; Mon, 02 Jan 2023 14:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH v12 1/4] gnu: libunibreak: Use ucd instead of ucd-next. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 19:48:03 +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.167268887828438 (code B ref 60358); Mon, 02 Jan 2023 19:48:03 +0000 Received: (at 60358) by debbugs.gnu.org; 2 Jan 2023 19:47:58 +0000 Received: from localhost ([127.0.0.1]:44091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmr-0007OW-UH for submit@debbugs.gnu.org; Mon, 02 Jan 2023 14:47:58 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmk-0007Mu-P6 for 60358@debbugs.gnu.org; Mon, 02 Jan 2023 14:47:51 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ea2d0dfd for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=dkim; bh=i6HRk/x3OCFiSMV8LWpPjPoLWmo=; b=b4Ic4f wvmPFsLDjHpZipISQCQdCVIY7rX+FEJTUqjokTB9DGoRA6BsxVZ0ZZ2prwFY6qwu sdf8x9Vfbj74ff9MGilTrhGu1nLOAd/FPKOYd0og4LMu7lUAa37ZSDF7TdE/zYRV GiL1jho2D/ucVO6Vjgw03IPiy94rMAz4o67L8= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 8b0e9c08 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:49 +0000 (UTC) Message-Id: <80157ef2aa8f6599ad1a0a53f687ff9d63ca3d00.1672688590.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 31 Dec 2022 18:33:47 +0100 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/unicode.scm (libunibreak) [native-inputs]: Replace ucd-next with ucd. They are identical. --- gnu/packages/unicode.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index bda0de04cc..5b5900f2ba 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -48,8 +48,7 @@ (define-public libunibreak (list autoconf-wrapper automake libtool - ucd-next ; required for tests - )) + ucd)) (arguments `(#:parallel-tests? #f ; parallel tests cause non-deterministic ; build failures From patchwork Sat Dec 31 17:34:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 45811 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 1DB5B27BBE9; Mon, 2 Jan 2023 19:49:37 +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 6E13E27BBED for ; Mon, 2 Jan 2023 19:49:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCQo2-0003q4-G2; Mon, 02 Jan 2023 14:49:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pCQnv-0003pZ-MS for guix-patches@gnu.org; Mon, 02 Jan 2023 14:49: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 1pCQnu-0006Zo-UU for guix-patches@gnu.org; Mon, 02 Jan 2023 14:49:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pCQnu-0007Sp-QF for guix-patches@gnu.org; Mon, 02 Jan 2023 14:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH v12 2/4] gnu: ucd-next: Update to 15.0.0. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 19:49: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 Received: via spool by 60358-submit@debbugs.gnu.org id=B60358.167268888628543 (code B ref 60358); Mon, 02 Jan 2023 19:49:02 +0000 Received: (at 60358) by debbugs.gnu.org; 2 Jan 2023 19:48:06 +0000 Received: from localhost ([127.0.0.1]:44099 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmz-0007QC-T6 for submit@debbugs.gnu.org; Mon, 02 Jan 2023 14:48:06 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmt-0007Mu-Tg for 60358@debbugs.gnu.org; Mon, 02 Jan 2023 14:48:01 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 39852193 for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=dkim; bh=SZnmHd4mWOiBOI83iMeQazMG6C4=; b=BgNSNu kQk4goJU3dxkfR3F7/c75Wm9eNOz5ZTRemCRhDNMux0exuGofQRcuNpei+Y+tAz0 lypcX/QadAd7f2ZsbQmYc/BuXsugCbNpm3aUCBNybRmnqALtgQi9a5IbfxlWP4mw TeeCBMxJnDGTVWCtJYk9qRSkU6i6jDMaLgDXc= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 22ffef94 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:58 +0000 (UTC) Message-Id: <600b1498c5604f74e5ce32ce11cf1237c6540b20.1672688590.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 31 Dec 2022 18:34:35 +0100 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/unicode.scm (ucd-next): Update to 15.0.0. Rename package to just "ucd", not "ucd-next". --- gnu/packages/unicode.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 5b5900f2ba..857af13d71 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -100,8 +100,8 @@ (define-public ucd (define-public ucd-next (package (inherit ucd) - (name "ucd-next") - (version "14.0.0") + (name "ucd") + (version "15.0.0") (source (origin (method url-fetch/zipbomb) @@ -109,7 +109,7 @@ (define-public ucd-next "/UCD.zip")) (sha256 (base32 - "001nq9w52ijma0vps40xwy2q6ylpyf1393lzb128ibypnmv54fh3")))))) + "133inqn33hcfvylmps63yjr6rrqrfq6x7a5hr5fd51z6yc0f9gaz")))))) (define (unicode-emoji-file name version hash) (origin 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: 45808 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 9885D27BBED; Mon, 2 Jan 2023 19:48:27 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT, 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 92A0627BBE9 for ; Mon, 2 Jan 2023 19:48:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCQn1-0003UJ-Nc; Mon, 02 Jan 2023 14:48:09 -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 1pCQmw-0003Tp-TN for guix-patches@gnu.org; Mon, 02 Jan 2023 14:48:02 -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 1pCQmw-0006UJ-Hj for guix-patches@gnu.org; Mon, 02 Jan 2023 14:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pCQmw-0007PI-Ac for guix-patches@gnu.org; Mon, 02 Jan 2023 14:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH v12 3/4] gnu: Add gnulib. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 19:48: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 Received: via spool by 60358-submit@debbugs.gnu.org id=B60358.167268887028373 (code B ref 60358); Mon, 02 Jan 2023 19:48:02 +0000 Received: (at 60358) by debbugs.gnu.org; 2 Jan 2023 19:47:50 +0000 Received: from localhost ([127.0.0.1]:44084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmj-0007NO-KE for submit@debbugs.gnu.org; Mon, 02 Jan 2023 14:47:50 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmh-0007Mu-My for 60358@debbugs.gnu.org; Mon, 02 Jan 2023 14:47:49 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id efff2394 for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=dkim; bh=iQMd2Rs6bbVsCwxMDd+pMyYQTG0=; b=r7f7tr sSHt5wCyt6pchKuRPifKntnsgvLx1qeWd+5wtdIATKnZ9ZqsFq0sjQhkrEvD5PTL WsGFlPEQ0B8x0GnH2o7Td6pGsHQOmvSSXgreNimcjOZTFPPHgisjQ9q1Qxcv6RtU soHMYH8tFD47duExf3h/krBD3THsIiYqKQ+4g= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 2244626b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:43 +0000 (UTC) Message-Id: In-Reply-To: References: Date: Tue, 27 Dec 2022 17:23:30 +0100 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, gnulib): New variables. --- gnu/packages/build-tools.scm | 203 +++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..397318e555 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2022 Juliana Sims +;;; Copyright © 2022 Vivien Kraus ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages build-tools) + #:use-module (ice-9 optargs) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) @@ -39,20 +41,28 @@ (define-module (gnu packages build-tools) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) + #:use-module (guix modules) #: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 gcc) #: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) @@ -65,6 +75,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)) @@ -803,3 +814,195 @@ (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 #:key + version + (revision "1") + commit + hash) + "Return as a package the exact gnulib checkout." + (package + (name "gnulib") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/gnulib.git/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 hash) + (snippet + (with-imported-modules (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils) + (ice-9 ftw) + (ice-9 rdelim)) + ;; .c, .h and .gperf files whose first line is /* DO NOT EDIT! + ;; GENERATED AUTOMATICALLY! */ are generated automatically based + ;; on the unicode database. Since we replace the unicode + ;; database with our own, we need to regenerate them. So, they + ;; are removed from the source. They are sprinkled all over the + ;; place unfortunately, so we can’t exclude whole directories. + (let ((generated-automatically? + (lambda (filename . unused) + (and (or (string-suffix? ".c" filename) + (string-suffix? ".h" filename) + (string-suffix? ".gperf" filename)) + (call-with-input-file filename + (lambda (port) + (let ((first-line (read-line port))) + (equal? + first-line + "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */")))))))) + (for-each delete-file (find-files (getcwd) generated-automatically?))) + ;; Other files are copied from UCD. + (for-each delete-file + '("tests/unigbrk/GraphemeBreakTest.txt" + "tests/uninorm/NormalizationTest.txt" + "tests/uniname/UnicodeData.txt" + "tests/uniname/NameAliases.txt" + ;; FIXME: tests/uniname/HangulSyllableNames.txt + ;; seems like a UCD file but it is not distributed + ;; with UCD. + "tests/uniwbrk/WordBreakTest.txt"))))))) + (build-system copy-build-system) + (arguments + (list + #:install-plan + #~'(("./gnulib-tool" "bin/") + ("." "src/gnulib" #:exclude-regexp ("\\.git.*"))) + #:modules '((ice-9 match) + (guix build utils) + (guix build copy-build-system) + ((guix build gnu-build-system) #:prefix gnu:)) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'check + (assoc-ref gnu:%standard-phases 'check)) + (add-before 'check '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" ".") + ;; Syntax checks are only run against committed files. + (invoke "git" "commit" "-m" "Prepare for tests."))) + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "cfg.mk" + (("local-checks-to-skip =") + ;; sc_copyright_check fails because the fake commit date may + ;; be later than the copyright year. + "local-checks-to-skip = \\ + sc_Wundef_boolean \\ + sc_copyright_check \\ + 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|copyright)" rule) + (string-append "disabled_check_" rule)) + (("sc_cpp_indent_check") + "disabled_cpp_indent_check") + (("sc_prefer_ac_check_funcs_once") + "disabled_prefer_ac_check_funcs_once") + (("sc_prohibit_(AC_LIBOBJ_in_m4|leading_TABs)" rule) + (string-append "disabled_prohibit_" rule))))) + (add-before 'check 'regenerate-unicode + (lambda* (#:key inputs #:allow-other-keys) + (define (find-ucd-file name) + (search-input-file inputs (string-append "share/ucd/" name))) + (define (find-ucd-files . names) + (map find-ucd-file names)) + (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" + (append + (find-ucd-files "UnicodeData.txt" + "PropList.txt" + "DerivedCoreProperties.txt" + "emoji/emoji-data.txt" + "ArabicShaping.txt" + "Scripts.txt" + "Blocks.txt") + (list + #$(origin + (method url-fetch) + (uri (string-append + "https://www.unicode.org/Public/" + "3.0-Update1/PropList-3.0.1.txt")) + (sha256 + (base32 + "0k6wyijyzdl5g3nibcwfm898kfydx1pqaz28v7fdvnzdvd5fz7lh")))) + (find-ucd-files "EastAsianWidth.txt" + "LineBreak.txt" + "auxiliary/WordBreakProperty.txt" + "auxiliary/GraphemeBreakProperty.txt" + "CompositionExclusions.txt" + "SpecialCasing.txt" + "CaseFolding.txt") + (list #$(package-version (this-package-native-input "ucd"))))) + (invoke "clisp" "-C" "uniname/gen-uninames.lisp" + (find-ucd-file "UnicodeData.txt") + "uniname/uninames.h" + (find-ucd-file "NameAliases.txt")) + (for-each + (match-lambda + ((ucd-file . directory) + (copy-file (find-ucd-file ucd-file) + (string-append "../tests/" directory "/" + (basename ucd-file))))) + '(("NameAliases.txt" . "uniname") + ("UnicodeData.txt" . "uniname") + ("NormalizationTest.txt" . "uninorm") + ("auxiliary/GraphemeBreakTest.txt" . "unigbrk") + ("auxiliary/WordBreakTest.txt" . "uniwbrk"))) + (delete-file "gen-uni-tables"))))))) + (inputs ;; Shebangs for some auxiliary build files. + (list python perl clisp)) + (native-inputs + (list + python perl clisp + ;; Unicode data: + ucd-next + ;; Programs for the tests: + cppi indent git autoconf)) + (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 "src/gnulib"))))) + (license (list license:lgpl2.0+ license:gpl3+)))) + +(define-public gnulib + (gnulib-checkout + #:version "2022-12-31" + #:commit "875461ffdf58ac04677957b4ae4160465b83b940" + #:hash (base32 "0bf7a6wdns9c5wwv60qfcn9llg0j6jz5ryd2qgsqqx2i6xkmp77c"))) From patchwork Wed Dec 28 02:20:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 45810 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 6760727BBF0; Mon, 2 Jan 2023 19:49:36 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT, 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 996F927BBE9 for ; Mon, 2 Jan 2023 19:49:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCQo2-0003q3-4m; Mon, 02 Jan 2023 14:49:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pCQnv-0003pY-Ql for guix-patches@gnu.org; Mon, 02 Jan 2023 14:49: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 1pCQnu-0006Zm-Gy for guix-patches@gnu.org; Mon, 02 Jan 2023 14:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pCQnu-0007Sh-Cz for guix-patches@gnu.org; Mon, 02 Jan 2023 14:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH v12 4/4] gnu: guile-gnutls: Update to 3.7.11. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 19:49: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 Received: via spool by 60358-submit@debbugs.gnu.org id=B60358.167268888628536 (code B ref 60358); Mon, 02 Jan 2023 19:49:02 +0000 Received: (at 60358) by debbugs.gnu.org; 2 Jan 2023 19:48:06 +0000 Received: from localhost ([127.0.0.1]:44097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmy-0007Q2-8u for submit@debbugs.gnu.org; Mon, 02 Jan 2023 14:48:05 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmo-0007Mu-Tb for 60358@debbugs.gnu.org; Mon, 02 Jan 2023 14:47:57 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id eca83a52 for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=dkim; bh=Fq5qJA+G1lA0ELcm2otRK/GEZIs=; b=Z8GXN7 RYmKSsn2369d+SIrDged7BZ6+n1F2JHn9xrn3Hf89S5TmSDvofMzBOizen0SWpAE YlIkFNvNB2kZSIyugPR36/4B6JLsCWzDYWGbc4SEE94uKkdjzN+AWnFTi8floqFA UTh9Aoulc4NU1zOrYnLcyWyd/m9U76vEFfUrg= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id db3dd460 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:53 +0000 (UTC) Message-Id: In-Reply-To: References: Date: Wed, 28 Dec 2022 03:20:54 +0100 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 | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..b8cba06386 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2021 Matthew James Kraai ;;; Copyright © 2021 John Kehayias ;;; Copyright © 2022 Greg Hogan +;;; Copyright © 2022 Vivien Kraus ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,6 +57,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 +82,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 +384,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 +393,31 @@ (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")))) + (replace 'bootstrap + (lambda _ + (invoke "bash" "./bootstrap" "--no-git")))))) (native-inputs (list autoconf automake @@ -412,7 +425,11 @@ (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")))) (inputs (list gnutls-latest guile-3.0))