From unknown Mon Jun 23 18:27:40 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#60358 <60358@debbugs.gnu.org> To: bug#60358 <60358@debbugs.gnu.org> Subject: Status: [PATCH] gnu: Add gnulib. Reply-To: bug#60358 <60358@debbugs.gnu.org> Date: Tue, 24 Jun 2025 01:27:40 +0000 retitle 60358 [PATCH] gnu: Add gnulib. reassign 60358 guix-patches submitter 60358 Vivien Kraus severity 60358 normal tag 60358 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 27 12:04:56 2022 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) From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH] gnu: Add gnulib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: guix-patches@gnu.org 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * 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(+) 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."))) base-commit: 8f93a1e01a879ae026678dd92c18e2a2a49be540 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 27 12:33:23 2022 Received: (at 60358) by debbugs.gnu.org; 27 Dec 2022 17:33:23 +0000 Received: from localhost ([127.0.0.1]:56406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pADpL-0007tz-3o for submit@debbugs.gnu.org; Tue, 27 Dec 2022 12:33:23 -0500 Received: from planete-kraus.eu ([89.234.140.182]:57816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pADpJ-0007tp-4A for 60358@debbugs.gnu.org; Tue, 27 Dec 2022 12:33:22 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ca1a3d71 for <60358@debbugs.gnu.org>; Tue, 27 Dec 2022 17:33:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:content-type :content-transfer-encoding:mime-version; s=dkim; bh=/MugRqiLQh6z GZ1pYHycZn2j2aM=; b=JiGWHuEVPp11JL0/pde4suDMwIEoGVzNXqaIFwcPBRlW cKc0CwhHFJ8O462xbQTmKrBS0VJrPpp7z5IkcO6pjp95mLoUWzLaanm134kZDbBF qpQjdY7gtoR63EEilZd2LgMi1QWrSx+wjFUqiYYhcTMVGmCbYrjhesAVFuH0w50= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 25f5f0f5 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Tue, 27 Dec 2022 17:33:16 +0000 (UTC) Message-ID: <110ab71155948ad506f3df2059d9664075626f43.camel@planete-kraus.eu> Subject: Providing gnulib From: Vivien Kraus To: 60358@debbugs.gnu.org Date: Tue, 27 Dec 2022 18:33:15 +0100 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello guix, I=E2=80=99m trying to provide gnulib for guix. However, when I try to use a git-checkout as the source, to always have the latest commit, then guix fails with:=20 updating checkout of 'https://git.savannah.gnu.org/git/gnulib.git'... guix build: error: Git failure while fetching https://git.savannah.gnu.org/git/gnulib.git: reference 'refs/remotes/origin/HEAD' not found I don=E2=80=99t fully understand what happens. Do you have an idea? Also, when using gnulib, the whole point is to have GNULIB_SRCDIR point to a directory where the gnulib files are, so that bootstrap srcipts can use that instead of a git submodule (which is not possible with guix). I tried to set it as a search-path-specification, which seems to work, but I=E2=80=99m not sure that it is the correct approach. What do you think? Best regards, Vivien From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 27 13:44:29 2022 Received: (at submit) by debbugs.gnu.org; 27 Dec 2022 18:44:29 +0000 Received: from localhost ([127.0.0.1]:56509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAEw9-0001TO-D6 for submit@debbugs.gnu.org; Tue, 27 Dec 2022 13:44:29 -0500 Received: from lists.gnu.org ([209.51.188.17]:53896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAEw8-0001TH-0P for submit@debbugs.gnu.org; Tue, 27 Dec 2022 13:44:28 -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 1pAEw7-00052d-Qr for guix-patches@gnu.org; Tue, 27 Dec 2022 13:44:27 -0500 Received: from uggla.sjd.se ([2001:9b1:8633::107]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAEw5-0002x7-HB for guix-patches@gnu.org; Tue, 27 Dec 2022 13:44:26 -0500 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=ed2110; h=Content-Type:MIME-Version:Message-ID:In-Reply-To :Date:References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding :Content-ID:Content-Description; bh=u7k5MAJeQ6rI/pObVCIx9/cfFrsZybrv4iyuVoWZ0hI=; t=1672166663; x=1673376263; b=BLTtdAT3K8Wysu4TItbcnpt8inR9SPLKdGvLRbZAzU7GH5RdOOVFctGHlV9czW8p6vuE+e5sYvs uKGRirM/vDg==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=rsa2110; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=u7k5MAJeQ6rI/pObVCIx9/cfFrsZybrv4iyuVoWZ0hI=; t=1672166663; x=1673376263; b=lOGDp+Ym18hrc4yRb8HgjgI+RrN+p0B9tmwj3j2KrJ9S5XiGNhpiCPR5lAzRM83dJdcAuIYBb6P vWlWGJsqcYkQj/DupE6LvW2WDiNmFjBXsCev9uIopoJDi1teG9tOPIZ/qFaUrDTVrPeKv1xvTpPdV hmpxBmitfqRoRlnK6JApPTO+dPt88nIx/fJhZi0Ik90kD9mcGzX62vfpmfK32yBIc36XTdcMlqd0c U/uG8OQswiRx8mV8tqKtF2C4g2Gpb5xjT4EWNPzKYY4ftgyUAgTRsddgj2EP0NR4s1oen2wrk6bKI oWMvUf2WMiF1wrok4bDq3hZjwg1BuWpzFvIH9ajbXfghDZR6UNKp5Rkyth8pYlqWcvAoe7A9Wx6a4 lkOzQtfhHuh4aOip1Jnx2/lPCJ/OvdMKZex4SeKIKzBjDiK6151oREUF5F14RJH6t5EFEJzzd; Received: from [2001:9b1:41ac:ff00:67bf:136:16d3:4a37] (port=52772 helo=kaka) by uggla.sjd.se with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pAEvy-0061d0-Pb; Tue, 27 Dec 2022 19:44:18 +0100 From: Simon Josefsson To: Vivien Kraus via Guix-patches via Subject: Re: [bug#60358] [PATCH] gnu: Add gnulib. References: OpenPGP: id=B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE; url=https://josefsson.org/key-20190320.txt X-Hashcash: 1:22:221227:60358@debbugs.gnu.org::J0xOcy5VeKlgcDkx:0PD+ X-Hashcash: 1:22:221227:vivien@planete-kraus.eu::D/5BSjRwBEZQLFAA:123m X-Hashcash: 1:22:221227:guix-patches@gnu.org::H474yIkX/6gk8U8o:mMw5 Date: Tue, 27 Dec 2022 19:44:16 +0100 In-Reply-To: (Vivien Kraus via Guix-patches via's message of "Tue, 27 Dec 2022 17:23:30 +0100") Message-ID: <87h6xgzny7.fsf@josefsson.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=2001:9b1:8633::107; envelope-from=simon@josefsson.org; helo=uggla.sjd.se X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: 60358@debbugs.gnu.org, Vivien Kraus X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi. Many packages needs a specific checkout of gnulib to work reliably, via --gnulib-refdir=3D (rather than --gnulib-srcdir=3D), would you consider installing the entire gnulib git archive instead of just the latest checkout? Since so many packages these days require different versions of gnulib, it may make sense to mak the gnulib git archive available as an installed Guix package, so that other packages may bootstrap build from it and get the intended gnulib git checkout. If a checked out gnulib git archive is available as a Guix package, other packages could build-depend on it and use both --gnulib-refdir and =2D-gnulib-srcdir. If I understand your approach now, only =2D-gnulib-srcdir is possible. You could put the git archive under /share/gnulib-git or merely /share/gnulib/ and set both GNULIB_REFDIR and GNULIB_SRCDIR. /Simon --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIoEARYIADIWIQSjzJyHC50xCrrUzy9RcisI/kdFogUCY6s9ABQcc2ltb25Aam9z ZWZzc29uLm9yZwAKCRBRcisI/kdFokTXAP4z+U9goAFtaeKi7+b4lkN5rXjqmRjJ VWjz+x6MbtNKZgD/d97Qayy+G6PQTgfFcEWjgIg347xDcZN2OnW12POsVwE= =sV4p -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 27 15:45:58 2022 Received: (at 60358) by debbugs.gnu.org; 27 Dec 2022 20:45:58 +0000 Received: from localhost ([127.0.0.1]:56559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAGpi-0006pv-2L for submit@debbugs.gnu.org; Tue, 27 Dec 2022 15:45:58 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:45914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAGpe-0006pf-Aj for 60358@debbugs.gnu.org; Tue, 27 Dec 2022 15:45:56 -0500 Received: by mail-ej1-f67.google.com with SMTP id fc4so34199236ejc.12 for <60358@debbugs.gnu.org>; Tue, 27 Dec 2022 12:45:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=ddGfvbbfRJ8zCvHzZc5WDQcIC0Mh8K7iMRkT/KqjsXY=; b=i5FblFlWZdNkWCtac3RBsVr6FG2YFWpZFMf+nT5jNkxyAUoSa0LqMBjHUjTgis3lQp tC+nD2Cp2axRrMIuKcof1wHLIK+f0A4ckqEmIIx/XZAZi2N1GeKTgU1d162fojJLQiIY WOlsaJ2F9wkRwZQMQKK986S9E+YUJ7UKVn//g/Oc8yjA8YnR/xwyiWZApkljSYzuJxIj KmLzCxGvdVMkXoJ5dNK3Dz46CmC+Zq2cvy2xInN4gaU2s2jOnx4vuSYfG90AA6mf8fie G4Z7ap04IcTHfgTmxn2qKshfQDLGeuwHaqT9aW+4sGvljT184zqf2ZQGnMJhVQKT1wHX kVuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ddGfvbbfRJ8zCvHzZc5WDQcIC0Mh8K7iMRkT/KqjsXY=; b=SCDlhNgc2I7e8AajaBJXbDoRMDwmY4Web1W2AEGohU53rH4GgBT1Li5uG75FC+5W8K NMCIQ7EmKgBc9GnPK+qzTQ/TNhrMBMxUDYdWYDihghcm01AFXzc6ZvDBjOkXn2pFiply pITPsPaQwuODqSWKDLMkkIgoVYoZ9MG1dISLZbdN2zJ2NbU9DN49lVyfB/1TM7tVQI+7 fBOcZtFpqXxILbz4LgGT53NEjnjFKrQRLpOd4540/MOJjdBuKmqcBE8BAU0Knb/HgNYY sq3XH+ROze1Xl4qYu8UWS7s4K2bExrcJxyXsvr/A2ewsZ3Y++ugplqIoaSuBwCgaLfri al4w== X-Gm-Message-State: AFqh2kqs+TRfbvKbAtsO/u0eOZWhbj9GnXT4zLPBiXhdw1GJq5qZkmP+ ebZlSDLyBBZ0jY5mY8vpxc4= X-Google-Smtp-Source: AMrXdXujVFCbQ8QJpsIiXY2CtnDnsZD24+SpVh7qB0m1ZZGqaajoCoqkJ5Ryf4flys/QJwU8wQABSQ== X-Received: by 2002:a17:906:b041:b0:7c1:22a6:818e with SMTP id bj1-20020a170906b04100b007c122a6818emr18138527ejb.24.1672173948080; Tue, 27 Dec 2022 12:45:48 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g3-20020a170906538300b0082535e2da13sm6534700ejo.6.2022.12.27.12.45.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 12:45:47 -0800 (PST) Message-ID: <5c64afba3acb7820763eb5a4bf2567fc4b12ad77.camel@gmail.com> Subject: Re: [PATCH] gnu: Add gnulib. From: Liliana Marie Prikler To: Vivien Kraus , 60358@debbugs.gnu.org Date: Tue, 27 Dec 2022 21:45:45 +0100 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 27.12.2022 um 17:23 +0100 schrieb Vivien Kraus: > * gnu/packages/build-tools.scm (gnulib-latest): New variable. This > one always > tracks the latest upstream commit, so don=E2=80=99t use it as an input. > (gnulib): New variable. This is a "recent" snapshot. The preferred package:patch ratio is 1:1. > --- > =C2=A0gnu/packages/build-tools.scm | 71 > ++++++++++++++++++++++++++++++++++++ > =C2=A01 file changed, 71 insertions(+) >=20 > 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) > =C2=A0=C2=A0 #:use-module (guix gexp) > =C2=A0=C2=A0 #:use-module (guix download) > =C2=A0=C2=A0 #:use-module (guix git-download) > +=C2=A0 #:use-module (guix git) > =C2=A0=C2=A0 #:use-module (guix build-system cmake) > =C2=A0=C2=A0 #:use-module (gnu packages) > =C2=A0=C2=A0 #:use-module (gnu packages adns) > @@ -48,11 +49,13 @@ (define-module (gnu packages build-tools) > =C2=A0=C2=A0 #:use-module (gnu packages cpp) > =C2=A0=C2=A0 #:use-module (gnu packages elf) > =C2=A0=C2=A0 #:use-module (gnu packages linux) > +=C2=A0 #:use-module (gnu packages lisp) > =C2=A0=C2=A0 #:use-module (gnu packages logging) > =C2=A0=C2=A0 #:use-module (gnu packages lua) > =C2=A0=C2=A0 #:use-module (gnu packages ninja) > =C2=A0=C2=A0 #:use-module (gnu packages package-management) > =C2=A0=C2=A0 #:use-module (gnu packages pcre) > +=C2=A0 #:use-module (gnu packages perl) > =C2=A0=C2=A0 #:use-module (gnu packages pkg-config) > =C2=A0=C2=A0 #:use-module (gnu packages pretty-print) > =C2=A0=C2=A0 #:use-module (gnu packages protobuf) > @@ -803,3 +806,71 @@ (define-public genie > =C2=A0same settings to multiple projects.=C2=A0 It supports generating pr= ojects > using GNU > =C2=A0Makefiles, JSON Compilation Database, and experimentally Ninja.") > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (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 > +=C2=A0 ;; Use this to develop. > +=C2=A0 (package > +=C2=A0=C2=A0=C2=A0 (name "gnulib-latest") > +=C2=A0=C2=A0=C2=A0 (version "latest") > +=C2=A0=C2=A0=C2=A0 (source > +=C2=A0=C2=A0=C2=A0=C2=A0 (git-checkout > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (url "https://git.savannah.gnu.org/git/gn= ulib.git"))) Don't. If you need to check out a particular commit, use the --with- commit CLI option or a transformer. > +=C2=A0=C2=A0=C2=A0 (build-system gnu-build-system) > +=C2=A0=C2=A0=C2=A0 (arguments > +=C2=A0=C2=A0=C2=A0=C2=A0 (list > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #:phases > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #~(modify-phases %standard-phases > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (delete 'configur= e) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (replace 'install > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (lamb= da _ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 (install-file "gnulib-tool" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (string-append #$output "/bin")) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 (copy-recursively "." > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append #$output > "/share/gnulib-srcdir"))))) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #:tests? #f)) ;; Tests are syntax and ind= entation checks for > the > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; maintainer. > +=C2=A0=C2=A0=C2=A0 (inputs ;; Shebangs for some auxiliary build files. > +=C2=A0=C2=A0=C2=A0=C2=A0 (list python perl clisp)) > +=C2=A0=C2=A0=C2=A0 (home-page "https://www.gnu.org/software/gnulib/") > +=C2=A0=C2=A0=C2=A0 (synopsis "GNU portability library") > +=C2=A0=C2=A0=C2=A0 (description > +=C2=A0=C2=A0=C2=A0=C2=A0 "Gnulib is a library that provides common funct= ions 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.") > +=C2=A0=C2=A0=C2=A0 (native-search-paths > +=C2=A0=C2=A0=C2=A0=C2=A0 (list > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (search-path-specification > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (variable "GNULIB_SRCDIR") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (files (list "share/gnulib-srcdir")= )))) > +=C2=A0=C2=A0=C2=A0 (license > +=C2=A0=C2=A0=C2=A0=C2=A0 (list license:lgpl2.0+ license:gpl3+)))) > + > +(define-public gnulib > +=C2=A0 ;; Use this as a native input. > +=C2=A0 (package > +=C2=A0=C2=A0=C2=A0 (inherit gnulib-latest) > +=C2=A0=C2=A0=C2=A0 (name "gnulib") > +=C2=A0=C2=A0=C2=A0 (version "2022-12-27") > +=C2=A0=C2=A0=C2=A0 (source > +=C2=A0=C2=A0=C2=A0=C2=A0 (origin > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (method git-fetch) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (uri (git-reference > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= (url "https://git.savannah.gnu.org/git/gnulib.git") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= (commit "fde75446490e18d2539817ca418ab8adf73b02d3"))) Don't throw together raw commits and commit-less versions. Use git- version instead. > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (sha256 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (base32 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "0fjbdhwi9025wyq39rwc2j= 6aazfmagx056kkbvxx6bs97i80dcim")))) > +=C2=A0=C2=A0=C2=A0 (synopsis "GNU portability library") > +=C2=A0=C2=A0=C2=A0 (description > +=C2=A0=C2=A0=C2=A0=C2=A0 "Gnulib is a library that provides common funct= ions 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."))) Cheers From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 27 20:57:56 2022 Received: (at submit) by debbugs.gnu.org; 28 Dec 2022 01:57:56 +0000 Received: from localhost ([127.0.0.1]:56845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pALhb-0006fS-Lh for submit@debbugs.gnu.org; Tue, 27 Dec 2022 20:57:55 -0500 Received: from lists.gnu.org ([209.51.188.17]:44982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pALhZ-0006fJ-1G for submit@debbugs.gnu.org; Tue, 27 Dec 2022 20:57:53 -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 1pALhY-00043k-MF for guix-patches@gnu.org; Tue, 27 Dec 2022 20:57:52 -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 1pALhW-0005hK-RF for guix-patches@gnu.org; Tue, 27 Dec 2022 20:57:52 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 7cc66535; Wed, 28 Dec 2022 01:57:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:cc:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s=dkim; bh=K7FrK6k7Tjth8fjOhcE8C1Dn7GE=; b=w7R5Ql6nQCdInwEqFRWsOAMqc1vp 219+JPWOEhS8P6x47PuKYq/GBRuFYHDw7oJyEvLkTpeyUDhD+Qf5j82yki+5miQ/ 9HuxSEIRtZNGaceucaUN+Rf4naix2xB8Zk8G71nkrQVhkFi7SKnCikecC964k+IP tMvO+rfrgHbl93c= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 1f57f818 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 28 Dec 2022 01:57:42 +0000 (UTC) Message-ID: Subject: Re: [bug#60358] [PATCH] gnu: Add gnulib. From: Vivien Kraus To: Simon Josefsson , Vivien Kraus via Guix-patches via Date: Wed, 28 Dec 2022 02:57:40 +0100 In-Reply-To: <87h6xgzny7.fsf@josefsson.org> References: <87h6xgzny7.fsf@josefsson.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: 60358@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hello! Le mardi 27 d=C3=A9cembre 2022 =C3=A0 19:44 +0100, Simon Josefsson a =C3=A9= crit=C2=A0: > Hi.=C2=A0 Many packages needs a specific checkout of gnulib to work > reliably, > via --gnulib-refdir=3D (rather than --gnulib-srcdir=3D), would you > consider > installing the entire gnulib git archive instead of just the latest > checkout?=C2=A0=20 I did not know about gnulib-refdir. Providing the entire gnulib archive is tempting, but there might be downsides. The contents of the .git directory depends on how trees and objects have been packed by git. As far as I understand, it is possible that pushing a commit in gnulib results in commit objects from previous commits to be re-packed. Thus, if I clone gnulib from the initial commit to a specific commit, the result might depend on other, unrelated commits. So, the content of .git is not reproducible. Maybe I could get around that by deleting all the refs, doing an aggressive garbage collection and then re-packing, but I=E2=80=99m not sure= I would get a reproducible result. Now, I don=E2=80=99t know much about gnulib-refdir. How does gnulib-refdir work? Do you have an example of a package that uses this feature? Can I convince the package to use a checkout instead of the gnulib repository, if I swear I have the exact checkout it wants, maybe by tweaking bootstrap.conf or something? Vivien From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 27 21:39:17 2022 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> From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v2 1/2] gnu: Add gnulib. To: 60358@debbugs.gnu.org Message-ID: <39b658dda4fef7c90037de4ab69896cb5c37ae6d.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 +++++++++++++++++++ [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) * 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(+) 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")) base-commit: 0cb8f7125b19264b01962c1249c3df4c5ce85aa9 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 27 21:39:23 2022 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> From: Vivien Kraus Date: Wed, 28 Dec 2022 03:20:54 +0100 Subject: [PATCH v2 2/2] gnu: guile-gnutls: Update to 3.7.11. To: 60358@debbugs.gnu.org Message-ID: <865c55e780549ba03e66c7012965253a45da05fe.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 27 21:50:42 2022 Received: (at 60358) by debbugs.gnu.org; 28 Dec 2022 02:50:42 +0000 Received: from localhost ([127.0.0.1]:56886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAMWf-00085Q-Aa for submit@debbugs.gnu.org; Tue, 27 Dec 2022 21:50:42 -0500 Received: from planete-kraus.eu ([89.234.140.182]:54592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAMWc-00085E-1e for 60358@debbugs.gnu.org; Tue, 27 Dec 2022 21:50:39 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a38c6e75 for <60358@debbugs.gnu.org>; Wed, 28 Dec 2022 02:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s=dkim; bh=aYilGTXWbo3Y1ELhaG6VQi12MC0=; b=cDc6/Za1J807NQ11Hyjm1Gf009Yd sw6FsfNU5uYOirp1KLz/oHiuFQ2so9NYKM7SBfWHD2Ep1SWxvCiAU77jTuWDPykA BdcVyoPx+teQwHCmJcKdU270xGWYNnphP/+Qt9m7Tx0fp6Sy4arghp3AZp+KQt55 lhbllgrLDQaMHx8= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 8c9daef5 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Wed, 28 Dec 2022 02:50:33 +0000 (UTC) Message-ID: <96ae1a284e7f34c506a63d1cd76aecabe6e1399a.camel@planete-kraus.eu> Subject: Re: [PATCH v2 2/2] gnu: guile-gnutls: Update to 3.7.11. From: Vivien Kraus To: 60358@debbugs.gnu.org Date: Wed, 28 Dec 2022 03:50:32 +0100 In-Reply-To: <865c55e780549ba03e66c7012965253a45da05fe.camel@planete-kraus.eu> References: <5c64afba3acb7820763eb5a4bf2567fc4b12ad77.camel@gmail.com> <865c55e780549ba03e66c7012965253a45da05fe.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le mercredi 28 d=C3=A9cembre 2022 =C3=A0 03:20 +0100, Vivien Kraus a =C3=A9= crit=C2=A0: > * 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. > --- > =C2=A0gnu/packages/tls.scm | 37 ++++++++++++++++++++++++------------- > =C2=A01 file changed, 24 insertions(+), 13 deletions(-) This is not required, but it shows that the gnulib package works. Best regards, Vivien From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 29 09:44:28 2022 Received: (at submit) by debbugs.gnu.org; 29 Dec 2022 14:44:28 +0000 Received: from localhost ([127.0.0.1]:59647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAu8y-0007XH-58 for submit@debbugs.gnu.org; Thu, 29 Dec 2022 09:44:28 -0500 Received: from lists.gnu.org ([209.51.188.17]:56282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAu8u-0007X7-9D for submit@debbugs.gnu.org; Thu, 29 Dec 2022 09:44:24 -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 1pAu8u-0001mP-0M for guix-patches@gnu.org; Thu, 29 Dec 2022 09:44:24 -0500 Received: from uggla.sjd.se ([2001:9b1:8633::107]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAu8s-0001Wo-6z for guix-patches@gnu.org; Thu, 29 Dec 2022 09:44:23 -0500 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=ed2110; h=Content-Type:MIME-Version:Message-ID:In-Reply-To :Date:References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding :Content-ID:Content-Description; bh=bJZNEqDLcWEhu0DqJdqJj1ZgYC3cYDqu7BvRVFEPqnk=; t=1672325059; x=1673534659; b=n0nOsCU3Zn2z9Sj5PNc0TW66gvA20mjOOMgnW84glxAhNT9cRW8zcxdUdZMFJhgS2IChPdCx2fe 3bM5Qn1p7CQ==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=rsa2110; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=bJZNEqDLcWEhu0DqJdqJj1ZgYC3cYDqu7BvRVFEPqnk=; t=1672325059; x=1673534659; b=hVAS/mqASt8GwcaaCC2P1aPp8SW5tTxarW56rKZk13eraih6tVr4WwiDg3jbEghByxrsvTvi/M3 xf2gfUsPflfws7lEDHRHFAMYsyokDcgPQ0NT5TZ2WPWngcunteUDoausFFVMEZgBuVC13RzwQGgtA htm36EjvIlKIfqS32yKFQFD+s2wsZTP76Z5d+uDAL4fuvRF4iKOjT92+Nb1YDX5YAb9nlG4V74HzQ RJDaumiPFdPEIdeSnWoQ9knCkFK9Gg31f1PSNfWb3ik0xxszNVHE0kzCHr7kEX7QqpcKd3T4xxXK/ R5J87SdWItW6SKmULLg2gJhRstMaBd4OLV+lBxCTqAFKMe/VnRk5OIXQGt1Lhb5u+zu5JT6nEhdc8 NsC4NguGCGA8Le5B1DS13zA9HoRDAbxRqnzvN22g+QMPTi+CT1zwhAITC2riTPxwcCEkou15f; Received: from [2001:9b1:41ac:ff00:be83:be22:3e7e:fd91] (port=52130 helo=kaka) by uggla.sjd.se with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pAu8l-009IYb-Oj; Thu, 29 Dec 2022 15:44:15 +0100 From: Simon Josefsson To: Vivien Kraus via Guix-patches via Subject: Re: [bug#60358] [PATCH] gnu: Add gnulib. References: <87h6xgzny7.fsf@josefsson.org> OpenPGP: id=B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE; url=https://josefsson.org/key-20190320.txt X-Hashcash: 1:22:221229:vivien@planete-kraus.eu::01OdLWyEj/Yffn0j:0VyF X-Hashcash: 1:22:221229:guix-patches@gnu.org::bySidXRwHbGCXIxT:FfAE X-Hashcash: 1:22:221229:60358@debbugs.gnu.org::Nmh07LZNr7p6LypU:PCqF Date: Thu, 29 Dec 2022 15:44:12 +0100 In-Reply-To: (Vivien Kraus via Guix-patches via's message of "Wed, 28 Dec 2022 02:57:40 +0100") Message-ID: <874jtei81v.fsf@josefsson.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=2001:9b1:8633::107; envelope-from=simon@josefsson.org; helo=uggla.sjd.se X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: 60358@debbugs.gnu.org, Vivien Kraus X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Vivien Kraus via Guix-patches via writes: > Hello! > > Le mardi 27 d=C3=A9cembre 2022 =C3=A0 19:44 +0100, Simon Josefsson a =C3= =A9crit=C2=A0: >> Hi.=C2=A0 Many packages needs a specific checkout of gnulib to work >> reliably, >> via --gnulib-refdir=3D (rather than --gnulib-srcdir=3D), would you >> consider >> installing the entire gnulib git archive instead of just the latest >> checkout?=C2=A0=20 > > I did not know about gnulib-refdir. It is newer than --gnulib-srcdir, but came about because --gnulib-srcdir is often a fragile solution: you have no idea which gnulib version the person building the package supplied. Since gnulib is rolling, compatibility becomes difficult. The --gnulib-srcdir approach works if you make sure to use the same gnulib git checkout as the project you wish to build uses. But then it becomes difficult to package gnulib: no two projects are likely to rely on the same gnulib git commit. So which gnulib git version to package? That's the motivation for packaging the gnulib git repository instead. This may sound strange, but compare how gettext/autopoint ships a CVS repository and checks out the particular files that are needed. Yeah, I can agree that this approach is not ideal, and there are many concerns with it. I'm not convinced gnulib's idea of "source-level library" is something that is viable long-term. But it is what exists today. > Providing the entire gnulib archive is tempting, but there might be > downsides. The contents of the .git directory depends on how trees and > objects have been packed by git. As far as I understand, it is > possible that pushing a commit in gnulib results in commit objects > from previous commits to be re-packed. Thus, if I clone gnulib from > the initial commit to a specific commit, the result might depend on > other, unrelated commits. So, the content of .git is not reproducible. > > Maybe I could get around that by deleting all the refs, doing an > aggressive garbage collection and then re-packing, but I=E2=80=99m not su= re I > would get a reproducible result. Interesting -- I think researching this more would be useful. It should be possible to come up with a safe approach to produce a reproducible checkout of a git repository. Doesn't 'git archive' produce a reproducible output from a git repository for a particular branch and commit? > Now, I don=E2=80=99t know much about gnulib-refdir. How does gnulib-refdir > work? You supply --gnulib-refdir pointing to a local gnulib git repository clone when you run ./bootstrap. This avoid checking out the gnulib git submodule from Savannah, and instead ./bootstrap will use the local git repository instead. I believe it should automatically extract the intended gnulib git commit from the gnulib/ git submodule, and extract that version from the local copy (please test -- may be bugs). > Do you have an example of a package that uses this feature? Packages wouldn't use it, but if they use gnulib's ./bootstrap script the support this approach. The idea is that people building projects that use gnulib doesn't always have to fetch the gnulib git submodule, but have a local copy for security or performance reasons. > Can I convince the package to use a checkout instead of the gnulib > repository, if I swear I have the exact checkout it wants, maybe by > tweaking bootstrap.conf or something? You can force a package to use another gnulib version by using =2D-gnulib-srcdir and point that to some other version of gnulib. But the project may not build. The point of --gnulib-refdir is to actually get the same version of gnulib that the project uses, why would you not want that? There is the GNULIB_REVISION environment variable that you can set to something else, but this is probably not very well tested and sounds like a bad idea (but I may be missing something). /Simon --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIoEARYIADIWIQSjzJyHC50xCrrUzy9RcisI/kdFogUCY62nvBQcc2ltb25Aam9z ZWZzc29uLm9yZwAKCRBRcisI/kdFohm1AP95ENA0GNta07CFDN7bmkPethadd9uh sa7fjOnDg3dzbwEAi8ZriI8e25ZD8RFxbL9BqXKMHpryPSDF2NaZPjE2Gwc= =HqNH -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 29 09:56:14 2022 Received: (at submit) by debbugs.gnu.org; 29 Dec 2022 14:56:14 +0000 Received: from localhost ([127.0.0.1]:60870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAuKL-0008Cp-8i for submit@debbugs.gnu.org; Thu, 29 Dec 2022 09:56:14 -0500 Received: from lists.gnu.org ([209.51.188.17]:44014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAuKG-00088z-Cl for submit@debbugs.gnu.org; Thu, 29 Dec 2022 09:56: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 1pAuKG-0004ce-7J for guix-patches@gnu.org; Thu, 29 Dec 2022 09:56:08 -0500 Received: from uggla.sjd.se ([2001:9b1:8633::107]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAuKB-0006I2-FB for guix-patches@gnu.org; Thu, 29 Dec 2022 09:56:07 -0500 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=ed2110; h=Content-Type:MIME-Version:Message-ID:In-Reply-To :Date:References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding :Content-ID:Content-Description; bh=aI5aUmd73L8r8V262fYTzlxYg3AL+vLXjNoaILIV5xc=; t=1672325762; x=1673535362; b=K3Mn+ZKg1QoC/ddsAfHk4PpVTmyfZmiJDcQfP/N9gKoR+ElpadrAajAmGLjkh2cfOdnvsL8mo+H m3DGKpV1+Cw==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=rsa2110; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=aI5aUmd73L8r8V262fYTzlxYg3AL+vLXjNoaILIV5xc=; t=1672325762; x=1673535362; b=SVvzSVRJ96kvmbHJKJA0yM3UYuT/UibjyNoThpT0YpqJ+pdU87GSKB6b51ph+p5zfqidt3JED8V FdJkg3XrWssAVs4bfTdRKeZSgaKj+YCS0zXJlWp/SgX7VwRB7gerBSwUYkj0slTBuKK38jUZnBTgb Z1C/Kky3Q9AS9gryL5Jd4LHZHW+HPmQ12ImLunbzAg7WOaYxUIGz3/U4f1dBKFrcKn7NAxZqkJLDo qTVnQVEeo+kGOMHhFeTEsajaXyumdcYHaH3D4PBkXa4tMgwUjy3bWOmNcsCOhrCMVCtM9Bo40A7+a aBu7Vyv5jG5d0JszgoSHALW0qffOofqPv4/QhjSUrH0lI/+7wNss1fIOE+W2AOffPKQAPGMG+cMGF 1p50nzdkSFsAlRJZwpqsPUCyLQ0RkoKqInb13vsc7mx7lwDL6bYGtHlhYg3Jb7GHDOB72mRoc; Received: from [2001:9b1:41ac:ff00:be83:be22:3e7e:fd91] (port=48512 helo=kaka) by uggla.sjd.se with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pAuK7-009Jdq-HG; Thu, 29 Dec 2022 15:55:59 +0100 From: Simon Josefsson To: Vivien Kraus via Guix-patches via Subject: Re: [bug#60358] [PATCH v2 2/2] gnu: guile-gnutls: Update to 3.7.11. References: <5c64afba3acb7820763eb5a4bf2567fc4b12ad77.camel@gmail.com> <865c55e780549ba03e66c7012965253a45da05fe.camel@planete-kraus.eu> <96ae1a284e7f34c506a63d1cd76aecabe6e1399a.camel@planete-kraus.eu> OpenPGP: id=B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE; url=https://josefsson.org/key-20190320.txt X-Hashcash: 1:22:221229:vivien@planete-kraus.eu::NnCRZO/jccTS2dsQ:0e6x X-Hashcash: 1:22:221229:guix-patches@gnu.org::z4RBraWaPGEhS48n:6+5a X-Hashcash: 1:22:221229:60358@debbugs.gnu.org::C9ee1BcGDQdRsUpu:Ch+T Date: Thu, 29 Dec 2022 15:55:59 +0100 In-Reply-To: <96ae1a284e7f34c506a63d1cd76aecabe6e1399a.camel@planete-kraus.eu> (Vivien Kraus via Guix-patches via's message of "Wed, 28 Dec 2022 03:50:32 +0100") Message-ID: <87zgb6gsxs.fsf@josefsson.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=2001:9b1:8633::107; envelope-from=simon@josefsson.org; helo=uggla.sjd.se X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: 60358@debbugs.gnu.org, Vivien Kraus X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Vivien Kraus via Guix-patches via writes: > Le mercredi 28 d=E9cembre 2022 =E0 03:20 +0100, Vivien Kraus a =E9crit=A0: >> * 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. >> --- >> =A0gnu/packages/tls.scm | 37 ++++++++++++++++++++++++------------- >> =A01 file changed, 24 insertions(+), 13 deletions(-) > > This is not required, but it shows that the gnulib package works. Thanks for providing an example package that would use the Guix gnulib package! I don't think it actually does what you would want it to do: your resulting build of guile-gnutls will likely NOT use the exact same version of gnulib that was used when preparing and tagging the guile-gnutls release. That's why this approach uses GNULIB_SRCDIR to force a different gnulib version than the intended one. Since gnulib doesn't offer backwards/future compatibility, this will just cause the guile-gnutls 3.7.11 build to break at some point, or even introduce subtle unintended bugs, when the gnulib package is updated. However, if the 'gnulib' package in Guix would provide a copy of the git repository, and set GNULIB_REFDIR instead, I believe it would work as intended: ./bootstrap will pick the gnulib commit from the local copy of gnulib. This should always work and is future-proof, as long as the Guix gnulib package provides all historic gnulib git commits forever. Taking a step back, I think it boils down to two approaches when building projects: 1) Download git submodules when download git repository of projects that use gnulib. This consumes a lot of bandwidth, but will set up the project the way most developers build the project. 2) Don't fetch the gnulib git submodule (other git submodules will probably be required, though, depending on project) and add a dependency to a Guix 'gnulib' package that ships the entire git repository, and modify the ./bootstrap call to do ./bootstrap --gnulib-refdir=3D...'. Approach 2) is less well tested but I think it would work, and effectively what it achieves compared to 1) is to reduce the bandwidth requirements and avoid a dependence on an online Savannah. Is this really worth the complexity? Or is there some other advantage that I'm missing? Thanks for caring about how gnulib is used in projects! It is a complicated situation, and has tricky bill-of-material and security consequences. /Simon --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIoEARYIADIWIQSjzJyHC50xCrrUzy9RcisI/kdFogUCY62qfxQcc2ltb25Aam9z ZWZzc29uLm9yZwAKCRBRcisI/kdFovCdAQDiPGkhdo5eN7ZHdgdYp68VK7t18RqF nzkgOFQQVPub0QD/QtCl0YvGBahwrlj3moTSeC/8O1n39YuoOq4DdJB2UgQ= =w7jV -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 29 10:18:44 2022 Received: (at 60358) by debbugs.gnu.org; 29 Dec 2022 15:18:44 +0000 Received: from localhost ([127.0.0.1]:60876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAug7-0000JB-M4 for submit@debbugs.gnu.org; Thu, 29 Dec 2022 10:18:44 -0500 Received: from planete-kraus.eu ([89.234.140.182]:55254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAug4-0000Ix-An for 60358@debbugs.gnu.org; Thu, 29 Dec 2022 10:18:42 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a0170029; Thu, 29 Dec 2022 15:18:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= in-reply-to:references:from:date:subject:to:cc:message-id :mime-version; s=dkim; bh=TVcAFSsQXVmqgfSnmwOFfjLLsgA=; b=BbqNu6 sffdvhhT6xPvOuN5Neu7wUJJ+lhrbHQVJ+kTcgWeB+nAeXrRBRTYJFJACyv9CMzH EPAPUNpL6XPK+tBnc4f/KXRKXfcJWmTCza6sedXb8ZGiSRPdVIwEHHqsHly56Tct z+YQ/WfiSYm5N8gFpQSO7+u6Rh6l4UdBkq8l4= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id b84cb25e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 29 Dec 2022 15:18:29 +0000 (UTC) In-Reply-To: <87zgb6gsxs.fsf@josefsson.org> References: <87zgb6gsxs.fsf@josefsson.org> From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v3 1/2] gnu: Add gnulib. To: 60358@debbugs.gnu.org Message-ID: <6d918b9fb87e379766c1187c6ea7bd76d9842d6e.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 60358 Cc: Simon Josefsson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * 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(+) 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")) base-commit: 77d4bff94c6918eb0c0ccd20ee610e6dfc823aec -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 29 10:18:49 2022 Received: (at 60358) by debbugs.gnu.org; 29 Dec 2022 15:18:49 +0000 Received: from localhost ([127.0.0.1]:60879 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAugC-0000JS-58 for submit@debbugs.gnu.org; Thu, 29 Dec 2022 10:18:49 -0500 Received: from planete-kraus.eu ([89.234.140.182]:55254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAug8-0000Ix-QI for 60358@debbugs.gnu.org; Thu, 29 Dec 2022 10:18:46 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 7d216816; Thu, 29 Dec 2022 15:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= in-reply-to:references:from:date:subject:to:cc:message-id :mime-version; s=dkim; bh=sLmGVQ/eVZBg/cnlN9BtSKoQfus=; b=bqfqzX hS4BIN/tO8j9mw0e/3iBiZAXZJSVQZdsyed0F9D6qXXbGwlDyA8feWDO17boM7oF NRLWN16nZj3DqMM14/eBWVPWdMvYZ9XS2TAb5HB3Bay9riqF1wpmJ1bVpiVCXIdI wtXVcB+aapdUOQKNW3OkYTPJ3y7GLIfvhCvTY= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 9a83238d (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 29 Dec 2022 15:18:41 +0000 (UTC) In-Reply-To: <87zgb6gsxs.fsf@josefsson.org> References: <87zgb6gsxs.fsf@josefsson.org> From: Vivien Kraus Date: Wed, 28 Dec 2022 03:20:54 +0100 Subject: [PATCH v3 2/2] gnu: guile-gnutls: Update to 3.7.11. To: 60358@debbugs.gnu.org Message-ID: <0217a832b73fa21f3346e75385eb7d8d7e18edae.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 60358 Cc: Simon Josefsson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * 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..5bb0faaf64 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 + "2022-12-06" + "440b528b1d81dd31b2a2e4dde20d5c837c147811" + "15mq43abbnkbamchc9lynrvrd5ql8qacgyx2ph4kkngxf1bz3pqy") + git ; gnulib requires git even if nothing is downloaded. + )) (inputs (list gnutls-latest guile-3.0)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 29 10:25:57 2022 Received: (at 60358) by debbugs.gnu.org; 29 Dec 2022 15:25:57 +0000 Received: from localhost ([127.0.0.1]:60885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAun7-0000U7-GB for submit@debbugs.gnu.org; Thu, 29 Dec 2022 10:25:57 -0500 Received: from planete-kraus.eu ([89.234.140.182]:48370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAun5-0000Tx-EO for 60358@debbugs.gnu.org; Thu, 29 Dec 2022 10:25:56 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 9d5d1197; Thu, 29 Dec 2022 15:25:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:cc:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s=dkim; bh=phDlXAKsBqpWM5TbLQBcNzZ7Sw4=; b=YzshjgO+jj6WOHeuiAAvoGl0Sr6A Eo54jR8Wfq4813yecZYpC5rDwnxzztuqhSougBeAGzpXpMVS3+SXKOZne+8WSO2f tcWdtoxzxI5idtfbweCp5hTHCG5GJ7sVoAvJIF/j8m/BL9U0JL/TtG4w0jrGW2ve VC7CxALABOND6yg= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 14b36f9b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 29 Dec 2022 15:25:47 +0000 (UTC) Message-ID: <908a277ea2a4a68f03eecde19501d525f31d4341.camel@planete-kraus.eu> Subject: Re: [PATCH v3 2/2] gnu: guile-gnutls: Update to 3.7.11. From: Vivien Kraus To: Simon Josefsson Date: Thu, 29 Dec 2022 16:25:38 +0100 In-Reply-To: <0217a832b73fa21f3346e75385eb7d8d7e18edae.camel@planete-kraus.eu> References: <87zgb6gsxs.fsf@josefsson.org> <0217a832b73fa21f3346e75385eb7d8d7e18edae.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: 60358@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) TGUgbWVyY3JlZGkgMjggZMOpY2VtYnJlIDIwMjIgw6AgMDM6MjAgKzAxMDAsIFZpdmllbiBLcmF1 cyBhIMOpY3JpdMKgOgo+IEBAIC00MTIsNyArNDIxLDEzIEBAIChkZWZpbmUtcHVibGljIGd1aWxl LWdudXRscwo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgcGtnLWNvbmZpZwo+IMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgdGV4aW5mbwo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgZ251dGxzwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgO1hYWDogJ2d1aWxlLXNuYXJmJyBpbnZva2VzIHRo ZQo+IG5hdGl2ZSAnY3BwJwo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoCBndWlsZS0zLjApKQo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoCBndWlsZS0zLjAKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGdu dWxpYi1jaGVja291dAo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICIyMDIyLTEyLTA2Igo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgICI0NDBiNTI4YjFkODFkZDMxYjJhMmU0ZGRlMjBkNWM4Mzdj MTQ3ODExIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICIxNW1xNDNhYmJua2JhbWNoYzlseW5y dnJkNXFsOHFhY2d5eDJwaDRra25neGYxYnozcHF5IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqAg Z2l0IDsgZ251bGliIHJlcXVpcmVzIGdpdCBldmVuIGlmIG5vdGhpbmcgaXMgZG93bmxvYWRlZC4K PiArwqDCoMKgwqDCoMKgwqDCoMKgwqAgKSkKPiDCoMKgwqDCoCAoaW5wdXRzCj4gwqDCoMKgwqDC oCAobGlzdCBnbnV0bHMtbGF0ZXN0Cj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBndWlsZS0zLjAp KQoKSSBjYW4gc3RpbGwgcGljayBhbiBleGFjdCBjb21taXQgb2YgZ251bGliIChJIHdhcyBub3Qg YXdhcmUgdGhhdCBpdAp3b3VsZCBiZSByZXF1aXJlZCwgSSB0aG91Z2h0IHRoZSBtb3N0IGNvbW1v biBpZGVhIHdhcyAiZ2l2ZSBtZSBhbnkKdmVyc2lvbiBvZiBnbnVsaWIgbGF0ZXIgdGhhbiA8PiIp LiBBbmQgSSBkb27igJl0IGhhdmUgdG8gcGFja2FnZSBldmVyeQpjb21taXQgb2YgZ251bGliLCBi dXQgb25seSB0aG9zZSB0aGF0IGFyZSBhY3R1YWxseSB1c2VkLgoKSeKAmW0gbm90IHN1cmUgZ3Vp eCBwZW9wbGUgd2lsbCBiZSBoYXBweSB0byBoYXZlIGVhY2ggcGFja2FnZSB1c2UgYQpkaWZmZXJl bnRseSBvdXRkYXRlZCB2ZXJzaW9uIG9mIGdudWxpYiB0aG91Z2guCg== From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 29 10:38:02 2022 Received: (at 60358) by debbugs.gnu.org; 29 Dec 2022 15:38:02 +0000 Received: from localhost ([127.0.0.1]:60896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAuyo-0000mM-49 for submit@debbugs.gnu.org; Thu, 29 Dec 2022 10:38:02 -0500 Received: from uggla.sjd.se ([178.174.241.107]:56632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAuyl-0000m5-Di for 60358@debbugs.gnu.org; Thu, 29 Dec 2022 10:38:00 -0500 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=ed2110; h=Content-Type:MIME-Version:Message-ID:In-Reply-To :Date:References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding :Content-ID:Content-Description; bh=R/4rOObsuj/qWmMKkjvG5XpUpoEDAPROI5cBOdycupY=; t=1672328279; x=1673537879; b=fvyHqkJFBzqflQSsRRvqhbdeZJYCQAZSSTvoZGeKJI5nRkmPLkY0TRjpphwx5dq4N4EeiR86Pw6 EF5dTa/DuAA==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=rsa2110; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=R/4rOObsuj/qWmMKkjvG5XpUpoEDAPROI5cBOdycupY=; t=1672328279; x=1673537879; b=pJLZKUqm4NXXk7s2rsR61aQUL+gimL7xwxZU6rLoLk8GHyYwlFNmQ6fhOBi3xvKvmsxK9Lmatfn ydkAbBmT5A4lhNIPzPGE6OM0qayC/svaVR2rhCz4mI5VwT+4u468/+n60Lg+5265i81ULv0qjgd7P 8cpOvjNBCDa257V6FRMzCnVGvH82XShR5yv6bmGYMtZEngPYS+TVF3e9SoWn31Knd9V/H9jQBBIK4 fEH/wV6IDv2KCgPcsp/GpSwxXo61bgTe9W1r+R11jsMj9ytBjCLneLGzd/qvmp5VZtS6f1Oq6ORgk 8uy/NKPtB67KYziB7+rFAbeV8d3mRrH4KFGZJmEKT3Pa3S7XGzBDC0ZjEifzAOP8SPMuXB4kHiCqU oR8H0mMwrkLxdFd2j1zA3urZEDbOfF/HgBxrN4c3xYIcHumqWSqjUtDSYGig5kAHxBoChhMMH; Received: from [2001:9b1:41ac:ff00:be83:be22:3e7e:fd91] (port=40078 helo=kaka) by uggla.sjd.se with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pAuyi-009MVb-Ps; Thu, 29 Dec 2022 16:37:56 +0100 From: Simon Josefsson To: Vivien Kraus Subject: Re: [PATCH v3 2/2] gnu: guile-gnutls: Update to 3.7.11. References: <87zgb6gsxs.fsf@josefsson.org> <0217a832b73fa21f3346e75385eb7d8d7e18edae.camel@planete-kraus.eu> <908a277ea2a4a68f03eecde19501d525f31d4341.camel@planete-kraus.eu> OpenPGP: id=B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE; url=https://josefsson.org/key-20190320.txt X-Hashcash: 1:22:221229:vivien@planete-kraus.eu::VZZQrOQM/ok8MvYv:1Th3 X-Hashcash: 1:22:221229:60358@debbugs.gnu.org::kus3ePC+nuznvEf5:5b1d Date: Thu, 29 Dec 2022 16:37:56 +0100 In-Reply-To: <908a277ea2a4a68f03eecde19501d525f31d4341.camel@planete-kraus.eu> (Vivien Kraus's message of "Thu, 29 Dec 2022 16:25:38 +0100") Message-ID: <87o7rmgqzv.fsf@josefsson.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 60358 Cc: 60358@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Vivien Kraus writes: > Le mercredi 28 d=C3=A9cembre 2022 =C3=A0 03:20 +0100, Vivien Kraus a =C3= =A9crit=C2=A0: >> @@ -412,7 +421,13 @@ (define-public guile-gnutls >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pkg-c= onfig >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 texin= fo >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 gnutl= s=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 ;XXX: 'guile-snarf' invokes the >> native 'cpp' >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 guile-3.0)) >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 guile-3.0 >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (gnulib-ch= eckout >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "202= 2-12-06" >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "440= b528b1d81dd31b2a2e4dde20d5c837c147811" >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "15m= q43abbnkbamchc9lynrvrd5ql8qacgyx2ph4kkngxf1bz3pqy") >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 git ; gnul= ib requires git even if nothing is downloaded. >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 )) >> =C2=A0=C2=A0=C2=A0=C2=A0 (inputs >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (list gnutls-latest >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 guile= -3.0)) > > I can still pick an exact commit of gnulib (I was not aware that it > would be required, I thought the most common idea was "give me any > version of gnulib later than <>"). And I don=E2=80=99t have to package ev= ery > commit of gnulib, but only those that are actually used. > > I=E2=80=99m not sure guix people will be happy to have each package use a > differently outdated version of gnulib though. Interesting approach! I believe this works in Guix, and is also compatible with the way gnulib is intended to be used. However, doesn't this lead to a gazillion variants of gnulib being installed into /gnu/store, once all projects that use gnulib adopt this model in Guix? And built on the build servers, and downloaded via substitute servers? One gnulib for each particular commit that is used by each respective project that rely on gnulib. That sounds worse than having to download copies of gnulib when building a Guix package, which I thought was what you wanted to accomplish. /Simon --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIoEARYIADIWIQSjzJyHC50xCrrUzy9RcisI/kdFogUCY620VBQcc2ltb25Aam9z ZWZzc29uLm9yZwAKCRBRcisI/kdFoh8mAQD/Z0Em+fGgRbdRI3NBOIXfu3Kjarhq w0WsGqpgnVs3wQEA/AAPMq4Ik9yAzAXR5SXP4ACUJtHmyic94kzZN5sXnwA= =HW6g -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 29 10:56:27 2022 Received: (at submit) by debbugs.gnu.org; 29 Dec 2022 15:56:27 +0000 Received: from localhost ([127.0.0.1]:60905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAvGd-0001FN-Am for submit@debbugs.gnu.org; Thu, 29 Dec 2022 10:56:27 -0500 Received: from lists.gnu.org ([209.51.188.17]:60020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAvGZ-0001FD-Lt for submit@debbugs.gnu.org; Thu, 29 Dec 2022 10:56:24 -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 1pAvGZ-0000F3-GJ for guix-patches@gnu.org; Thu, 29 Dec 2022 10:56:23 -0500 Received: from uggla.sjd.se ([2001:9b1:8633::107]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAvGY-0004Js-1A for guix-patches@gnu.org; Thu, 29 Dec 2022 10:56:23 -0500 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=ed2110; h=Content-Type:MIME-Version:Message-ID:In-Reply-To :Date:References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding :Content-ID:Content-Description; bh=7FyQInq6hQGZH4vJOWmvH6gEVJjpaMAFLTD437a/dKE=; t=1672329381; x=1673538981; b=OFMjG51tCG4+B+/jlHmoeK/JwjVF99JeXEqc24WbSuasvWz388t97ah/vw7xMaUS5bEfa31277J iOxcvhwo9Cg==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=rsa2110; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=7FyQInq6hQGZH4vJOWmvH6gEVJjpaMAFLTD437a/dKE=; t=1672329381; x=1673538981; b=z+VcIiXEgZOYwiGFAJAL5k3fJZpdr5emUD7HwhsnXfYYJWkgIMA5HvjWeGoFvJdvdIZcC/IpCHR 8ONwtjitzbZdxGd1rVCgXK4sJkWQCBSkZ+x5gsRVckHCg/wHVf37oQ/W4OphgUTnZGJ4MaUJ/Ftys 8OT2RBVPD4G1QKAycf6r5t7pMymQeJq4vdGkw6tRE5ATYVwE9RV59Zm29u5zWk7m3wa4MnaqvusH8 u8MkI0kFtbM0g1dwyscV67qWplh8/4JAR05fWfH9vED0DWhTBA5OurixBXSCsWNXsJZ7ogUqtvVve mrTHEuGY1jryKtNyunUOSxqIxuj4cijo9mn6pRwBVHGmvwM6uUIbakmUinkBvc/B5bwmz+mcFWT5+ PN553I8g2eJHprU7yPigdiStpWy6GPyUPLCWe9c2N/DMpqpJ2dkxQTFA7/xKQiz4uQLn5iBfj; Received: from [2001:9b1:41ac:ff00:be83:be22:3e7e:fd91] (port=40570 helo=kaka) by uggla.sjd.se with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pAvGT-009Nys-Kp; Thu, 29 Dec 2022 16:56:17 +0100 From: Simon Josefsson To: Simon Josefsson via Guix-patches via Subject: Re: [bug#60358] [PATCH] gnu: Add gnulib. References: <87h6xgzny7.fsf@josefsson.org> <874jtei81v.fsf@josefsson.org> OpenPGP: id=B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE; url=https://josefsson.org/key-20190320.txt X-Hashcash: 1:22:221229:60358@debbugs.gnu.org::GQEgEyPcIkfnb0Ny:4AGV X-Hashcash: 1:22:221229:vivien@planete-kraus.eu::7CMet0DDjQ3Q9yBw:4FXT X-Hashcash: 1:22:221229:guix-patches@gnu.org::JtQroDqPxyRMLamn:GDd9 Date: Thu, 29 Dec 2022 16:56:17 +0100 In-Reply-To: <874jtei81v.fsf@josefsson.org> (Simon Josefsson via Guix-patches via's message of "Thu, 29 Dec 2022 15:44:12 +0100") Message-ID: <87k02agq5a.fsf@josefsson.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=2001:9b1:8633::107; envelope-from=simon@josefsson.org; helo=uggla.sjd.se X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: 60358@debbugs.gnu.org, vivien@planete-kraus.eu X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Simon Josefsson via Guix-patches via writes: > Doesn't 'git archive' produce a reproducible output from a git > repository for a particular branch and commit? Sorry, git-archive that doesn't include the .git/ sub-directory, so that's not the command you want. I don't know what command you would use. I reckon it should be a git clone, check out a particular commit, reset the branch to that commit, filtering away all other branches, and then do 'git gc --aggresive --prune=now'. If that produces unreproducable results for other unrelated changes to the repository, it would be nice to know how to get rid of them. /Simon --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIoEARYIADIWIQSjzJyHC50xCrrUzy9RcisI/kdFogUCY624oRQcc2ltb25Aam9z ZWZzc29uLm9yZwAKCRBRcisI/kdFosniAQCLwTwFtnpepEKejYBGXszMahCcOZuj OrQFD+vYBcSBYQD+ISdvVZAho1Lh3rRtLvaOYQz+ECkzEhrALlZ5quUleA0= =NZAy -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 29 11:06:50 2022 Received: (at 60358) by debbugs.gnu.org; 29 Dec 2022 16:06:50 +0000 Received: from localhost ([127.0.0.1]:60923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAvQg-0001Wp-6P for submit@debbugs.gnu.org; Thu, 29 Dec 2022 11:06:50 -0500 Received: from planete-kraus.eu ([89.234.140.182]:40404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAvQd-0001We-Ob for 60358@debbugs.gnu.org; Thu, 29 Dec 2022 11:06:48 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e01f2fe5; Thu, 29 Dec 2022 16:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:cc:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s=dkim; bh=hC75SREZC7YdyED3tPfideRhlsA=; b=IIigRNQ2EU+9s9ckxkVFA95OMpKW 3ue9c74QyGkjlozZVwU2PbXrgDJTD6XF65UqxaJr+mECdd/9fvkzE85hsS+yc+qr 0EELxXNHuHQI1N8c/Jo2xe2KjVuWIErnf5VmZuE2Kwd7uBVcWNT320bMIP4b78Ge WWsKbTnvvmgbWVY= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id c6c33899 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 29 Dec 2022 16:06:42 +0000 (UTC) Message-ID: Subject: Re: [PATCH v3 2/2] gnu: guile-gnutls: Update to 3.7.11. From: Vivien Kraus To: Simon Josefsson Date: Thu, 29 Dec 2022 17:06:41 +0100 In-Reply-To: <87o7rmgqzv.fsf@josefsson.org> References: <87zgb6gsxs.fsf@josefsson.org> <0217a832b73fa21f3346e75385eb7d8d7e18edae.camel@planete-kraus.eu> <908a277ea2a4a68f03eecde19501d525f31d4341.camel@planete-kraus.eu> <87o7rmgqzv.fsf@josefsson.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: 60358@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le jeudi 29 d=C3=A9cembre 2022 =C3=A0 16:37 +0100, Simon Josefsson a =C3=A9= crit=C2=A0: > One gnulib for each particular commit that is used > by each respective project that rely on gnulib. Yes, but a shallow checkout of gnulib. If I packaged the whole git archive (if I could do it reliably), that would bring the checkouts for all commits in gnulib, used or not. Granted, compressed. > That sounds worse than > having to download copies of gnulib when building a Guix package >From what I understand, the idea in guix would be: yes that would be horrible, the solution is for every project to use the same version of gnulib! From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 29 11:14:40 2022 Received: (at 60358) by debbugs.gnu.org; 29 Dec 2022 16:14:40 +0000 Received: from localhost ([127.0.0.1]:60931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAvYG-0001mi-2A for submit@debbugs.gnu.org; Thu, 29 Dec 2022 11:14:40 -0500 Received: from uggla.sjd.se ([178.174.241.107]:47640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAvYD-0001mT-GS for 60358@debbugs.gnu.org; Thu, 29 Dec 2022 11:14:38 -0500 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=ed2110; h=Content-Type:MIME-Version:Message-ID:In-Reply-To :Date:References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding :Content-ID:Content-Description; bh=7gat2fwAqar1rswfz+FeA08vJddmKodYQARk+5toXAI=; t=1672330477; x=1673540077; b=dlIZjmUXVONmbiKiUwLh9QsdsIkpKXAsuV9UQwPKQ3+fg7TaQfhiwrlzBJ/cM8Is+jE9XpxNUTx bP63618MFAw==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=rsa2110; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=7gat2fwAqar1rswfz+FeA08vJddmKodYQARk+5toXAI=; t=1672330477; x=1673540077; b=LZiaf3m3zKZd2xEup+jqSnf9olkP8KNAEbeJnbzg7W/dyFs46PaXZXQGyKGu2hyBoniULB6MPz0 P/Q/Q/KLpSUot3PNG5Hzz0SmqgVnG39BJA4UQj/OGvVOlGHKBX+cd1SJ9sQEZYmQMDfqguAwql1/o JEAJoVyKRshNJsWO6YTA4muAUpGSrgFomYOMzL1U/BQXxMVVFUudpvlRc65fdvIbcPoRFoNKqXEf9 6yzMw+zD1I6DCKd7bLTU/KFcgRfQ0WpJaNM8nMKnnPZswj5iuuhzEfUFiHXJTxyG8fsrLPAKU7gDQ oUQYoRRx8LKXFmy67WYEEdWx87g8abWTNYTRaKdppYxcaKfFgxkMbX2NTN0kJaVEOLD68EbIuN/M0 0Ff16TxiX+c46rFFaIPiBrA57V2QUdUUlulo+L7z3vbbFzMTAY5NOyfFT7/CVh3s63K6RhNWZ; Received: from [2001:9b1:41ac:ff00:be83:be22:3e7e:fd91] (port=44730 helo=kaka) by uggla.sjd.se with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pAvY8-009P51-U9; Thu, 29 Dec 2022 17:14:32 +0100 From: Simon Josefsson To: Vivien Kraus Subject: Re: [PATCH v3 2/2] gnu: guile-gnutls: Update to 3.7.11. References: <87zgb6gsxs.fsf@josefsson.org> <0217a832b73fa21f3346e75385eb7d8d7e18edae.camel@planete-kraus.eu> <908a277ea2a4a68f03eecde19501d525f31d4341.camel@planete-kraus.eu> <87o7rmgqzv.fsf@josefsson.org> OpenPGP: id=B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE; url=https://josefsson.org/key-20190320.txt X-Hashcash: 1:22:221229:60358@debbugs.gnu.org::EUs+rY7r3h1XR3WB:9nji X-Hashcash: 1:22:221229:vivien@planete-kraus.eu::tZYPJQCG7DgWPE8Z:Gv2r Date: Thu, 29 Dec 2022 17:14:32 +0100 In-Reply-To: (Vivien Kraus's message of "Thu, 29 Dec 2022 17:06:41 +0100") Message-ID: <87fscygpav.fsf@josefsson.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 60358 Cc: 60358@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Vivien Kraus writes: >> That sounds worse than >> having to download copies of gnulib when building a Guix package > From what I understand, the idea in guix would be: yes that would be > horrible, the solution is for every project to use the same version of > gnulib! That won't happen and is impossible -- while I don't have an example, in general you can't build an old version of, say, coreutils with today's gnulib, or expect that a future version of coreutils will work with today's gnulib. I'm sure trying old enough coreutils, or some other project that use gnulib, will come up with an example that breaks the build (or produce incorrect results). /Simon --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIoEARYIADIWIQSjzJyHC50xCrrUzy9RcisI/kdFogUCY6286BQcc2ltb25Aam9z ZWZzc29uLm9yZwAKCRBRcisI/kdFohuEAQCamU2qi06zlSkJ6F31nAnmtw1Y1k/G I9J6DraQgoM3dwEAixNVoDSAVZXdJfQvrEKD30Q7jAkhqCAZ34n1afcfLQw= =7XFl -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 29 15:02:18 2022 Received: (at 60358) by debbugs.gnu.org; 29 Dec 2022 20:02:18 +0000 Received: from localhost ([127.0.0.1]:32980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAz6Y-0006tB-9u for submit@debbugs.gnu.org; Thu, 29 Dec 2022 15:02:18 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:38431) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAz6U-0006sw-St for 60358@debbugs.gnu.org; Thu, 29 Dec 2022 15:02:16 -0500 Received: by mail-wm1-f66.google.com with SMTP id fm16-20020a05600c0c1000b003d96fb976efso11800022wmb.3 for <60358@debbugs.gnu.org>; Thu, 29 Dec 2022 12:02:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=0V1jPCWCPm2W/EdFfTbPMALyaFFxTfYH0es5HyW8on8=; b=pH3cAeD0cDcaL7g14qoqHc1Kk2bQK+ksSztHq/0hu9zlhrNnXlR7QhY64w/+9oL1wp 9fLJT9f+OtBvHvatt7BU9eh0chVe211sCzxEMdqTHeawDHx7jT6eS85+dKOcVBMBbjxK 2WFEjvitfnA4OB4oRQGxoqQU1pW6pBwyiBnus9txAJ+AZTLxuMekve6vdW6yz7as3rEV V/RxIf/zkcA3RCEW103XpI1/6l6aBQ2fT2DotkvA1pPmiH816r6DGAcfc+MsTQBTedmq bbfKhDuHw8C8CAt1KQec1IiapEIgUmzFftvCEWFMGaakdr6lwyrJdivphv1Wy2GkmSsm jvAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=0V1jPCWCPm2W/EdFfTbPMALyaFFxTfYH0es5HyW8on8=; b=VER6wyBq74c2q+V+JhGKz1u3cImuVcnb6y5YaAnedTMVkuxBUMzRGOMJFS3PpU9ZDJ OD6Au0wiap4hBzhpullA/bDSYfSw+eBnoumKm+myUTFmss8oWnTL2pLea8UhhwpqEpCF i7nJTX3leacdLLfbNL8QohiYfFkGyvAA6Cp0FsP2uFlCSDYIsNCu+KPhs+ts3rl6u9eh 9PiN5BaYYhp65PFua/4iThZzuGMtE5Sb9b7dLE4aFghfam6TKy2Fsa/yTscjV3tFLvp/ qts89QZWwL7ijtLHQTrPkXnRRambYvsm3mpuzeFCdU8vEFTcc4HGUy0WOdera4HvGgnY ECSw== X-Gm-Message-State: AFqh2ko3T1CWv8Niv/ojYX3ADfie+9hkDr2vNMskk6n9UBTOKh7OJlgt q5FN8oZT9T6R4VbZK7naFkk= X-Google-Smtp-Source: AMrXdXsi92IAyegrnEvfJnBsUZU5jf708Uc1oDBSP3axS1ZjtZZDkUHwdgu81W+cf559rVROP1FgMQ== X-Received: by 2002:a05:600c:2e44:b0:3d3:4406:8a3c with SMTP id q4-20020a05600c2e4400b003d344068a3cmr20877133wmf.32.1672344128939; Thu, 29 Dec 2022 12:02:08 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w14-20020adfee4e000000b002422bc69111sm22604032wro.9.2022.12.29.12.02.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 12:02:08 -0800 (PST) Message-ID: <489abf355b4a607ca6d152edc94756824c7edb0e.camel@gmail.com> Subject: Re: [PATCH v3 1/2] gnu: Add gnulib. From: Liliana Marie Prikler To: Vivien Kraus , 60358@debbugs.gnu.org Date: Thu, 29 Dec 2022 21:02:07 +0100 In-Reply-To: <6d918b9fb87e379766c1187c6ea7bd76d9842d6e.camel@planete-kraus.eu> References: <87zgb6gsxs.fsf@josefsson.org> <6d918b9fb87e379766c1187c6ea7bd76d9842d6e.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Simon Josefsson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 27.12.2022 um 17:23 +0100 schrieb Vivien Kraus: > * gnu/packages/build-tools.scm (gnulib): New variable. > (gnulib-checkout): New function. It returns a package with a specific > commit > of gnulib. > --- > =C2=A0gnu/packages/build-tools.scm | 58 > ++++++++++++++++++++++++++++++++++++ > =C2=A01 file changed, 58 insertions(+) >=20 > 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) > =C2=A0=C2=A0 #:use-module (guix gexp) > =C2=A0=C2=A0 #:use-module (guix download) > =C2=A0=C2=A0 #:use-module (guix git-download) > +=C2=A0 #:use-module (guix git) > =C2=A0=C2=A0 #:use-module (guix build-system cmake) > =C2=A0=C2=A0 #:use-module (gnu packages) > =C2=A0=C2=A0 #:use-module (gnu packages adns) > @@ -48,11 +49,13 @@ (define-module (gnu packages build-tools) > =C2=A0=C2=A0 #:use-module (gnu packages cpp) > =C2=A0=C2=A0 #:use-module (gnu packages elf) > =C2=A0=C2=A0 #:use-module (gnu packages linux) > +=C2=A0 #:use-module (gnu packages lisp) > =C2=A0=C2=A0 #:use-module (gnu packages logging) > =C2=A0=C2=A0 #:use-module (gnu packages lua) > =C2=A0=C2=A0 #:use-module (gnu packages ninja) > =C2=A0=C2=A0 #:use-module (gnu packages package-management) > =C2=A0=C2=A0 #:use-module (gnu packages pcre) > +=C2=A0 #:use-module (gnu packages perl) > =C2=A0=C2=A0 #:use-module (gnu packages pkg-config) > =C2=A0=C2=A0 #:use-module (gnu packages pretty-print) > =C2=A0=C2=A0 #:use-module (gnu packages protobuf) > @@ -803,3 +806,58 @@ (define-public genie > =C2=A0same settings to multiple projects.=C2=A0 It supports generating pr= ojects > using GNU > =C2=A0Makefiles, JSON Compilation Database, and experimentally Ninja.") > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (license license:bsd-3)))) > + > +(define-public (gnulib-checkout gl-version gl-commit gl-hash) You should probably use keyword arguments here. Also, don't bother prefixing things, the shadowing rules in Guix are well-defined. > +=C2=A0 "Return as a package the exact gnulib checkout." > +=C2=A0 (package > +=C2=A0=C2=A0=C2=A0 (name "gnulib") > +=C2=A0=C2=A0=C2=A0 (version (git-version gl-version "1" gl-commit)) Allow the user to specify revision, defaulting to "1". > +=C2=A0=C2=A0=C2=A0 (source > +=C2=A0=C2=A0=C2=A0=C2=A0 (origin > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (method git-fetch) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (uri (git-reference > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= (url "https://git.savannah.gnu.org/git/gnulib.git") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= (commit gl-commit))) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (file-name (git-file-name name vers= ion)) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (sha256 (base32 gl-hash)))) While it's more typing effort, move base32 outside for that compile- time expansion. > +=C2=A0=C2=A0=C2=A0 (build-system gnu-build-system) > +=C2=A0=C2=A0=C2=A0 (arguments > +=C2=A0=C2=A0=C2=A0=C2=A0 (list > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #:phases > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #~(modify-phases %standard-phases > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (delete 'configur= e) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (replace 'install > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (lamb= da _ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 (install-file "gnulib-tool" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (string-append #$output "/bin")) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 (copy-recursively "." > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #$output > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "/share/gnulib/" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #$gl-commit))))) See [*] below. > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #:tests? #f)) ;; Tests are syntax and ind= entation checks for > the > +=C2=A0=C2=A0=C2=A0 ;; maintainer. IMHO, we should still run tests unless they significantly complicate packaging.=20 > +=C2=A0=C2=A0=C2=A0 (inputs ;; Shebangs for some auxiliary build files. > +=C2=A0=C2=A0=C2=A0=C2=A0 (list python perl clisp)) > +=C2=A0=C2=A0=C2=A0 (home-page "https://www.gnu.org/software/gnulib/") > +=C2=A0=C2=A0=C2=A0 (synopsis "Source files to share among distributions"= ) > +=C2=A0=C2=A0=C2=A0 (description > +=C2=A0=C2=A0=C2=A0=C2=A0 "Gnulib is a central location for common infras= tructure needed > by GNU > +packages.=C2=A0 It provides a wide variety of functionality, e.g., > portability > +across many systems, working with Unicode strings, cryptographic > computation, > +and much more.=C2=A0 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.=C2=A0 The included @command{gnulib-tool} script helps with > using Gnulib > +code in other packages.=C2=A0 Gnulib also includes copies of licensing > and > +maintenance-related files, for convenience.") > +=C2=A0=C2=A0=C2=A0 (native-search-paths > +=C2=A0=C2=A0=C2=A0=C2=A0 (list (search-path-specification > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (vari= able "GNULIB_SRCDIR") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (file= s (list (string-append "share/gnulib/" gl- > commit)))))) [*] Rather than installing the library to an always different location and using an environment variable to bind it, I'd suggest using a fixed location, such as #$output/src/gnulib, so that consuming packages can use --gnulib-srcdir=3D#$(search-input-directory %build-inputs "src/gnulib") > +=C2=A0=C2=A0=C2=A0 (license (list license:lgpl2.0+ license:gpl3+)))) > + Furthermore, quite a number of gnulib appears to have been automatically generated. Can we do a proper bootstrap? :) Cheers From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 30 06:44:28 2022 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) From: Vivien Kraus Date: Wed, 28 Dec 2022 03:20:54 +0100 Subject: [PATCH v4 3/3] gnu: guile-gnutls: Update to 3.7.11. To: 60358@debbugs.gnu.org Message-ID: <05e97925f12bd082c00864fe55e51372eebceaa5.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 30 06:44:33 2022 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) From: Vivien Kraus Date: Fri, 30 Dec 2022 12:30:54 +0100 Subject: [PATCH v4 2/3] gnu: gnulib: Enable tests. To: 60358@debbugs.gnu.org Message-ID: <5447da6c7608ffc02eec8ecfd83f9e7d78a29926.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 30 06:44:33 2022 Received: (at 60358) by debbugs.gnu.org; 30 Dec 2022 11:44:33 +0000 Received: from localhost ([127.0.0.1]:33650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBDoP-0005Ie-Ce 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 1pBDoJ-0005Hz-Ov for 60358@debbugs.gnu.org; Fri, 30 Dec 2022 06:44:28 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 5233aec9; Fri, 30 Dec 2022 11:44:23 +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=xl1U1RNJ T3U2fJXIQ1ALpV8Bmn8=; b=k5E1iBJrm767F6imDIIuY7k3Hw6LvHg3g9Z2Yak0 r0T+/zoAsr4Ntx4S+93pNBgNdW9FsnWoj9bg7YOXWCxEUMDTPTsnKz4k7jYUgPu/ 3bKHozOtlr6PgDzWIKVhNQgnWVw3avX4x4SMjUNbFSpOy8khzA4F06S76YeeHgx7 KLM= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id e45d1633 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 30 Dec 2022 11:44:22 +0000 (UTC) From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v4 1/3] gnu: Add gnulib. To: 60358@debbugs.gnu.org Message-ID: <45c0f87031004dcca08c98161fd021787c3ab3de.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 | 59 ++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..bde4ee0973 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,12 +32,14 @@ ;;; 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) #: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 +50,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 +807,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 #: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))) + (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 "/src/gnulib/"))))) + #:tests? #f)) ;; Tests are syntax and indentation checks for the + ;; maintainer. And they are failing. + (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 "src/gnulib"))))) + (license (list license:lgpl2.0+ license:gpl3+)))) + +(define-public gnulib + (gnulib-checkout + #:version "2022-12-28" + #:commit "14a7b0ce5462c90ce86d97bf952185ec2500d341" + #:hash (base32 "0fz25ccdlxf4xp37rjsl1fslc4g0x12qpvadz4qw0cq18dvx5kbx"))) base-commit: 01762b7171f9afaf7ffa364f7926461bdebc903f -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 30 06:45:47 2022 Received: (at 60358) by debbugs.gnu.org; 30 Dec 2022 11:45:47 +0000 Received: from localhost ([127.0.0.1]:33656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBDpa-0005LG-W5 for submit@debbugs.gnu.org; Fri, 30 Dec 2022 06:45:47 -0500 Received: from planete-kraus.eu ([89.234.140.182]:46712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBDpZ-0005L8-6x for 60358@debbugs.gnu.org; Fri, 30 Dec 2022 06:45:45 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 16bf529d; Fri, 30 Dec 2022 11:45:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:cc:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s=dkim; bh=Dkg2vG/+UYRCM7Yqj0pAXXH6krw=; b=iucqhU5wwRWghaLixBiCbYGLZe7C WWvye5f0lgLlxfQzS1jkzBkQUMj+sx3+AcaWq44AOCLuYBs4wzGda+z0b03cLmSo h+iivyxRP6yttNNGDK+qcNpeTxG4Fk17pn8SrqgppYpU1crIvPshPVRZEwI/jAMv vliezPhjV0G6f3Y= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 675db93a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 30 Dec 2022 11:45:41 +0000 (UTC) Message-ID: <9cd5953a7e470ce1fb49e6c07f66184d8714224b.camel@planete-kraus.eu> Subject: Re: [PATCH v3 1/2] gnu: Add gnulib. From: Vivien Kraus To: Liliana Marie Prikler , 60358@debbugs.gnu.org Date: Fri, 30 Dec 2022 12:45:39 +0100 In-Reply-To: <489abf355b4a607ca6d152edc94756824c7edb0e.camel@gmail.com> References: <87zgb6gsxs.fsf@josefsson.org> <6d918b9fb87e379766c1187c6ea7bd76d9842d6e.camel@planete-kraus.eu> <489abf355b4a607ca6d152edc94756824c7edb0e.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Simon Josefsson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Le jeudi 29 d=C3=A9cembre 2022 =C3=A0 21:02 +0100, Liliana Marie Prikler a =C3=A9crit=C2=A0: > Furthermore, quite a number of gnulib appears to have been > automatically generated.=C2=A0 Can we do a proper bootstrap? :) Could you give an example? I think I remember that gnulib sources are taken from glibc, is it what you mean? Best regards, Vivien From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 30 14:35:58 2022 Received: (at 60358) by debbugs.gnu.org; 30 Dec 2022 19:35:58 +0000 Received: from localhost ([127.0.0.1]:36128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBLAc-0000Z7-Jx for submit@debbugs.gnu.org; Fri, 30 Dec 2022 14:35:58 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:34648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBLAb-0000Yu-Bm for 60358@debbugs.gnu.org; Fri, 30 Dec 2022 14:35:57 -0500 Received: by mail-ej1-f66.google.com with SMTP id t17so53090844eju.1 for <60358@debbugs.gnu.org>; Fri, 30 Dec 2022 11:35:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=rXfnCFUeZVmNzhj22d520RWAHfw55sqYWAbctfIOQLc=; b=GGcrl84Etg8NxIa+EPm4Kok704qlHQy4voOgt81pirkIyAV394imKs6ntxv7KDmm0r H+Eefp3ERmKtaD53PXpmNG/VRgITk9w+7ZTwbQK+pMDPT6+kTz1cnAUhLQlqtepRtW4b dDCm5eWnte5ZUdtHYD3g/2mCx7ug/V+mlULXxoRr7OHKmFZAZZF2QGQvOEOPOEgHqAQN j0UHQFMxJ8psUwzFg1YO2jviVPnkSOXDc2RXL1tZx5lLRhymy/kYjaMds7igKRvy30Nf 5Ve4xtndeE1E0mVlY6NWi43MAFpk/YqouPd7d5goWpn+AmAbsGqZv5UEca1Xu2WfJi67 jLLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=rXfnCFUeZVmNzhj22d520RWAHfw55sqYWAbctfIOQLc=; b=L5INVIpkTb/JE6rhkIzV989Qq3QPHCxe7SzBFa0w6OB+HWeCLxmq21gAHz8cQvajyi EvVllPBNNompNE3gI6qc7qa47ENJOusG/BORXW4HQ+zbHx4XGqyPi7JrH9BNS8shdK3V 5Fxp9XJEbn1Mz1qELF/V70eyL8EP/En5LBhrPXAbsqnQeECIBKSF4q5tU8k5Lh3HZyiv gcOBkgg75jyVxxfkFBxy3z+uDEcSyjA2S++5fMRjRq6IaWKCSuWQ0Dg2kHbEU6rANNBt imNuO2TD2XBcpwypPw+QsCb/3TFJMy5SeNA+Vl7IksH7JkoRVZ0ydmvQscz7ilzQnb0u w9ng== X-Gm-Message-State: AFqh2krywmepBehzGaJe7xNrvNbCps212my+pbCe+i8XXg3lnuwUoXqB WL9aQx9Titt87EjXC73XU6fyxb4E+tA= X-Google-Smtp-Source: AMrXdXuFqGDzSAGDrdLASceISSIG5VamcnlOpnQTHr+IJWbWTOulhyXhO6Z2w4zpIPJuXG7bSXhtbQ== X-Received: by 2002:a17:906:d047:b0:7b9:62ab:dc3f with SMTP id bo7-20020a170906d04700b007b962abdc3fmr34693077ejb.1.1672428951160; Fri, 30 Dec 2022 11:35:51 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id 15-20020a170906328f00b0084c4b87aa18sm6910379ejw.37.2022.12.30.11.35.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Dec 2022 11:35:50 -0800 (PST) Message-ID: <5e051f3664ee170fdae2d11fbc55e70964d11484.camel@gmail.com> Subject: Re: [PATCH v3 1/2] gnu: Add gnulib. From: Liliana Marie Prikler To: Vivien Kraus , 60358@debbugs.gnu.org Date: Fri, 30 Dec 2022 20:35:49 +0100 In-Reply-To: <9cd5953a7e470ce1fb49e6c07f66184d8714224b.camel@planete-kraus.eu> References: <87zgb6gsxs.fsf@josefsson.org> <6d918b9fb87e379766c1187c6ea7bd76d9842d6e.camel@planete-kraus.eu> <489abf355b4a607ca6d152edc94756824c7edb0e.camel@gmail.com> <9cd5953a7e470ce1fb49e6c07f66184d8714224b.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Simon Josefsson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 30.12.2022 um 12:45 +0100 schrieb Vivien Kraus: > Hello, >=20 > Le jeudi 29 d=C3=A9cembre 2022 =C3=A0 21:02 +0100, Liliana Marie Prikler = a > =C3=A9crit=C2=A0: > > Furthermore, quite a number of gnulib appears to have been > > automatically generated.=C2=A0 Can we do a proper bootstrap? :) >=20 > Could you give an example? I think I remember that gnulib sources are > taken from glibc, is it what you mean? grep -iR "do not edit" $(./pre-inst-env guix build -S gnulib) Some of the matches are emitters, but many of them are emitted comments. Cheers From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 30 17:38:01 2022 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) From: Vivien Kraus Date: Wed, 28 Dec 2022 03:20:54 +0100 Subject: [PATCH v5 5/5] gnu: guile-gnutls: Update to 3.7.11. To: 60358@debbugs.gnu.org Message-ID: <2fb8065d7f7e08dbc2bd71d05b03c82c43815ca2.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 30 17:38:05 2022 Received: (at 60358) by debbugs.gnu.org; 30 Dec 2022 22:38:05 +0000 Received: from localhost ([127.0.0.1]:36235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBO0q-0005ME-To for submit@debbugs.gnu.org; Fri, 30 Dec 2022 17:38:05 -0500 Received: from planete-kraus.eu ([89.234.140.182]:35938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBO0l-0005LH-Qu for 60358@debbugs.gnu.org; Fri, 30 Dec 2022 17:38:01 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id dd7f1003; Fri, 30 Dec 2022 22:37:56 +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=aBQqjdDGTfFi7if2/fMi5SY9WaBuTooJFF0jZ+1w /wu1Msm3xexQZHvoG2f9RP9phS43yTnphOaeZWWTjpzKPPMtE66aex7+WAYv004y Er+VT9rYhFxn2+aeU+jNzAePBUDgR+sTOUbHl+n3U7mrJqLPVkYzUhD94TzYWtsX MnQ= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 44871be6 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 30 Dec 2022 22:37:56 +0000 (UTC) From: Vivien Kraus Date: Fri, 30 Dec 2022 12:30:54 +0100 Subject: [PATCH v5 2/5] gnu: gnulib: Enable tests. To: 60358@debbugs.gnu.org Message-ID: MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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-tes [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 30 17:38:09 2022 Received: (at 60358) by debbugs.gnu.org; 30 Dec 2022 22:38:09 +0000 Received: from localhost ([127.0.0.1]:36238 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBO0v-0005MU-D2 for submit@debbugs.gnu.org; Fri, 30 Dec 2022 17:38:09 -0500 Received: from planete-kraus.eu ([89.234.140.182]:35938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBO0p-0005LH-8h for 60358@debbugs.gnu.org; Fri, 30 Dec 2022 17:38:04 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 393470d6; Fri, 30 Dec 2022 22:38:01 +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=rmf7w5Gu m0nqQkemU1c8wY13vAI=; b=ChP668Um7spzWnl9K3EiXT8ATQ7IWSkshYkj8/Vk FbForOZ3frPb9FsHp2k/iZcpyvgBkCaW7lzjRYrXLSqKYv8xBu2QFP5VXAK6c+Uk l7XH02MvJh57kE0i42Z/eui8++GU2gqtn1iXPmjFrKenY2AhaWAyajbXLLh62HNU 0PA= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id c5e29c80 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 30 Dec 2022 22:38:01 +0000 (UTC) From: Vivien Kraus Date: Fri, 30 Dec 2022 22:20:30 +0100 Subject: [PATCH v5 3/5] gnu: UCD: Add version 3.0-update1. To: 60358@debbugs.gnu.org Message-ID: <36a8b51d628dab1706ed903db57eb1be1abbee1f.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/unicode.scm (ucd3.0-update1): New variable. --- gnu/packages/unicode.scm | 59 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index bda0de04cc..66340721e3 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -21,13 +21,15 @@ (define-module (gnu packages unicode) #:use-module (gnu packages autotools) #:use-module (guix git-download) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial)) + #:use-module (guix build-system trivial) + #:use-module (ice-9 match)) (define-public libunibreak (package @@ -112,6 +114,61 @@ (define-public ucd-next (base32 "001nq9w52ijma0vps40xwy2q6ylpyf1393lzb128ibypnmv54fh3")))))) +(define-public ucd3.0-update1 + (package + (inherit ucd) + (version "3.0-update1") + (source + ;; unicode.org does not provide a zipped archive. + (directory-union + "ucd-3.0-update1-source" + (map + (match-lambda + ((filename . hash) + (file-union + (string-append "ucd-3.0-update1-" filename) + `((,filename + ,(origin + (method url-fetch) + (uri (string-append "https://www.unicode.org/Public/3.0-Update1/" filename)) + (sha256 hash))))))) + `(("ArabicShaping-3.txt" + . ,(base32 + "0k6hwdnln8cwkzixxbbc6q5g3nx3z5p1549c0jicnz7gq2mvkh90")) + ("BidiMirroring-1.txt" + . ,(base32 + "0wc5gj6mx5wjkwph734swqd3zvi3ngfx75yybbc1f52dc1l3sh9m")) + ("CaseFolding-2.txt" + . ,(base32 + "143hvpalrnkrxc2g9626v6w4cgmksg9hkcm39fpmqidn0rnpm8vy")) + ("CompositionExclusions-2.txt" + . ,(base32 + "06vlc7yqhkacbb411ykyn4na5kq93yp0p9mm3a2jfixk704nwpj1")) + ("Jamo-3.txt" + . ,(base32 + "092lww4ak9wa7g4jn80i9ckniwg3ymmiaq62xxhhbwk3cx2d23ad")) + ("NormalizationTest-3.0.1.txt" + . ,(base32 + "1r5vq8dlar7km1376bp16l40pyczzvwk9waxgin2i2432qdpwmga")) + ("PropList-3.0.1.txt" + . ,(base32 + "0k6wyijyzdl5g3nibcwfm898kfydx1pqaz28v7fdvnzdvd5fz7lh")) + ("ReadMe-3.0.1.txt" + . ,(base32 + "08mkcs3r1caj67wrcqq0gyb79zj9qyqnmx8qab0rsd4qg87xhnbv")) + ("SpecialCasing-3.txt" + . ,(base32 + "08vrf0kk5zlsl40h4nsfbpnckl4610m7x2072lyq97lln7dsky7a")) + ("UnicodeCharacterDatabase-3.0.1.html" + . ,(base32 + "0fy7vb1zkxg2pg198p7phncjs78gz6lvdzhv51yz34kds8nzz40m")) + ("UnicodeData-3.0.1.html" + . ,(base32 + "0fvv59ydp09mppjr8130kmp90r240hnaqld8i5xkpz900fl20pc1")) + ("UnicodeData-3.0.1.txt" + . ,(base32 + "092svm19f78pxg58pcisg3i57884y7z22rymrcppjkg6sz3izsia")))))))) + (define (unicode-emoji-file name version hash) (origin (method url-fetch) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 30 17:38:14 2022 Received: (at 60358) by debbugs.gnu.org; 30 Dec 2022 22:38:14 +0000 Received: from localhost ([127.0.0.1]:36240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBO0z-0005Mg-Tt for submit@debbugs.gnu.org; Fri, 30 Dec 2022 17:38:14 -0500 Received: from planete-kraus.eu ([89.234.140.182]:35938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBO0u-0005LH-7D for 60358@debbugs.gnu.org; Fri, 30 Dec 2022 17:38:08 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 72894fb7; Fri, 30 Dec 2022 22:38:06 +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=Dxw6w6K2 79cB8AgxkXIUNqlTE8E=; b=wnUajwnFOvE2tY2T0BGOKBByLXneJR+jSHZko0S7 4m9iQkPIGI9Y4eef3OIDK605+PxTT5G2+UcSykQHZ6EThD/LmIopVEjwyPHJ7Ynn yoKzVSUqvbqV5Ixi88utz+MZL970eJVoxAUZdPI6gW0VtcqQXrwotlCLYHtuDA+s cI4= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 772b2025 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 30 Dec 2022 22:38:05 +0000 (UTC) From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v5 1/5] gnu: Add gnulib. To: 60358@debbugs.gnu.org Message-ID: MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 | 59 ++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..bde4ee0973 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,12 +32,14 @@ ;;; 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) #: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 +50,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 +807,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 #: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))) + (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 "/src/gnulib/"))))) + #:tests? #f)) ;; Tests are syntax and indentation checks for the + ;; maintainer. And they are failing. + (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 "src/gnulib"))))) + (license (list license:lgpl2.0+ license:gpl3+)))) + +(define-public gnulib + (gnulib-checkout + #:version "2022-12-28" + #:commit "14a7b0ce5462c90ce86d97bf952185ec2500d341" + #:hash (base32 "0fz25ccdlxf4xp37rjsl1fslc4g0x12qpvadz4qw0cq18dvx5kbx"))) base-commit: e84f17ea939013f25a0dd1276659e27bc4c2198f -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 30 17:38:20 2022 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) From: Vivien Kraus Date: Fri, 30 Dec 2022 23:05:50 +0100 Subject: [PATCH v5 4/5] gnu: gnulib: Regenerate the unicode data. To: 60358@debbugs.gnu.org Message-ID: MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 01:49:34 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 06:49:34 +0000 Received: from localhost ([127.0.0.1]:36417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBVgT-0001Tc-PF for submit@debbugs.gnu.org; Sat, 31 Dec 2022 01:49:33 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBVgS-0001TL-RC for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 01:49:33 -0500 Received: by mail-wr1-f66.google.com with SMTP id w1so9714116wrt.8 for <60358@debbugs.gnu.org>; Fri, 30 Dec 2022 22:49:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=mDBoL4e+V5TT6lSc/pZ/xwFeSz+w4gToP1wbkiiU+Ag=; b=ollPfegU4BB9w0heeA4WSY3VzV6jo1HuJ/KNu0VfEkvaUDvN8kohgz5I7KYHIlCw/Z 8RB73icaZhoUCJ1lgNEWLQ2rCTxZsI+9vPP15XLRg7J9z1Gzk6jW5LaorOFuyTvEkWeF l8nkVeiKj3QMTQTPAILp1QcFKq2iSR2b7PYIpT+i99xZM/OloAOHp2Y+5JJGjuLGnDDG k/BBw1Mrid754jzEdh1Js9jXLCUIc+//30HUuoNupKNxUG4HeZjnkQ/zrR1xdw4pRPMj 8GWAPDgci7YnChWZ2QrfQkII+ktHWUP2s/xO/CVlatmU2iSGSsaRIh74cvYTWnpvUST1 RegA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=mDBoL4e+V5TT6lSc/pZ/xwFeSz+w4gToP1wbkiiU+Ag=; b=lUbnnzWnQTPqP9o3eofPIf8/iUeu2QgyJ+uQeOry9BkTXv4TLrzhpuarak9s28xayg 7BqhRvATM9wb4Sb7C3X/lZO0TTToyLg0XC4D2JNg/h2APutlGAEUID6oqnSkqbqsbp3U DnYk2diwRZrYvuKe7wdnej4qpB0E/ut1+KtteiXry8Qgis5nvvhuk27gGM2yISoXDhQw Pdr8LgtJ37tOigPkVGFPUgVy1/WhsRmazFgvyH+86FCpBUHOTmmU7Zr6X2RtdJNU6KLw TxFyBqxhfwO8MAEJ1kkP8PvPJG9Q5mw6LHM8KIIph21nJglLd6rTiLwndNwSCSn+/Zel 2ORQ== X-Gm-Message-State: AFqh2kprfZOFUoRvkOy4VNRDzC9Nl+KpQzWDCJVQqE4qTJ+bu4hNxbX7 7/5YZNA7xgqZnGiIkByTQZ8= X-Google-Smtp-Source: AMrXdXtUmNqWtIf22iok3pbFDq0B0QtC0giog11Jwfesi32zqfM+CKgOGFHsZ17bpqiWMp2iCeN67g== X-Received: by 2002:a5d:6b87:0:b0:26f:8bfc:98ff with SMTP id n7-20020a5d6b87000000b0026f8bfc98ffmr18496106wrx.38.1672469366795; Fri, 30 Dec 2022 22:49:26 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id j1-20020adfff81000000b0024cb961b6aesm21812542wrr.104.2022.12.30.22.49.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Dec 2022 22:49:26 -0800 (PST) Message-ID: <42bc322d6b91d97d6f80f0ad72e131664e565c2e.camel@gmail.com> Subject: Re: [PATCH v5 3/5] gnu: UCD: Add version 3.0-update1. From: Liliana Marie Prikler To: Vivien Kraus , 60358@debbugs.gnu.org Date: Sat, 31 Dec 2022 07:49:24 +0100 In-Reply-To: <36a8b51d628dab1706ed903db57eb1be1abbee1f.camel@planete-kraus.eu> References: <36a8b51d628dab1706ed903db57eb1be1abbee1f.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 30.12.2022 um 22:20 +0100 schrieb Vivien Kraus: > * gnu/packages/unicode.scm (ucd3.0-update1): New variable. > --- Surely this must work with a newer UCD. Perhaps not with 14, which is the currently packaged one, but what if we use 7, which is the first zipped one? Using a newer UCD might also solve your Hangul problem. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 01:53:12 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 06:53:13 +0000 Received: from localhost ([127.0.0.1]:36431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBVk0-0001Zq-P7 for submit@debbugs.gnu.org; Sat, 31 Dec 2022 01:53:12 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:36645) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBVjz-0001Zc-6R for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 01:53:11 -0500 Received: by mail-wr1-f65.google.com with SMTP id bs20so19738705wrb.3 for <60358@debbugs.gnu.org>; Fri, 30 Dec 2022 22:53:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=/gzG9DrIFTjP+O2qJqUOOw8bgQ5MY+ZFaShjfFyI/As=; b=QHWumCoSwadI1Zr8aAh5S1C0TCYnr2i/7HWwNblYUWFk4jgB35CrmL81nKR6ZUwwGw j26TnJGe1ZiqKCZsLfEoSEKrIWE7QBA/SSm//gddQixwiQoT8To7Ti30x9K0BoA7glgJ TlVv3aeSE+QOf1sve3j2qFNhZqXn3HJQf09CtF6g6qmfGxVc3S+8kyaVebWwoBaU3J89 9GRfIcd3KPYLSKJ/BKPrYB3ozl80g6hv9BLQyw/LMtjgwmD30awTsv+2x3jsrpVRlvqA m+E/TOAG31b3FvA6Rm7zHXNokT8VJ3oZ7ouqZXsSmSxrK8qUWEpwnvjYHLPM0Fi+/2Ew ii3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=/gzG9DrIFTjP+O2qJqUOOw8bgQ5MY+ZFaShjfFyI/As=; b=CzDv8fb3P/180tLEg+uziskr+DPJhDFUmtgTK2RyIDSD4Kw3jyv6cXJPgU/HZAXwzO 9+S7zrTrJyXA5fTj+Kezc0ADia0B1qh+dadjhZNlHZ9ylVEyevpkAEP9O9tfBzkNHmST iFsckJXzm3VhtpoorWzJ1YGOvRy9+Jk3KQNlaUJByj/zsmDqSYXTcXW0pt+BVAvZQ0Iq skGTdV3FrkUUJDLDZC+dJFvMbPEssLQ4OX+TUO4MyJ9U0YN7LHsdEZyefM3xFJaIwwf9 MeP0edN2XVA/2NJ8Mt6orQybLb/cwEFModUN4v3ZTO2rrtOwlrzjTF5sgduOpfxwptsD tUaw== X-Gm-Message-State: AFqh2kpYe2qgJofOE2xhPFAqjtCCnqLiPaIdecmdOyi/OaT1fKqLWhfM LFqznNLqfAKx+PWWapO8Ndc= X-Google-Smtp-Source: AMrXdXuulZDslLX2hfDhurh2Rnk7GgUffQ9jYBNlvCdNONjPzFKseiM2fPC1DgWA0/VyHE/am/N9iA== X-Received: by 2002:a5d:58e6:0:b0:26f:aaff:e98c with SMTP id f6-20020a5d58e6000000b0026faaffe98cmr17609494wrd.27.1672469585394; Fri, 30 Dec 2022 22:53:05 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id z1-20020adfdf81000000b00268aae5fb5bsm22338071wrl.3.2022.12.30.22.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Dec 2022 22:53:05 -0800 (PST) Message-ID: <93102590da2c4d8659f7cec0843dc9ac59736ddc.camel@gmail.com> Subject: Re: [PATCH v5 1/5] gnu: Add gnulib. From: Liliana Marie Prikler To: Vivien Kraus , 60358@debbugs.gnu.org Date: Sat, 31 Dec 2022 07:53:04 +0100 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 27.12.2022 um 17:23 +0100 schrieb Vivien Kraus: > * gnu/packages/build-tools.scm (gnulib): New variable. > (gnulib-checkout): New function. It returns a package with a specific > commit > of gnulib. > --- As a matter of principle, order the commits so that dependencies come before depending packages. You can also squash multiple commits that fix issues in the previous one into one. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 01:53:40 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 06:53:40 +0000 Received: from localhost ([127.0.0.1]:36434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBVkR-0001aX-13 for submit@debbugs.gnu.org; Sat, 31 Dec 2022 01:53:40 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53093) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBVkN-0001aJ-FG for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 01:53:37 -0500 Received: by mail-wm1-f65.google.com with SMTP id ay40so16762969wmb.2 for <60358@debbugs.gnu.org>; Fri, 30 Dec 2022 22:53:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=MpcTDeOofyy1Q9/3qhdWJgt+CLJq9CupdCW2otXtXOY=; b=R/J63NZd0nv/Uz8vtvEEu3gLeJZ0V2QkSeQYJL0E0cE+O6aMRuxzkA2M0wuZUfkwiA O4v9jLOLF31onFlsE/awf0svCWuHgQsohHiHXkTiCXBA6W0BcQfrsSkmaCO3BpVZ+Uk9 1/i5bvhPC4H7Rx6Eap/W1ZrTqx1UEq0BX6/Yqigp4UsiiMO7fyHOJsX4AyYjZqyVLh2o IiZLYMADzmsHK2XVpCOJrS5CWTAVIgQXvFeAA5LIcpoFvOpO6NxzcE2xtiNRnbeSOBV1 qZIduOWQH0viot0B58RxGRQd+hk6De6ASY0uN1K/iiRr31S0/ULIT7B8dYA9tIL7OGV/ NiCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MpcTDeOofyy1Q9/3qhdWJgt+CLJq9CupdCW2otXtXOY=; b=NaoooHzRTyuBqttiWrw/+00WfYywZ62w1ZtjgwsrYv8T4KvrZ/RWdqVPN/nKgO5cnC RRxwGzC5OlDLA7VAjA6/mloa5B5L3RyN/a24SEYQ8eTvDOqF71vfniFLT1YjaMv+DXlf NaQAOD98mx/aV3Lnbi3Q2oLlr+d+ebQEvDleE86blEZ+WXKHp7DK8AlKf0SgX4Yg4EIt qEFmRZs9nauPxCMVcRKtiNRzKicHp7c40/JyUQVrO5F5tcYZUQaSZ48cVxCI2BTFtFqr d80J0uEKcfMO+PZoyJGFGxHsb34j0AmGr+4zyV+R9YfP7rvqyS11t4pXkbtXE+XETEXK gtSw== X-Gm-Message-State: AFqh2kocsSu0dggg7/1Nb2TMsMQT3Kf2ICJ2z28kck7ukda0ONPIkPNB iioiXwCDBkMzn3mIB2EFxDg= X-Google-Smtp-Source: AMrXdXtPieXmn6GHyjtfnHXUhMHN/QyIMqETPOo9ao8wsRiYkFEJ0TEAB/x2tuDufebxNdxC6HkbGg== X-Received: by 2002:a05:600c:4d20:b0:3d3:5737:3afb with SMTP id u32-20020a05600c4d2000b003d357373afbmr24580170wmp.41.1672469609652; Fri, 30 Dec 2022 22:53:29 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id he11-20020a05600c540b00b003d359aa353csm29971165wmb.45.2022.12.30.22.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Dec 2022 22:53:29 -0800 (PST) Message-ID: <0639ebd29bc2e83e6c8dea0469d3b8da942d6d71.camel@gmail.com> Subject: Re: [PATCH v5 5/5] gnu: guile-gnutls: Update to 3.7.11. From: Liliana Marie Prikler To: Vivien Kraus , 60358@debbugs.gnu.org Date: Sat, 31 Dec 2022 07:53:28 +0100 In-Reply-To: <2fb8065d7f7e08dbc2bd71d05b03c82c43815ca2.camel@planete-kraus.eu> References: <2fb8065d7f7e08dbc2bd71d05b03c82c43815ca2.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gTWl0dHdvY2gsIGRlbSAyOC4xMi4yMDIyIHVtIDAzOjIwICswMTAwIHNjaHJpZWIgVml2aWVu IEtyYXVzOgo+ICogZ251L3BhY2thZ2VzL3Rscy5zY20gKGd1aWxlLWdudXRscykgW3BoYXNlc106 IFBhdGNoLXNoZWJhbmcKPiBhdXRvcHVsbC5zaCBhbmQKPiBhdXRvZ2VuLnNoLgo+ICogZ251L3Bh Y2thZ2VzL3Rscy5zY20gKGd1aWxlLWdudXRscykgW25hdGl2ZS1pbnVwdHNdOiBBZGQgZ251bGli IGFuZAo+IGdpdC4KPiAtLS0KPiDCoGdudS9wYWNrYWdlcy90bHMuc2NtIHwgNDEgKysrKysrKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KPiDCoDEgZmlsZSBjaGFuZ2VkLCAyOCBp bnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZ251L3BhY2th Z2VzL3Rscy5zY20gYi9nbnUvcGFja2FnZXMvdGxzLnNjbQo+IGluZGV4IGE3NGI0MjNjY2YuLjQ0 YTI3ZWY4Y2IgMTAwNjQ0Cj4gLS0tIGEvZ251L3BhY2thZ2VzL3Rscy5zY20KPiArKysgYi9nbnUv cGFja2FnZXMvdGxzLnNjbQo+IEBAIC01Niw2ICs1Niw3IEBAIChkZWZpbmUtbW9kdWxlIChnbnUg cGFja2FnZXMgdGxzKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMpCj4gwqDCoCAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBhdXRvdG9vbHMpCj4gwqDCoCAjOnVzZS1tb2R1bGUg KGdudSBwYWNrYWdlcyBiYXNoKQo+ICvCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBidWls ZC10b29scykKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGNoZWNrKQo+IMKgwqAg Izp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgY3VybCkKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzIGRucykKPiBAQCAtODAsNiArODEsNyBAQCAoZGVmaW5lLW1vZHVsZSAoZ251IHBh Y2thZ2VzIHRscykKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHNwaGlueCkKPiDC oMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHRleGluZm8pCj4gwqDCoCAjOnVzZS1tb2R1 bGUgKGdudSBwYWNrYWdlcyB0aW1lKQo+ICvCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB2 ZXJzaW9uLWNvbnRyb2wpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBiYXNlKQo+ IMKgwqAgIzp1c2UtbW9kdWxlIChzcmZpIHNyZmktMSkpCj4gwqAKPiBAQCAtMzgxLDcgKzM4Myw3 IEBAIChkZWZpbmUtcHVibGljIGd1aWxlLWdudXRscwo+IMKgwqDCoMKgIDs7IFRoaXMgcGFja2Fn ZSBzdXBlcnNlZGVzIHRoZSBHdWlsZSBiaW5kaW5ncyB0aGF0IGNhbWUgd2l0aAo+IEdudVRMUyB1 bnRpbAo+IMKgwqDCoMKgIDs7IHZlcnNpb24gMy43LjggaW5jbHVkZWQuCj4gwqDCoMKgwqAgKG5h bWUgImd1aWxlLWdudXRscyIpCj4gLcKgwqDCoCAodmVyc2lvbiAiMy43LjkiKQo+ICvCoMKgwqAg KHZlcnNpb24gIjMuNy4xMSIpCj4gwqDCoMKgwqAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRsYWIu Y29tL2dudXRscy9ndWlsZS8iKQo+IMKgwqDCoMKgIChzb3VyY2UgKG9yaWdpbgo+IMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKG1ldGhvZCBnaXQtZmV0Y2gpCj4gQEAgLTM5MCwyMSArMzky LDI4IEBAIChkZWZpbmUtcHVibGljIGd1aWxlLWdudXRscwo+IMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbW1pdCAoc3RyaW5nLWFwcGVuZCAidiIgdmVyc2lvbikp KSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzaGEyNTYKPiDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKGJhc2UzMgo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAKPiAiMDBzZnBxam1kMjYza2E1MWZxNHhmN252YWF4eWZxc3Izcjhmajk0amd4NDVxNnE2bjZ3 cSIpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAKPiAiMDZkN3YzaTBkOWF5cDd6 cWsxcnN5NHowd2ZwcTY5bjByNTRmMXhycHBiOWduN3E5aXZhNiIpKQo+IMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKGZpbGUtbmFtZSAoZ2l0LWZpbGUtbmFtZSBuYW1lIHZlcnNpb24pKQo+ IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHBhdGNoZXMgKHNlYXJjaC1wYXRjaGVzICJn bnV0bHMtY3Jvc3MucGF0Y2giKSkpKQo+IMKgwqDCoMKgIChidWlsZC1zeXN0ZW0gZ251LWJ1aWxk LXN5c3RlbSkKPiDCoMKgwqDCoCAoYXJndW1lbnRzCj4gLcKgwqDCoMKgICcoIzpjb25maWd1cmUt ZmxhZ3MKPiAtwqDCoMKgwqDCoMKgIDs7IFRlbGwgdGhlIGJ1aWxkIHN5c3RlbSB0aGF0IHdlIHdh bnQgR3VpbGUgYmluZGluZ3MKPiBpbnN0YWxsZWQgdG8KPiAtwqDCoMKgwqDCoMKgIDs7IHRoZSBv dXRwdXQgaW5zdGVhZCBvZiBHdWlsZXMgb3duIG1vZHVsZSBkaXJlY3RvcnkuCj4gLcKgwqDCoMKg wqDCoCAobGlzdCAiLS1kaXNhYmxlLXN0YXRpYyIKPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IChzdHJpbmctYXBwZW5kICItLXdpdGgtZ3VpbGUtc2l0ZS1kaXI9Igo+IC3CoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAKPiAiJChkYXRhcm9vdGRp cikvZ3VpbGUvc2l0ZS8kKEdVSUxFX0VGRkVDVElWRV9WRVJTSU9OKSIpCj4gLcKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAoc3RyaW5nLWFwcGVuZCAiLS13aXRoLWd1aWxlLXNpdGUtY2NhY2hlLWRp cj0iCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoAo+ICIkKGxpYmRpcikvZ3VpbGUvJChHVUlMRV9FRkZFQ1RJVkVfVkVSU0lPTikvc2l0ZS1j Y2FjaGUiKQo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1hcHBlbmQgIi0td2l0 aC1ndWlsZS1leHRlbnNpb24tZGlyPSIKPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgCj4gIiQobGliZGlyKS9ndWlsZS8kKEdVSUxFX0VGRkVD VElWRV9WRVJTSU9OKS9leHRlbnNpb25zIikpKSkKPiArwqDCoMKgwqAgKGxpc3QKPiArwqDCoMKg wqDCoCAjOmNvbmZpZ3VyZS1mbGFncwo+ICvCoMKgwqDCoMKgIDs7IFRlbGwgdGhlIGJ1aWxkIHN5 c3RlbSB0aGF0IHdlIHdhbnQgR3VpbGUgYmluZGluZ3MgaW5zdGFsbGVkCj4gdG8gdGhlCj4gK8Kg wqDCoMKgwqAgOzsgb3V0cHV0IGluc3RlYWQgb2YgR3VpbGVzIG93biBtb2R1bGUgZGlyZWN0b3J5 Lgo+ICvCoMKgwqDCoMKgICN+KGxpc3QgIi0tZGlzYWJsZS1zdGF0aWMiCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChzdHJpbmctYXBwZW5kICItLXdpdGgtZ3VpbGUtc2l0ZS1kaXI9Igo+ ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oAo+ICIkKGRhdGFyb290ZGlyKS9ndWlsZS9zaXRlLyQoR1VJTEVfRUZGRUNUSVZFX1ZFUlNJT04p IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1hcHBlbmQgIi0td2l0aC1n dWlsZS1zaXRlLWNjYWNoZS1kaXI9Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoAo+ICIkKGxpYmRpcikvZ3VpbGUvJChHVUlMRV9FRkZF Q1RJVkVfVkVSU0lPTikvc2l0ZS1jY2FjaGUiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAoc3RyaW5nLWFwcGVuZCAiLS13aXRoLWd1aWxlLWV4dGVuc2lvbi1kaXI9Igo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoAo+ICIkKGxp YmRpcikvZ3VpbGUvJChHVUlMRV9FRkZFQ1RJVkVfVkVSU0lPTikvZXh0ZW5zaW9ucyIpKQo+ICvC oMKgwqDCoMKgICM6cGhhc2VzCj4gK8KgwqDCoMKgwqAgI34obW9kaWZ5LXBoYXNlcyAlc3RhbmRh cmQtcGhhc2VzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoCAoYWRkLWFmdGVyICd1bnBhY2sgJ3BhdGNo LW1vcmUtc2hlYmFuZ3MKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRhIF8KPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGZvci1lYWNoIHBhdGNoLXNoZWJhbmcKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAnKCJhdXRvcHVsbC5zaCIg ImF1dG9nZW4uc2giKSkpKSkpKQo+IMKgwqDCoMKgIChuYXRpdmUtaW5wdXRzCj4gwqDCoMKgwqDC oCAobGlzdCBhdXRvY29uZgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgYXV0b21ha2UKPiBAQCAt NDEyLDcgKzQyMSwxMyBAQCAoZGVmaW5lLXB1YmxpYyBndWlsZS1nbnV0bHMKPiDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIHBrZy1jb25maWcKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIHRleGluZm8K PiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGdudXRsc8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIDtYWFg6ICdndWlsZS1zbmFyZicgaW52b2tlcyB0aGUKPiBuYXRpdmUgJ2NwcCcKPiAt wqDCoMKgwqDCoMKgwqDCoMKgwqAgZ3VpbGUtMy4wKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqAg Z3VpbGUtMy4wCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgIChnbnVsaWItY2hlY2tvdXQKPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAjOnZlcnNpb24gIjIwMjItMTItMDYiCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqAgIzpjb21taXQgIjQ0MGI1MjhiMWQ4MWRkMzFiMmEyZTRkZGUyMGQ1YzgzN2Mx NDc4MTEiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIzpoYXNoIChiYXNlMzIKPiAiMTVtcTQz YWJibmtiYW1jaGM5bHlucnZyZDVxbDhxYWNneXgycGg0a2tuZ3hmMWJ6M3BxeSIpKQo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoCBnaXQgOyBnbnVsaWIgcmVxdWlyZXMgZ2l0IGV2ZW4gaWYgbm90aGlu ZyBpcyBkb3dubG9hZGVkLgpXZSBzaG91bGQgcmVhbGx5IG1ha2UgaXQgc28gdGhhdCBpdCBkb2Vz bid0Lgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoCApKQo+IMKgwqDCoMKgIChpbnB1dHMKPiDCoMKg wqDCoMKgIChsaXN0IGdudXRscy1sYXRlc3QKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGd1aWxl LTMuMCkpCgpDaGVlcnMK From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 05:56:48 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 10:56:48 +0000 Received: from localhost ([127.0.0.1]:36626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBZXk-0000am-EI for submit@debbugs.gnu.org; Sat, 31 Dec 2022 05:56:48 -0500 Received: from planete-kraus.eu ([89.234.140.182]:48580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBZXh-0000aa-OG for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 05:56:47 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 97dfff5a; Sat, 31 Dec 2022 10:56:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s=dkim; bh=ZVrq46G0K2P1+c/PxK01dlSZb6E=; b=weazRPSRuJX+PJrwlIFNLxOplJIG RwPZPeOd8qefX1pEgrf6QjN1bDecw+Uc7aQQkYKhV84Olx5UahpOh95dsswP/sgK F3Hmz/Th21Zeiuqj8oAbU+eXFwSde1AU2s+CooNyqbFWL9MaYi38bzUjsCBlveUr NVz2nAXgNIDtqHk= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 7ab6e85f (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 31 Dec 2022 10:56:41 +0000 (UTC) Message-ID: <8da668a75fe71ee52887f73ec719946cc379f64e.camel@planete-kraus.eu> Subject: Re: [PATCH v5 3/5] gnu: UCD: Add version 3.0-update1. From: Vivien Kraus To: Liliana Marie Prikler , 60358@debbugs.gnu.org Date: Sat, 31 Dec 2022 11:56:39 +0100 In-Reply-To: <42bc322d6b91d97d6f80f0ad72e131664e565c2e.camel@gmail.com> References: <36a8b51d628dab1706ed903db57eb1be1abbee1f.camel@planete-kraus.eu> <42bc322d6b91d97d6f80f0ad72e131664e565c2e.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! Le samedi 31 d=C3=A9cembre 2022 =C3=A0 07:49 +0100, Liliana Marie Prikler a =C3=A9crit=C2=A0: > Am Freitag, dem 30.12.2022 um 22:20 +0100 schrieb Vivien Kraus: > > * gnu/packages/unicode.scm (ucd3.0-update1): New variable. > > --- > Surely this must work with a newer UCD.=C2=A0 Perhaps not with 14, which > is > the currently packaged one, but what if we use 7, which is the first > zipped one?=C2=A0 Using a newer UCD might also solve your Hangul problem. If you look at gen-uni-tables.c in lib/, you will see that the instructions insist on using PropList-3.0.1.txt from 3.0 update 1, in addition to a recent UCD (there are 2=E2=80=AFUCD inputs to the gnulib pack= age: the specific 3.0.1 ucd and the recent ucd =E2=88=92 they don=E2=80=99t have= colliding file names). In theory, I would also update UCD, but it has a lot of dependent packages so the update should go to the staging branch instead. There are no clear instructions on how to get HangulSyllableNames.txt, so I=E2=80=99m hesitant to declare that version 7 will do. Vivien From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 05:58:32 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 10:58:33 +0000 Received: from localhost ([127.0.0.1]:36630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBZZO-0000eQ-U7 for submit@debbugs.gnu.org; Sat, 31 Dec 2022 05:58:32 -0500 Received: from planete-kraus.eu ([89.234.140.182]:45578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBZZM-0000eD-Tn for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 05:58:29 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 71038705; Sat, 31 Dec 2022 10:58:27 +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=9FMf8k4k YS19cup1/uCwbKIPVl8=; b=XcIgcZjITj5qJyWq6X+8gAw/hEYrXwGaXZiyxkQ+ cyGpD+iHtXcdYWzm84Kx+kTiEQdelL3ZbrJnAneprsFKRq7Xdy1OPUvrdLVwbSXY DND71ZcKrXppFMXwMp7VnqT0irPvghnOolCNhJL/7JazFUk32ba7WwseCKyDvVuD qSE= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 1ff5072b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 31 Dec 2022 10:58:25 +0000 (UTC) From: Vivien Kraus Date: Fri, 30 Dec 2022 22:20:30 +0100 Subject: [PATCH v6 1/3] gnu: UCD: Add version 3.0-update1. To: 60358@debbugs.gnu.org Message-ID: <94c3384a9e30761e5bd04d4d4b12523e4ddab7f2.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * gnu/packages/unicode.scm (ucd3.0-update1): New variable. --- gnu/packages/unicode.scm | 59 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index bda0de04cc..66340721e3 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -21,13 +21,15 @@ (define-module (gnu packages unicode) #:use-module (gnu packages autotools) #:use-module (guix git-download) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial)) + #:use-module (guix build-system trivial) + #:use-module (ice-9 match)) (define-public libunibreak (package @@ -112,6 +114,61 @@ (define-public ucd-next (base32 "001nq9w52ijma0vps40xwy2q6ylpyf1393lzb128ibypnmv54fh3")))))) +(define-public ucd3.0-update1 + (package + (inherit ucd) + (version "3.0-update1") + (source + ;; unicode.org does not provide a zipped archive. + (directory-union + "ucd-3.0-update1-source" + (map + (match-lambda + ((filename . hash) + (file-union + (string-append "ucd-3.0-update1-" filename) + `((,filename + ,(origin + (method url-fetch) + (uri (string-append "https://www.unicode.org/Public/3.0-Update1/" filename)) + (sha256 hash))))))) + `(("ArabicShaping-3.txt" + . ,(base32 + "0k6hwdnln8cwkzixxbbc6q5g3nx3z5p1549c0jicnz7gq2mvkh90")) + ("BidiMirroring-1.txt" + . ,(base32 + "0wc5gj6mx5wjkwph734swqd3zvi3ngfx75yybbc1f52dc1l3sh9m")) + ("CaseFolding-2.txt" + . ,(base32 + "143hvpalrnkrxc2g9626v6w4cgmksg9hkcm39fpmqidn0rnpm8vy")) + ("CompositionExclusions-2.txt" + . ,(base32 + "06vlc7yqhkacbb411ykyn4na5kq93yp0p9mm3a2jfixk704nwpj1")) + ("Jamo-3.txt" + . ,(base32 + "092lww4ak9wa7g4jn80i9ckniwg3ymmiaq62xxhhbwk3cx2d23ad")) + ("NormalizationTest-3.0.1.txt" + . ,(base32 + "1r5vq8dlar7km1376bp16l40pyczzvwk9waxgin2i2432qdpwmga")) + ("PropList-3.0.1.txt" + . ,(base32 + "0k6wyijyzdl5g3nibcwfm898kfydx1pqaz28v7fdvnzdvd5fz7lh")) + ("ReadMe-3.0.1.txt" + . ,(base32 + "08mkcs3r1caj67wrcqq0gyb79zj9qyqnmx8qab0rsd4qg87xhnbv")) + ("SpecialCasing-3.txt" + . ,(base32 + "08vrf0kk5zlsl40h4nsfbpnckl4610m7x2072lyq97lln7dsky7a")) + ("UnicodeCharacterDatabase-3.0.1.html" + . ,(base32 + "0fy7vb1zkxg2pg198p7phncjs78gz6lvdzhv51yz34kds8nzz40m")) + ("UnicodeData-3.0.1.html" + . ,(base32 + "0fvv59ydp09mppjr8130kmp90r240hnaqld8i5xkpz900fl20pc1")) + ("UnicodeData-3.0.1.txt" + . ,(base32 + "092svm19f78pxg58pcisg3i57884y7z22rymrcppjkg6sz3izsia")))))))) + (define (unicode-emoji-file name version hash) (origin (method url-fetch) base-commit: c39db91e51e55e46f177378c7b5a797441dc7d1b -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 05:58:37 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 10:58:37 +0000 Received: from localhost ([127.0.0.1]:36634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBZZT-0000el-TU for submit@debbugs.gnu.org; Sat, 31 Dec 2022 05:58:36 -0500 Received: from planete-kraus.eu ([89.234.140.182]:45578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBZZN-0000eD-VH for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 05:58:32 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id fa43f5ba; Sat, 31 Dec 2022 10:58:28 +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=8xvkCQTU DmvwyjT7zAbjST4H0xA=; b=v550je5A2VS84C7RSSGvoGplC49Z2MvL7qXIRmPe Nm/uWrS8AmRP1q4Ja4UEeOluSzfXyf5y4oR9ZNBETVhZwAQUExHlGdPb7gDsrHjn AeJVZYYejpWvsCXYrW8YcLj8gdBgreEIxQHIPvoIawR040QJ2eR+T81w+exq2pwP C+A= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 3c4951c0 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 31 Dec 2022 10:58:27 +0000 (UTC) From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v6 2/3] gnu: Add gnulib. To: 60358@debbugs.gnu.org Message-ID: <3622db6f2253ec6b9aea183d460bd36b5abb6361.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 | 498 +++++++++++++++++++++++++++++++++++ 1 file changed, 498 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..9592b82130 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,27 +32,36 @@ ;;; 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) #: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 (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 +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)) @@ -803,3 +813,491 @@ (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)) + (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 + #: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) + (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" + (string-append #$output "/bin")) + (delete-file-recursively ".git") + (copy-recursively "." (string-append #$output "/src/gnulib/"))))))) + (inputs ;; Shebangs for some auxiliary build files. + (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 + "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-28" + #:commit "14a7b0ce5462c90ce86d97bf952185ec2500d341" + #:hash (base32 "0fz25ccdlxf4xp37rjsl1fslc4g0x12qpvadz4qw0cq18dvx5kbx"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 05:58:38 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 10:58:38 +0000 Received: from localhost ([127.0.0.1]:36636 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBZZV-0000eo-1h for submit@debbugs.gnu.org; Sat, 31 Dec 2022 05:58:38 -0500 Received: from planete-kraus.eu ([89.234.140.182]:45578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBZZQ-0000eD-R3 for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 05:58:34 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 3ef05bcf; Sat, 31 Dec 2022 10:58:30 +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=B3zegkLM Ay0b2y1YJ4Jlq8vLNOM=; b=jaUSaTN6ZJC7F9wRrWvPRSbsZ9UFlgx6h2DyEDPt CL8zwJK1n5egRXcZF8CQrYZUj4H6eP19IUhrjVBm0kY1kC/e7do2gRG2eHUajjII J6Uw9lbcBHaCFWk64liCpbkNqW6lhiuoezFE8Ex2T4yyJ9vERG0jMOosCXmLH1rd 5Fg= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id e9e8a648 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 31 Dec 2022 10:58:30 +0000 (UTC) From: Vivien Kraus Date: Wed, 28 Dec 2022 03:20:54 +0100 Subject: [PATCH v6 3/3] gnu: guile-gnutls: Update to 3.7.11. To: 60358@debbugs.gnu.org Message-ID: <5c471a650a28f3c1ed3f58254ae5e6396f985e99.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..2c7e36a6c5 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,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 +424,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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 09:07:21 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 14:07:21 +0000 Received: from localhost ([127.0.0.1]:36858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBcW9-0000LF-14 for submit@debbugs.gnu.org; Sat, 31 Dec 2022 09:07:21 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:40543) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBcW6-0000Ky-DH for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 09:07:19 -0500 Received: by mail-wm1-f65.google.com with SMTP id k26-20020a05600c1c9a00b003d972646a7dso14310473wms.5 for <60358@debbugs.gnu.org>; Sat, 31 Dec 2022 06:07:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=e9qBhlzd8YrXdh7+41YsXVCANwz5FtWWSO0Umt3KThU=; b=WulBDmeMndtWzDE/3y3lj/DxUYxmigHxCHe9UxTFZe1H/YaYWzZ8U05j9UdVFRaE5h MaimvtQqOgV9sY3ip3f2n8MQ+Utx5qv7XFc8kRe4VCtUd5+ups09aEqiU5ApGLnq5QgI JMk0/Td8hLjH5oOHZdFvNLtUlLxFtXunaG+KDmAgPuPSDlFQT2zJVCnqo1q8ZPfHJlZ0 tmZWCLNttF9okAxSKpJcH7IRFtupf5VzKdT9MftWKeGqXgBy13g1wsEHrIN9u5rYRdcO qUHbkGg7M3MaY1310kVjd8dZlYYoDaScQUEjZU1dsxf95bMwlkKMBmXhcSQSvLDFPeU1 B44g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=e9qBhlzd8YrXdh7+41YsXVCANwz5FtWWSO0Umt3KThU=; b=qJNF64X5m0azirne84S+SlSRKZs+l1wHDDppWk58phHo34648vgqsRTJ4ew4d0DWhK pJQiCdchmXZUv5R1LK6mZlDi1U/CeFatIqs6R3rVfhkHvmnnOaa7zPN/kKtNByAEjwQr BEf/ptXOrTqfAigq2XYIVj149LlaLUIbb2UMspCx2jwK8NFV3Q6ppLglr1JjUahtlTLt q3usW4vW533UhvHGenuwvWElwwwodudD6bcqfp23yU42gaIjYYL5N8TbwnF2rj5RCVMQ x0ZGv6PO7h7QTmWGFsQv8OvlZOfrcFsN03dSuourJbku08cWaFU1Ni189OMxKUfESUV6 cOeg== X-Gm-Message-State: AFqh2koUqlcAKg41Dy9QeQdQ+eCd2GELoBbhDhk7f73sQS+c76SEUaEV nPHfcsNj/9NaiUp/inipoHo= X-Google-Smtp-Source: AMrXdXv7pk8pN/w17YC46AKr5xYqX9zZZXar4yM3Kz1gTyjxVnAhv6sMsP72hSEgne3QxpbT8tdrWQ== X-Received: by 2002:a05:600c:4e09:b0:3d4:5741:af9b with SMTP id b9-20020a05600c4e0900b003d45741af9bmr28134838wmq.0.1672495631549; Sat, 31 Dec 2022 06:07:11 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id s16-20020a1cf210000000b003c6bd12ac27sm31348607wmc.37.2022.12.31.06.07.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Dec 2022 06:07:11 -0800 (PST) Message-ID: <07a7b89f68f2ce2dd94c506ffbfef519444a48b5.camel@gmail.com> Subject: Re: [PATCH v5 3/5] gnu: UCD: Add version 3.0-update1. From: Liliana Marie Prikler To: Vivien Kraus , 60358@debbugs.gnu.org Date: Sat, 31 Dec 2022 15:07:09 +0100 In-Reply-To: <8da668a75fe71ee52887f73ec719946cc379f64e.camel@planete-kraus.eu> References: <36a8b51d628dab1706ed903db57eb1be1abbee1f.camel@planete-kraus.eu> <42bc322d6b91d97d6f80f0ad72e131664e565c2e.camel@gmail.com> <8da668a75fe71ee52887f73ec719946cc379f64e.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 31.12.2022 um 11:56 +0100 schrieb Vivien Kraus: > Hi! >=20 > Le samedi 31 d=C3=A9cembre 2022 =C3=A0 07:49 +0100, Liliana Marie Prikler= a > =C3=A9crit=C2=A0: > > Am Freitag, dem 30.12.2022 um 22:20 +0100 schrieb Vivien Kraus: > > > * gnu/packages/unicode.scm (ucd3.0-update1): New variable. > > > --- > > Surely this must work with a newer UCD.=C2=A0 Perhaps not with 14, whic= h > > is > > the currently packaged one, but what if we use 7, which is the > > first > > zipped one?=C2=A0 Using a newer UCD might also solve your Hangul > > problem. >=20 > If you look at gen-uni-tables.c in lib/, you will see that the > instructions insist on using PropList-3.0.1.txt from 3.0 update 1, in > addition to a recent UCD (there are 2=E2=80=AFUCD inputs to the gnulib > package: the specific 3.0.1 ucd and the recent ucd =E2=88=92 they don=E2= =80=99t have > colliding file names). In theory, I would also update UCD, but it has > a lot of dependent packages so the update should go to the staging > branch instead. Looking at the comment, you only need the proplist, however, not anything else. I'd also experiment with providing an empty file in its stead, but it doesn't matter too much as long as the hacks we need to take are kept acceptably few. If you want to use UCD 15, go ahead. There is a ucd-next package that has possibly fewer dependants, which ironically also points to UCD 14 atm. As for the deleted files in some test directories, can we abbreviate them with regular expressions or keep lists? Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 13:26:54 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 18:26:54 +0000 Received: from localhost ([127.0.0.1]:39807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBgZK-0001nU-23 for submit@debbugs.gnu.org; Sat, 31 Dec 2022 13:26:54 -0500 Received: from planete-kraus.eu ([89.234.140.182]:49024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBgZH-0001nJ-Fr for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 13:26:53 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d707cb53; Sat, 31 Dec 2022 18:26:48 +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=qV1UNJsF XIc7tcNiyLC8y/PuU5Q=; b=SKr2M78rZte//uvB1QvZx/C/9307kP9kUMCQptTw 2EoNQzNFV6uBsD66BqprH+eN4eq58eZpyWJ+ouPmuWAD7uf04qZxAjsvAqoJaCHJ oynfc4efK64ZI/ijIwrLzhj2OIw300M1zBTKmKMeXFFDpkBt+ZIPxB7bwWxvAJu3 dAw= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 73bd8d44 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 31 Dec 2022 18:26:46 +0000 (UTC) From: Vivien Kraus Date: Sat, 31 Dec 2022 18:33:47 +0100 Subject: [PATCH v7 1/5] gnu: libunibreak: Use ucd instead of ucd-next. To: 60358@debbugs.gnu.org Message-ID: MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 base-commit: d4ed8dc3c5743aac6766da0e54e0c969386ed8ac -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 13:26:58 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 18:26:58 +0000 Received: from localhost ([127.0.0.1]:39810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBgZO-0001nk-BF for submit@debbugs.gnu.org; Sat, 31 Dec 2022 13:26:58 -0500 Received: from planete-kraus.eu ([89.234.140.182]:49024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBgZL-0001nJ-7S for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 13:26:55 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 84ade89e; Sat, 31 Dec 2022 18:26:53 +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=t4cXoQv8 2leK84W+z1tVUF34FqI=; b=VweuV+NHZ8loN3CbICVQuXw2ObFYWovNvcW9QyO1 MQE4IRN8p2tPYVjmbbI51WyaVqHJG93iveNphdya+++ogkOIviZsKQdCD/pP6/o3 S/FcHKNUv7smpeFCAu59ASqdViId9z3hH5uJsy2Fs870BA1UQDmP2hoTlajn3iGu fDM= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 652f6a99 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 31 Dec 2022 18:26:52 +0000 (UTC) From: Vivien Kraus Date: Sat, 31 Dec 2022 18:34:35 +0100 Subject: [PATCH v7 2/5] gnu: ucd-next: Update to 15.0.0. To: 60358@debbugs.gnu.org Message-ID: <9fd8cc1b9405fd41555e2d36e52f0343af7539de.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/unicode.scm (ucd-next): Update to 15.0.0. --- gnu/packages/unicode.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 5b5900f2ba..1f5bc10c94 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -101,7 +101,7 @@ (define-public ucd-next (package (inherit ucd) (name "ucd-next") - (version "14.0.0") + (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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 13:27:03 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 18:27:03 +0000 Received: from localhost ([127.0.0.1]:39815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBgZS-0001oP-MA for submit@debbugs.gnu.org; Sat, 31 Dec 2022 13:27:02 -0500 Received: from planete-kraus.eu ([89.234.140.182]:49024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBgZR-0001nJ-5o for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 13:27:01 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 5580fb36; Sat, 31 Dec 2022 18:26:59 +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=0BE8bM3/ VigucfF5bL/jq5QzIus=; b=O5cKD1Wqu2dg63SaTYuf32HHGfQQfZ3nZUZ9UW6+ UkcxoxNH9w4r5N9nUOc1rP2Bw5w9sV8QrDq8aN9fLwdlNn82bIOsQxwEfLQ5lJ8C EYClDO9W4lXfhK863gvGtpHO7T99IZVpYibGXzJpnVg/DxaZLtsS1DRHANeB0sfu GRo= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 4fbae8c1 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 31 Dec 2022 18:26:58 +0000 (UTC) From: Vivien Kraus Date: Fri, 30 Dec 2022 22:20:30 +0100 Subject: [PATCH v7 3/5] gnu: UCD: Add version 3.0-update1. To: 60358@debbugs.gnu.org Message-ID: <86ed1bdd80433e8f3a0407bfe51d1ed4713e875f.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * gnu/packages/unicode.scm (ucd3.0-update1): New variable. --- gnu/packages/unicode.scm | 59 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 1f5bc10c94..b3a228f4f1 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -21,13 +21,15 @@ (define-module (gnu packages unicode) #:use-module (gnu packages autotools) #:use-module (guix git-download) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial)) + #:use-module (guix build-system trivial) + #:use-module (ice-9 match)) (define-public libunibreak (package @@ -111,6 +113,61 @@ (define-public ucd-next (base32 "133inqn33hcfvylmps63yjr6rrqrfq6x7a5hr5fd51z6yc0f9gaz")))))) +(define-public ucd3.0-update1 + (package + (inherit ucd) + (version "3.0-update1") + (source + ;; unicode.org does not provide a zipped archive. + (directory-union + "ucd-3.0-update1-source" + (map + (match-lambda + ((filename . hash) + (file-union + (string-append "ucd-3.0-update1-" filename) + `((,filename + ,(origin + (method url-fetch) + (uri (string-append "https://www.unicode.org/Public/3.0-Update1/" filename)) + (sha256 hash))))))) + `(("ArabicShaping-3.txt" + . ,(base32 + "0k6hwdnln8cwkzixxbbc6q5g3nx3z5p1549c0jicnz7gq2mvkh90")) + ("BidiMirroring-1.txt" + . ,(base32 + "0wc5gj6mx5wjkwph734swqd3zvi3ngfx75yybbc1f52dc1l3sh9m")) + ("CaseFolding-2.txt" + . ,(base32 + "143hvpalrnkrxc2g9626v6w4cgmksg9hkcm39fpmqidn0rnpm8vy")) + ("CompositionExclusions-2.txt" + . ,(base32 + "06vlc7yqhkacbb411ykyn4na5kq93yp0p9mm3a2jfixk704nwpj1")) + ("Jamo-3.txt" + . ,(base32 + "092lww4ak9wa7g4jn80i9ckniwg3ymmiaq62xxhhbwk3cx2d23ad")) + ("NormalizationTest-3.0.1.txt" + . ,(base32 + "1r5vq8dlar7km1376bp16l40pyczzvwk9waxgin2i2432qdpwmga")) + ("PropList-3.0.1.txt" + . ,(base32 + "0k6wyijyzdl5g3nibcwfm898kfydx1pqaz28v7fdvnzdvd5fz7lh")) + ("ReadMe-3.0.1.txt" + . ,(base32 + "08mkcs3r1caj67wrcqq0gyb79zj9qyqnmx8qab0rsd4qg87xhnbv")) + ("SpecialCasing-3.txt" + . ,(base32 + "08vrf0kk5zlsl40h4nsfbpnckl4610m7x2072lyq97lln7dsky7a")) + ("UnicodeCharacterDatabase-3.0.1.html" + . ,(base32 + "0fy7vb1zkxg2pg198p7phncjs78gz6lvdzhv51yz34kds8nzz40m")) + ("UnicodeData-3.0.1.html" + . ,(base32 + "0fvv59ydp09mppjr8130kmp90r240hnaqld8i5xkpz900fl20pc1")) + ("UnicodeData-3.0.1.txt" + . ,(base32 + "092svm19f78pxg58pcisg3i57884y7z22rymrcppjkg6sz3izsia")))))))) + (define (unicode-emoji-file name version hash) (origin (method url-fetch) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 13:27:09 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 18:27:09 +0000 Received: from localhost ([127.0.0.1]:39818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBgZZ-0001ot-0a for submit@debbugs.gnu.org; Sat, 31 Dec 2022 13:27:09 -0500 Received: from planete-kraus.eu ([89.234.140.182]:49024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBgZW-0001nJ-LU for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 13:27:07 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d0e18f07; Sat, 31 Dec 2022 18:27:04 +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=9IurLtZa wLZuGjc9uKcno7HWi3U=; b=bBd141WBGWBWmYZ9ELqulJ4RtILEM2qmyqEExOtn t0dVQ8YdM6zJPFVEAtUTtGnWZ1OkZGrMQtBcZb8imVPY2cWdF7LE7KgzhCyFRoDZ GcQBX5jAIrQYhnRoKNqdvsz+phGkndEk04kFQG6DL3D0VGg5rm0BLb62Rg2AfkM+ sH0= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 166307ca (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 31 Dec 2022 18:27:04 +0000 (UTC) From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v7 4/5] gnu: Add gnulib. To: 60358@debbugs.gnu.org Message-ID: <443f01dcd18783358bb44f96a57fe4162dcdfeb0.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 220 ++++++++++++++++++ [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 220 ++++++++++++++++++ [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 | 220 +++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..d2eeb88db6 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,27 +32,36 @@ ;;; 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) #: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 (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 +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)) @@ -803,3 +813,213 @@ (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 ((count-purged + (file-system-fold + ;; enter? + (lambda (name stat result) + #t) + ;; leaf + (lambda (name stat result) + (if (or (string-suffix? ".c" name) + (string-suffix? ".h" name) + (string-suffix? ".gperf" name)) + (call-with-input-file name + (lambda (port) + (let ((first-line (read-line port))) + (if (equal? + first-line + "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */") + (begin + (delete-file name) + (1+ result)) + result)))) + result)) + ;; down + (lambda (name stat result) + result) + ;; up + (lambda (name stat result) + result) + ;; skip + (lambda (name stat result) + (error "No directory should be spared")) + ;; error + (lambda (name stat errno result) + (error "A file is inaccessible")) + ;; Initial value + 0 + (getcwd)))) + (unless (eqv? count-purged 332) + (format (current-error-port) "There were ~s files purged.\n" count-purged) + (error "Please check the number of automatically generated files."))) + ;; 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 gnu-build-system) + (arguments + (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) + (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")) + ;; This is the version of the UCD used, it should be + ;; the same as the native-input. + #$(package-version ucd-next))) + (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" + (string-append #$output "/bin")) + (delete-file-recursively ".git") + (copy-recursively "." (string-append #$output "/src/gnulib/"))))))) + (inputs ;; Shebangs for some auxiliary build files. + (list python perl clisp)) + (native-inputs + (list + python perl clisp + ;; Unicode data: + ucd-next ;; If you change it, also change #$(package-version ucd-next) + ;; in the regenerate-unicode phase. + 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 + "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-28" + #:commit "14a7b0ce5462c90ce86d97bf952185ec2500d341" + #:hash (base32 "0fz25ccdlxf4xp37rjsl1fslc4g0x12qpvadz4qw0cq18dvx5kbx"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 13:27:18 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 18:27:18 +0000 Received: from localhost ([127.0.0.1]:39821 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBgZg-0001pH-Mz for submit@debbugs.gnu.org; Sat, 31 Dec 2022 13:27:18 -0500 Received: from planete-kraus.eu ([89.234.140.182]:49024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBgZd-0001nJ-79 for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 13:27:15 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id af02e39b; Sat, 31 Dec 2022 18:27: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=B3zegkLM Ay0b2y1YJ4Jlq8vLNOM=; b=xZxk7WtgSxJUFBsez/hmpiI0OXmMWuTAVjnxWvFU gkd8s80g4fs0DZHFIXhfyz5UeQBCJGHhikFCnux1iMAu7/IAGMMov9uCaw//Xasu koAj9ImTyV9b/u0i4rhoePOqmaVglMLmHdcjN0zz8xC4fTLrqOs+TKbpgDjiuY1d qaU= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 13b47a5d (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 31 Dec 2022 18:27:10 +0000 (UTC) From: Vivien Kraus Date: Wed, 28 Dec 2022 03:20:54 +0100 Subject: [PATCH v7 5/5] gnu: guile-gnutls: Update to 3.7.11. To: 60358@debbugs.gnu.org Message-ID: <818dcfb840393c0e5393e9eb2e51405ef19f432c.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..2c7e36a6c5 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,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 +424,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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 14:17:35 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 19:17:35 +0000 Received: from localhost ([127.0.0.1]:39846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBhMN-0005PF-7T for submit@debbugs.gnu.org; Sat, 31 Dec 2022 14:17:35 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:41669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBhML-0005Oz-Ds for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 14:17:33 -0500 Received: by mail-wm1-f65.google.com with SMTP id ay2-20020a05600c1e0200b003d22e3e796dso17826454wmb.0 for <60358@debbugs.gnu.org>; Sat, 31 Dec 2022 11:17:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Db+MeSfG7Xjla1DH/d2d5fx2mR5wQu4fm7DO8Zye6kk=; b=f3qfz9YhiC02kcyRsx2/sFHCdmysGdZHbBA9zwAUUIhmKJbDxJ9+RzssA9qg+U5MDr rsLsDpwH1BmeGpazgzsQxkez4WuMtogwomxGZzeghdPE38hAyAQN1oAxJoDScGwOncNi 07bmCmRJ0XAKnnybivBtPIn0fHlAc9Ekw94BpZi+yTDoJTe97h/lUcDm3svX9CR7MHw0 ZPU8VnD7mBfiPSFB7i0I/8SzfHeqzQbEdltdFxPTRrZKVo/NNZowXUC+S62aNgUSUnrc ZvvVCQlqqdQwUqCpbufwlTDZDv9IFF/VGlotKFbiRUjWAZ0hoPTd5ZkWrc8A1FQPQj7Q XlpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Db+MeSfG7Xjla1DH/d2d5fx2mR5wQu4fm7DO8Zye6kk=; b=O9lsn+0q7nqkIVonSNR8W7JJe1EEspgymL2Q8o87mzjwXPMdzA4eqhkRUac2UExYbz nEArbrOnth85aRymgqFjiVsofSXqlk1AUq1/MG3dd4LVLpqHbLZg407n3NcyZPoMS06r CuB95PjzUjrrZkvudJcGs74EKqEdwLjQlUSlPiEBF+yM4+Fm1nrV85QK2XouX/LnTVAQ oLWD8Fcu/C7rwheMG0Duj5QhpxM7pM8a913UPKXFs4D7cMz6v5KWbuKaPtO5N06e6A/C Na61+vXcER4B9tOcN4PBm4EpDYZgp2Qs6dDCntQ10H9IdWH5hRMp/eZiRUmRcnQwFchO /egA== X-Gm-Message-State: AFqh2kqJr4gYsaO+ViPBrkuK2E4gfIk/bToDp2pIS0I8+99M+Vhj71U5 4svt1jVt4UPqz+KcMzfSEQI= X-Google-Smtp-Source: AMrXdXuu8UsFYnK9oCtY1iOLPRFMc+u3fHsA34fM874utCmEMioplFrTh7VcarGvGnGCnA66EQ/4ag== X-Received: by 2002:a05:600c:34d3:b0:3c6:e61e:ae74 with SMTP id d19-20020a05600c34d300b003c6e61eae74mr31773689wmq.4.1672514247592; Sat, 31 Dec 2022 11:17:27 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n7-20020a1c7207000000b003cf6a55d8e8sm31855657wmc.7.2022.12.31.11.17.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Dec 2022 11:17:27 -0800 (PST) Message-ID: <4f6066deb9488cfe7bcb5bce1ae93d452f517b9f.camel@gmail.com> Subject: Re: [PATCH v7 3/5] gnu: UCD: Add version 3.0-update1. From: Liliana Marie Prikler To: Vivien Kraus , 60358@debbugs.gnu.org Date: Sat, 31 Dec 2022 20:17:25 +0100 In-Reply-To: <86ed1bdd80433e8f3a0407bfe51d1ed4713e875f.camel@planete-kraus.eu> References: <86ed1bdd80433e8f3a0407bfe51d1ed4713e875f.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 30.12.2022 um 22:20 +0100 schrieb Vivien Kraus: > * gnu/packages/unicode.scm (ucd3.0-update1): New variable. Once again, do you need all of these, or just a single file? (Or indeed none at all?) From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 14:26:21 2022 Received: (at 60358) by debbugs.gnu.org; 31 Dec 2022 19:26:21 +0000 Received: from localhost ([127.0.0.1]:39868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBhUq-0005eB-Br for submit@debbugs.gnu.org; Sat, 31 Dec 2022 14:26:21 -0500 Received: from mail-ej1-f65.google.com ([209.85.218.65]:38439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBhUn-0005ds-O1 for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 14:26:19 -0500 Received: by mail-ej1-f65.google.com with SMTP id m18so58445051eji.5 for <60358@debbugs.gnu.org>; Sat, 31 Dec 2022 11:26:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=lALIZDLbVR8alsQpTMKlYNXudhj40xQyEXGQ01Wv2Mw=; b=g7QvU7i0Psm1/DIP+0w/XfV08szVQMCHSpEOJpT0vDsNhgtI1fckxBiuMvPcr53hU+ l5LhEijNEtLy39+l/+LlrAGiMrfuYgwkyCEfDq3qnccXZu87y9QLLywaL8XI8+iuSpj1 8GOOxif2UbrZaLgpVUyr6Oz7uxajBDO/3rHcs6aeOiy4wWIf65VcpsLspLvokzf7tEnh 8fRq9eopnp9dH81FFEzPZ0xKauqQ2spOUyY8GhrVbbkE0dw39zlmzoWhEVE94zsMYPem o6gdcwX9gwAjin7DuQYxvP36K3KBAfvdMGaAqNdmAChpQacNYAzdQidUhVRQzRoTsTg/ Kojw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lALIZDLbVR8alsQpTMKlYNXudhj40xQyEXGQ01Wv2Mw=; b=Rf5htTt8K8JnyjxQYxrzvqTnufulvXyw1ZvRfsZCttjAgNWq2u0yiGgW/LUHixS7iL IXJYxiaa6Q9a/igZ7Wtieg0xzw3ZR5AcZ9g9A+3jJ0SjiDVnPvvh4lHK/pANmzdY7DwM k288kke4SmgiWYx6kZYa0GfpsIdg8pu20OgOVpIamgf6+mGC8egohOuKMgNkVL1jFry3 FfyRkaGbdAN/N0JZPy+Ur2I4tOdUzotNA3rP94hPekp3iNQN+8cg0aPeuARRjqH9UZ8f ZzMNkHClS1e0wPaw9GzDkDzWgUWZmw2GDZ+CTd637Njp6w4TjpgmxPwfJ3fYkd/6Yv/t sYZA== X-Gm-Message-State: AFqh2koWh2LFePqPZl5ooAjJV/T5epRnIj2yh+1VQzJDsUpRKQWKh3+k 3A2Y4DEZrfWy1e72e1EoOck= X-Google-Smtp-Source: AMrXdXtYO5kroZ4s0Sdb6W0ESWTj/YHeYlWs3Wj34gghIDTARrgLcdRN3TfcQdHgiCJ5G1HDPqDvNQ== X-Received: by 2002:a17:906:eb8f:b0:7ae:7e6:3a87 with SMTP id mh15-20020a170906eb8f00b007ae07e63a87mr28328300ejb.41.1672514771775; Sat, 31 Dec 2022 11:26:11 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id kz26-20020a17090777da00b007c1a6692aeesm10955584ejc.189.2022.12.31.11.26.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Dec 2022 11:26:11 -0800 (PST) Message-ID: <4b3c573ebd8280f71981316ca8fe8d27f169c809.camel@gmail.com> Subject: Re: [PATCH v7 4/5] gnu: Add gnulib. From: Liliana Marie Prikler To: Vivien Kraus , 60358@debbugs.gnu.org Date: Sat, 31 Dec 2022 20:26:10 +0100 In-Reply-To: <443f01dcd18783358bb44f96a57fe4162dcdfeb0.camel@planete-kraus.eu> References: <443f01dcd18783358bb44f96a57fe4162dcdfeb0.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gRGllbnN0YWcsIGRlbSAyNy4xMi4yMDIyIHVtIDE3OjIzICswMTAwIHNjaHJpZWIgVml2aWVu IEtyYXVzOgo+ICogZ251L3BhY2thZ2VzL2J1aWxkLXRvb2xzLnNjbSAoZ251bGliKTogTmV3IHZh cmlhYmxlLgo+IChnbnVsaWItY2hlY2tvdXQpOiBOZXcgZnVuY3Rpb24uIEl0IHJldHVybnMgYSBw YWNrYWdlIHdpdGggYSBzcGVjaWZpYwo+IGNvbW1pdCBvZiBnbnVsaWIuCkJ0dy4geW91IGNhbiBz aG9ydGVuIHRoaXMgdG8gKGdudWxpYi1jaGVja291dCwgZ251bGliKTogTmV3IHZhcmlhYmxlcy4K PiAtLS0KPiDCoGdudS9wYWNrYWdlcy9idWlsZC10b29scy5zY20gfCAyMjAKPiArKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKwo+IMKgMSBmaWxlIGNoYW5nZWQsIDIyMCBpbnNlcnRp b25zKCspCj4gCj4gZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9idWlsZC10b29scy5zY20gYi9n bnUvcGFja2FnZXMvYnVpbGQtCj4gdG9vbHMuc2NtCj4gaW5kZXggNmMxMzUwYzQ0Zi4uZDJlZWI4 OGRiNiAxMDA2NDQKPiAtLS0gYS9nbnUvcGFja2FnZXMvYnVpbGQtdG9vbHMuc2NtCj4gKysrIGIv Z251L3BhY2thZ2VzL2J1aWxkLXRvb2xzLnNjbQo+IEBAIC0zMiwyNyArMzIsMzYgQEAKPiDCoDs7 OyBhbG9uZyB3aXRoIEdOVSBHdWl4LsKgIElmIG5vdCwgc2VlCj4gPGh0dHA6Ly93d3cuZ251Lm9y Zy9saWNlbnNlcy8+Lgo+IMKgCj4gwqAoZGVmaW5lLW1vZHVsZSAoZ251IHBhY2thZ2VzIGJ1aWxk LXRvb2xzKQo+ICvCoCAjOnVzZS1tb2R1bGUgKGljZS05IG9wdGFyZ3MpCj4gwqDCoCAjOnVzZS1t b2R1bGUgKChndWl4IGxpY2Vuc2VzKSAjOnByZWZpeCBsaWNlbnNlOikKPiDCoMKgICM6dXNlLW1v ZHVsZSAoZ3VpeCB1dGlscykKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ3VpeCBwYWNrYWdlcykKPiDC oMKgICM6dXNlLW1vZHVsZSAoZ3VpeCBnZXhwKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChndWl4IGRv d25sb2FkKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChndWl4IGdpdC1kb3dubG9hZCkKPiArwqAgIzp1 c2UtbW9kdWxlIChndWl4IGdpdCkKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ3VpeCBidWlsZC1zeXN0 ZW0gY21ha2UpCj4gK8KgICM6dXNlLW1vZHVsZSAoZ3VpeCBtb2R1bGVzKQo+IMKgwqAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBh ZG5zKQo+ICvCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBhdXRvdG9vbHMpCj4gwqDCoCAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBiYXNlKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUg cGFja2FnZXMgYmFzaCkKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGNoZWNrKQo+ ICvCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBjb2RlKQo+IMKgwqAgIzp1c2UtbW9kdWxl IChnbnUgcGFja2FnZXMgY29tcHJlc3Npb24pCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBjcHApCj4gK8KgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGNwcGkpCj4gwqDCoCAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBlbGYpCj4gK8KgICM6dXNlLW1vZHVsZSAoZ251IHBh Y2thZ2VzIGdjYykKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGxpbnV4KQo+ICvC oCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBsaXNwKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChn bnUgcGFja2FnZXMgbG9nZ2luZykKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGx1 YSkKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIG5pbmphKQo+IMKgwqAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgcGFja2FnZS1tYW5hZ2VtZW50KQo+IMKgwqAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMgcGNyZSkKPiArwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMg cGVybCkKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHBrZy1jb25maWcpCj4gwqDC oCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwcmV0dHktcHJpbnQpCj4gwqDCoCAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBwcm90b2J1ZikKPiBAQCAtNjUsNiArNzQsNyBAQCAoZGVmaW5l LW1vZHVsZSAoZ251IHBhY2thZ2VzIGJ1aWxkLXRvb2xzKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChn bnUgcGFja2FnZXMgcnBjKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgc3FsaXRl KQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgdGxzKQo+ICvCoCAjOnVzZS1tb2R1 bGUgKGdudSBwYWNrYWdlcyB1bmljb2RlKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2Fn ZXMgdmVyc2lvbi1jb250cm9sKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3Rl bSBnbnUpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGd1aXggYnVpbGQtc3lzdGVtIHB5dGhvbikpCj4g QEAgLTgwMywzICs4MTMsMjEzIEBAIChkZWZpbmUtcHVibGljIGdlbmllCj4gwqBzYW1lIHNldHRp bmdzIHRvIG11bHRpcGxlIHByb2plY3RzLsKgIEl0IHN1cHBvcnRzIGdlbmVyYXRpbmcgcHJvamVj dHMKPiB1c2luZyBHTlUKPiDCoE1ha2VmaWxlcywgSlNPTiBDb21waWxhdGlvbiBEYXRhYmFzZSwg YW5kIGV4cGVyaW1lbnRhbGx5IE5pbmphLiIpCj4gwqDCoMKgwqDCoMKgIChsaWNlbnNlIGxpY2Vu c2U6YnNkLTMpKSkpCj4gKwo+ICsoZGVmaW5lKi1wdWJsaWMgKGdudWxpYi1jaGVja291dCAjOmtl eQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIHZlcnNpb24KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAocmV2aXNpb24gIjEiKQo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IGNvbW1pdAo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIGhhc2gpCj4gK8KgICJSZXR1cm4gYXMgYSBwYWNrYWdlIHRoZSBl eGFjdCBnbnVsaWIgY2hlY2tvdXQuIgo+ICvCoCAocGFja2FnZQo+ICvCoMKgwqAgKG5hbWUgImdu dWxpYiIpCj4gK8KgwqDCoCAodmVyc2lvbiAoZ2l0LXZlcnNpb24gdmVyc2lvbiByZXZpc2lvbiBj b21taXQpKQo+ICvCoMKgwqAgKHNvdXJjZQo+ICvCoMKgwqDCoCAob3JpZ2luCj4gK8KgwqDCoMKg wqDCoCAobWV0aG9kIGdpdC1mZXRjaCkKPiArwqDCoMKgwqDCoMKgICh1cmkgKGdpdC1yZWZlcmVu Y2UKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICh1cmwgImh0dHBzOi8vZ2l0LnNhdmFubmFo LmdudS5vcmcvZ2l0L2dudWxpYi5naXQiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNv bW1pdCBjb21taXQpKSkKPiArwqDCoMKgwqDCoMKgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5hbWUg bmFtZSB2ZXJzaW9uKSkKPiArwqDCoMKgwqDCoMKgIChzaGEyNTYgaGFzaCkKPiArwqDCoMKgwqDC oMKgIChzbmlwcGV0Cj4gK8KgwqDCoMKgwqDCoMKgICh3aXRoLWltcG9ydGVkLW1vZHVsZXMgKHNv dXJjZS1tb2R1bGUtY2xvc3VyZSAnKChndWl4IGJ1aWxkCj4gdXRpbHMpKSkKPiArwqDCoMKgwqDC oMKgwqDCoMKgICN+KGJlZ2luCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICh1c2UtbW9k dWxlcyAoZ3VpeCBidWlsZCB1dGlscykKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoaWNlLTkgZnR3KQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChpY2UtOSByZGVsaW0pKQo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyAuYywgLmggYW5kIC5ncGVyZiBmaWxlcyB3aG9zZSBm aXJzdCBsaW5lIGlzIC8qIERPCj4gTk9UIEVESVQhCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIDs7IEdFTkVSQVRFRCBBVVRPTUFUSUNBTExZISAqLyBhcmUgZ2VuZXJhdGVkCj4gYXV0b21h dGljYWxseSBiYXNlZAo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBvbiB0aGUgdW5p Y29kZSBkYXRhYmFzZS4gU2luY2Ugd2UgcmVwbGFjZSB0aGUKPiB1bmljb2RlCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIDs7IGRhdGFiYXNlIHdpdGggb3VyIG93biwgd2UgbmVlZCB0byBy ZWdlbmVyYXRlIHRoZW0uCj4gU28sIHRoZXkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg OzsgYXJlIHJlbW92ZWQgZnJvbSB0aGUgc291cmNlLiBUaGV5IGFyZSBzcHJpbmtsZWQgYWxsCj4g b3ZlciB0aGUKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgcGxhY2UgdW5mb3J0dW5h dGVseSwgc28gd2UgY2Fu4oCZdCBleGNsdWRlIHdob2xlCj4gZGlyZWN0b3JpZXMuCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsZXQgKChjb3VudC1wdXJnZWQKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZmlsZS1zeXN0ZW0tZm9sZAo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgZW50ZXI/Cj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRhIChuYW1lIHN0YXQgcmVz dWx0KQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICN0 KQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgbGVhZgo+ ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSAobmFt ZSBzdGF0IHJlc3VsdCkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoaWYgKG9yIChzdHJpbmctc3VmZml4PyAiLmMiIG5hbWUpCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJp bmctc3VmZml4PyAiLmgiIG5hbWUpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJpbmctc3VmZml4PyAiLmdwZXJmIiBu YW1lKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIChjYWxsLXdpdGgtaW5wdXQtZmlsZSBuYW1lCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSAocG9ydCkKPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgKGxldCAoKGZpcnN0LWxpbmUgKHJlYWQtbGluZSBwb3J0KSkpCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo aWYgKGVxdWFsPwo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGZpcnN0LWxpbmUKPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAiLyogRE8gTk9UIEVESVQhIEdFTkVSQVRFRAo+IEFVVE9NQVRJQ0FMTFkhICov IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGJlZ2luCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo ZGVsZXRlLWZpbGUgbmFtZSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgxKyByZXN1bHQpKQo+ ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCByZXN1bHQpKSkpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCByZXN1bHQpKQo+ICvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgZG93bgo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSAobmFtZSBzdGF0IHJlc3VsdCkKPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCByZXN1bHQpCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyB1cAo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSAobmFtZSBzdGF0 IHJlc3VsdCkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCByZXN1bHQpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7 OyBza2lwCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFt YmRhIChuYW1lIHN0YXQgcmVzdWx0KQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChlcnJvciAiTm8gZGlyZWN0b3J5IHNob3VsZCBiZSBzcGFyZWQiKSkK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IGVycm9yCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRhIChuYW1l IHN0YXQgZXJybm8gcmVzdWx0KQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChlcnJvciAiQSBmaWxlIGlzIGluYWNjZXNzaWJsZSIpKQo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgSW5pdGlhbCB2YWx1ZQo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgMAo+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGdldGN3ZCkpKSkKSSB0aGluayBpdCBz aG91bGQgYmUgcG9zc2libGUgdG8gZXhwcmVzcyB0aGlzIGxpc3QgaW4gdGVybXMgb2YgZmluZC0K ZmlsZXMuICBOb3RlIHRoYXQgaXQgYWNjZXB0cyBhIHByb2NlZHVyZSByYXRoZXIgdGhhbiBqdXN0 IGEgc2ltcGxlCnJlZ2V4cCB0b28uCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo dW5sZXNzIChlcXY/IGNvdW50LXB1cmdlZCAzMzIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgKGZvcm1hdCAoY3VycmVudC1lcnJvci1wb3J0KSAiVGhlcmUgd2VyZSB+cyBm aWxlcwo+IHB1cmdlZC5cbiIgY291bnQtcHVyZ2VkKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChlcnJvciAiUGxlYXNlIGNoZWNrIHRoZSBudW1iZXIgb2YgYXV0b21hdGlj YWxseQo+IGdlbmVyYXRlZCBmaWxlcy4iKSkpCkknbSBub3Qgc3VyZSB3aGV0aGVyIHRoaXMgY2hl Y2sgaXMgYSBnb29kIGlkZWEuICBUaGlzIHNlZW1zIHRvIGJlIHRoZQpraW5kIG9mIHRoaW5nIHRo YXQgd2lsbCBicmVhayBmb3Igbm8gcmVhc29uLgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCA7OyBPdGhlciBmaWxlcyBhcmUgY29waWVkIGZyb20gVUNELgo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAoZm9yLWVhY2ggZGVsZXRlLWZpbGUKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAnKCJ0ZXN0cy91bmlnYnJrL0dyYXBoZW1lQnJlYWtU ZXN0LnR4dCIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgInRlc3RzL3VuaW5vcm0vTm9ybWFsaXphdGlvblRlc3QudHh0Igo+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAidGVzdHMvdW5pbmFtZS9V bmljb2RlRGF0YS50eHQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgICJ0ZXN0cy91bmluYW1lL05hbWVBbGlhc2VzLnR4dCIKPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgRklYTUU6Cj4gdGVz dHMvdW5pbmFtZS9IYW5ndWxTeWxsYWJsZU5hbWVzLnR4dAo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBzZWVtcyBsaWtlIGEgVUNEIGZpbGUg YnV0IGl0IGlzIG5vdAo+IGRpc3RyaWJ1dGVkCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IHdpdGggVUNELgo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAidGVzdHMvdW5pd2Jyay9Xb3JkQnJl YWtUZXN0LnR4dCIpKSkpKSkpCj4gK8KgwqDCoCAoYnVpbGQtc3lzdGVtIGdudS1idWlsZC1zeXN0 ZW0pCj4gK8KgwqDCoCAoYXJndW1lbnRzCj4gK8KgwqDCoMKgIChsaXN0Cj4gK8KgwqDCoMKgwqAg IzpwaGFzZXMKPiArwqDCoMKgwqDCoCAjfihtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMK PiArwqDCoMKgwqDCoMKgwqDCoMKgIChhZGQtYWZ0ZXIgJ3VucGFjayAnZml4LXRlc3RzCj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSBfCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIChzdWJzdGl0dXRlKiAiTWFrZWZpbGUiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAoKCItZiBtYWludC5tayBzeW50YXgtY2hlY2siKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAiX2dsLU1ha2VmaWxlPXllcyAtZiBtYWludC5tayBzeW50YXgtY2hlY2si KSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGludm9rZSAiZ2l0IiAiaW5pdCIpCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChpbnZva2UgImdpdCIgImNvbmZpZyIgInVzZXIu bmFtZSIgIkd1aXgiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoaW52b2tlICJnaXQi ICJjb25maWciICJ1c2VyLmVtYWlsIiAiZ3VpeEBsb2NhbGhvc3QiKQo+ICvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAoaW52b2tlICJnaXQiICJhZGQiICIuIikKPiArwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgKGludm9rZSAiZ2l0IiAiY29tbWl0IiAiLW0iCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiU3ludGF4IGNoZWNrcyBhcmUgb25seSBydW4g YWdhaW5zdCBjb21taXR0ZWQKPiBmaWxlcywgc28gY29tbWl0IGV2ZXJ5dGhpbmcuIikpKQo+ICvC oMKgwqDCoMKgwqDCoMKgwqAgKGFkZC1hZnRlciAnZml4LXRlc3RzICdkaXNhYmxlLWZhaWxpbmct dGVzdHMKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRhIF8KPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKHN1YnN0aXR1dGUqICJjZmcubWsiCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAoKCJsb2NhbC1jaGVja3MtdG8tc2tpcCA9IikKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgImxvY2FsLWNoZWNrcy10by1za2lwID0gXFwKPiArwqAgc2Nf V3VuZGVmX2Jvb2xlYW4gXFwKPiArwqAgc2NfZmlsZV9zeXN0ZW0gXFwKPiArwqAgc2NfaW5kZW50 IFxcCj4gK8KgIHNjX2tlZXBfZ251bGliX3RleGlfZmlsZXNfbW9zdGx5X2FzY2lpIFxcCj4gK8Kg IHNjX3Byb2hpYml0X2Fzc2VydF93aXRob3V0X3VzZSBcXAo+ICvCoCBzY19wcm9oaWJpdF9jbG9z ZV9zdHJlYW1fd2l0aG91dF91c2UgXFwKPiArwqAgc2NfcHJvaGliaXRfZGVmaW5lZF9oYXZlX2Rl Y2xfdGVzdHMgXFwKPiArwqAgc2NfcHJvaGliaXRfZG91YmxlZF93b3JkIFxcCj4gK8KgIHNjX3By b2hpYml0X2VtcHR5X2xpbmVzX2F0X0VPRiBcXAo+ICvCoCBzY19wcm9oaWJpdF9pbnRwcm9wc193 aXRob3V0X3VzZSBcXAo+ICvCoCBzY19wcm9oaWJpdF9vcGVuYXRfd2l0aG91dF91c2UgXFwKPiAr wqAgc2NfcHJvaGliaXRfdGVzdF9taW51c19hbyBcXAo+ICvCoCBzY191bnBvcnRhYmxlX2dyZXBf cSIpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3Vic3RpdHV0ZSogIk1ha2VmaWxl Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgic2NfY2hlY2tfc3ltX2xpc3Qi KQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiZGlzYWJsZWRfY2hlY2tfc3lt X2xpc3QiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgic2NfY3BwX2luZGVu dF9jaGVjayIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJkaXNhYmxlZF9j cHBfaW5kZW50X2NoZWNrIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoInNj X2NoZWNrX2NvcHlyaWdodCIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJk aXNhYmxlZF9jaGVja19jb3B5cmlnaHQiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKCgic2NfcHJvaGliaXRfQUNfTElCT0JKX2luX200IikKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgImRpc2FibGVkX3Byb2hpYml0X0FDX0xJQk9CSl9pbl9tNCIpCj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJzY19wcmVmZXJfYWNfY2hlY2tfZnVuY3Nf b25jZSIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJkaXNhYmxlZF9wcmVm ZXJfYWNfY2hlY2tfZnVuY3Nfb25jZSIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAoKCJzY19wcm9oaWJpdF9sZWFkaW5nX1RBQnMiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAiZGlzYWJsZWRfcHJvaGliaXRfbGVhZGluZ19UQUJzIikpKSkKPiArwqDCoMKg wqDCoMKgwqDCoMKgIChkZWxldGUgJ2NvbmZpZ3VyZSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgIChh ZGQtYWZ0ZXIgJ3VucGFjayAncmVnZW5lcmF0ZS11bmljb2RlCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyAjOmFsbG93LW90aGVyLWtleXMpCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgICh3aXRoLWRpcmVjdG9yeS1leGN1cnNpb24gImxpYiIKPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IFNlZSB0aGUgY29tcGlsZS1jb21tYW5k IGJ1ZmZlci1sb2NhbCB2YXJpYWJsZSBpbgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgOzsgbGliL2dlbi11bmktdGFibGVzLmMKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIChpbnZva2UgIysoZmlsZS1hcHBlbmQgZ2NjICIvYmluL2djYyIpICItTyIgIi1XYWxsIgo+ ICJnZW4tdW5pLXRhYmxlcy5jIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgICItSXVuaWN0eXBlIiAiLW8iICJnZW4tdW5pLXRhYmxlcyIpCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoYXBwbHkgaW52b2tlCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICIuL2dlbi11bmktdGFibGVzIgo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBgKCxAKG1hcCAobGFtYmRh IChmKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKHNlYXJjaC1pbnB1dC1maWxlIGlucHV0cyBmKSkKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg Jygic2hhcmUvdWNkL1VuaWNvZGVEYXRhLnR4dCIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJzaGFyZS91Y2QvUHJv cExpc3QudHh0Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAKPiAic2hhcmUvdWNkL0Rlcml2ZWRDb3JlUHJvcGVydGll cy50eHQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAic2hhcmUvdWNkL2Vtb2ppL2Vtb2ppLWRhdGEudHh0Igo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgInNoYXJlL3VjZC9BcmFiaWNTaGFwaW5nLnR4dCIKPiArwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJzaGFy ZS91Y2QvU2NyaXB0cy50eHQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAic2hhcmUvdWNkL0Jsb2Nrcy50eHQiCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAic2hhcmUvdWNkL1Byb3BMaXN0LTMuMC4xLnR4dCIKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJz aGFyZS91Y2QvRWFzdEFzaWFuV2lkdGgudHh0Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgInNoYXJlL3VjZC9MaW5l QnJlYWsudHh0Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAKPiAic2hhcmUvdWNkL2F1eGlsaWFyeS9Xb3JkQnJlYWtQ cm9wZXJ0eS50eHQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoAo+ICJzaGFyZS91Y2QvYXV4aWxpYXJ5L0dyYXBoZW1l QnJlYWtQcm9wZXJ0eS50eHQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoAo+ICJzaGFyZS91Y2QvQ29tcG9zaXRpb25F eGNsdXNpb25zLnR4dCIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJzaGFyZS91Y2QvU3BlY2lhbENhc2luZy50eHQi Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAic2hhcmUvdWNkL0Nhc2VGb2xkaW5nLnR4dCIpKQo+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgVGhpcyBpcyB0aGUgdmVy c2lvbiBvZiB0aGUgVUNEIHVzZWQsIGl0Cj4gc2hvdWxkIGJlCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyB0aGUgc2FtZSBhcyB0aGUgbmF0aXZl LWlucHV0Lgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgIyQocGFja2FnZS12ZXJzaW9uIHVjZC1uZXh0KSkpClVzZSAocGFja2FnZS12ZXJzaW9uICh0 aGlzLXBhY2thZ2UtaW5wdXQgInVjZCIpKSBpbnN0ZWFkLCBzbyB0aGF0IGEKdXNlciBjYW4gcmVw bGFjZSBpdC4KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChpbnZva2UgImNsaXNw IiAiLUMiICJ1bmluYW1lL2dlbi11bmluYW1lcy5saXNwIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzZWFyY2gtaW5wdXQtZmlsZSBpbnB1dHMKPiAi c2hhcmUvdWNkL1VuaWNvZGVEYXRhLnR4dCIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgInVuaW5hbWUvdW5pbmFtZXMuaCIKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc2VhcmNoLWlucHV0LWZpbGUgaW5w dXRzCj4gInNoYXJlL3VjZC9OYW1lQWxpYXNlcy50eHQiKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChjb3B5LWZpbGUgKHNlYXJjaC1pbnB1dC1maWxlIGlucHV0cwo+ICJzaGFy ZS91Y2QvTmFtZUFsaWFzZXMudHh0IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiLi4vdGVzdHMvdW5pbmFtZS9OYW1lQWxpYXNlcy50eHQi KQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvcHktZmlsZSAoc2VhcmNoLWlu cHV0LWZpbGUgaW5wdXRzCj4gInNoYXJlL3VjZC9Vbmljb2RlRGF0YS50eHQiKQo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICIuLi90ZXN0cy91 bmluYW1lL1VuaWNvZGVEYXRhLnR4dCIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAoY29weS1maWxlIChzZWFyY2gtaW5wdXQtZmlsZSBpbnB1dHMKPiAic2hhcmUvdWNkL05vcm1h bGl6YXRpb25UZXN0LnR4dCIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgIi4uL3Rlc3RzL3VuaW5vcm0vTm9ybWFsaXphdGlvblRlc3QudHh0 IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjb3B5LWZpbGUgKHNlYXJjaC1p bnB1dC1maWxlIGlucHV0cwo+ICJzaGFyZS91Y2QvYXV4aWxpYXJ5L0dyYXBoZW1lQnJlYWtUZXN0 LnR4dCIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgIi4uL3Rlc3RzL3VuaWdicmsvR3JhcGhlbWVCcmVha1Rlc3QudHh0IikKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjb3B5LWZpbGUgKHNlYXJjaC1pbnB1dC1maWxlIGlu cHV0cwo+ICJzaGFyZS91Y2QvYXV4aWxpYXJ5L1dvcmRCcmVha1Rlc3QudHh0IikKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiLi4vdGVzdHMv dW5pd2Jyay9Xb3JkQnJlYWtUZXN0LnR4dCIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAoZGVsZXRlLWZpbGUgImdlbi11bmktdGFibGVzIikpKSkKPiArwqDCoMKgwqDCoMKgwqDC oMKgIChyZXBsYWNlICdpbnN0YWxsCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSBf Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChpbnN0YWxsLWZpbGUgImdudWxpYi10b29s Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKHN0cmluZy1hcHBlbmQgIyRvdXRwdXQgIi9iaW4iKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKGRlbGV0ZS1maWxlLXJlY3Vyc2l2ZWx5ICIuZ2l0IikKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKGNvcHktcmVjdXJzaXZlbHkgIi4iIChzdHJpbmctYXBwZW5kICMkb3V0 cHV0Cj4gIi9zcmMvZ251bGliLyIpKSkpKSkpCj4gK8KgwqDCoCAoaW5wdXRzIDs7IFNoZWJhbmdz IGZvciBzb21lIGF1eGlsaWFyeSBidWlsZCBmaWxlcy4KPiArwqDCoMKgwqAgKGxpc3QgcHl0aG9u IHBlcmwgY2xpc3ApKQo+ICvCoMKgwqAgKG5hdGl2ZS1pbnB1dHMKPiArwqDCoMKgwqAgKGxpc3QK PiArwqDCoMKgwqDCoCBweXRob24gcGVybCBjbGlzcAo+ICvCoMKgwqDCoMKgIDs7IFVuaWNvZGUg ZGF0YToKPiArwqDCoMKgwqDCoCB1Y2QtbmV4dCA7OyBJZiB5b3UgY2hhbmdlIGl0LCBhbHNvIGNo YW5nZSAjJChwYWNrYWdlLXZlcnNpb24KPiB1Y2QtbmV4dCkKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCA7OyBpbiB0aGUgcmVnZW5lcmF0ZS11bmljb2RlIHBoYXNlLgo+ICvCoMKgwqDC oMKgIHVjZDMuMC11cGRhdGUxCj4gK8KgwqDCoMKgwqAgOzsgUHJvZ3JhbXMgZm9yIHRoZSB0ZXN0 czoKPiArwqDCoMKgwqDCoCBjcHBpIGluZGVudCBnaXQgYXV0b2NvbmYpKQo+ICvCoMKgwqAgKGhv bWUtcGFnZSAiaHR0cHM6Ly93d3cuZ251Lm9yZy9zb2Z0d2FyZS9nbnVsaWIvIikKPiArwqDCoMKg IChzeW5vcHNpcyAiU291cmNlIGZpbGVzIHRvIHNoYXJlIGFtb25nIGRpc3RyaWJ1dGlvbnMiKQo+ ICvCoMKgwqAgKGRlc2NyaXB0aW9uCj4gK8KgwqDCoMKgICJHbnVsaWIgaXMgYSBjZW50cmFsIGxv Y2F0aW9uIGZvciBjb21tb24gaW5mcmFzdHJ1Y3R1cmUgbmVlZGVkCj4gYnkgR05VCj4gK3BhY2th Z2VzLsKgIEl0IHByb3ZpZGVzIGEgd2lkZSB2YXJpZXR5IG9mIGZ1bmN0aW9uYWxpdHksIGUuZy4s Cj4gcG9ydGFiaWxpdHkKPiArYWNyb3NzIG1hbnkgc3lzdGVtcywgd29ya2luZyB3aXRoIFVuaWNv ZGUgc3RyaW5ncywgY3J5cHRvZ3JhcGhpYwo+IGNvbXB1dGF0aW9uLAo+ICthbmQgbXVjaCBtb3Jl LsKgIFRoZSBjb2RlIGlzIGludGVuZGVkIHRvIGJlIHNoYXJlZCBhdCB0aGUgbGV2ZWwgb2YKPiBz b3VyY2UKPiArZmlsZXMsIHJhdGhlciB0aGFuIGJlaW5nIGEgc3RhbmRhbG9uZSBsaWJyYXJ5IHRo YXQgaXMgZGlzdHJpYnV0ZWQsCj4gYnVpbHQsIGFuZAo+ICtpbnN0YWxsZWQuwqAgVGhlIGluY2x1 ZGVkIEBjb21tYW5ke2dudWxpYi10b29sfSBzY3JpcHQgaGVscHMgd2l0aAo+IHVzaW5nIEdudWxp Ygo+ICtjb2RlIGluIG90aGVyIHBhY2thZ2VzLsKgIEdudWxpYiBhbHNvIGluY2x1ZGVzIGNvcGll cyBvZiBsaWNlbnNpbmcKPiBhbmQKPiArbWFpbnRlbmFuY2UtcmVsYXRlZCBmaWxlcywgZm9yIGNv bnZlbmllbmNlLiIpCj4gK8KgwqDCoCAobmF0aXZlLXNlYXJjaC1wYXRocwo+ICvCoMKgwqDCoCAo bGlzdCAoc2VhcmNoLXBhdGgtc3BlY2lmaWNhdGlvbgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg ICh2YXJpYWJsZSAiR05VTElCX1NSQ0RJUiIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGZp bGVzIChsaXN0ICJzcmMvZ251bGliIikpKSkpCj4gK8KgwqDCoCAobGljZW5zZSAobGlzdCBsaWNl bnNlOmxncGwyLjArIGxpY2Vuc2U6Z3BsMyspKSkpCkNoZWVycwoK From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 19:24:32 2022 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 00:24:32 +0000 Received: from localhost ([127.0.0.1]:40021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBm9P-0004wf-9Z for submit@debbugs.gnu.org; Sat, 31 Dec 2022 19:24:32 -0500 Received: from planete-kraus.eu ([89.234.140.182]:55732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBm9M-0004wQ-3q for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 19:24:30 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 5888b3c9; Sun, 1 Jan 2023 00:24:25 +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=B3zegkLM Ay0b2y1YJ4Jlq8vLNOM=; b=hCYGsF3PwNd0Zddi0v8CwUGq8x0HM6O93hKqU+qO 7NPfSEFc91SaiShxae42tk1PuEN/ILhIe9OzRWJ3TMcTqasUCB5OIhcqPYfi6V1Z whBgCvkE+q90KrjsBQOvixIK+IRkR5HWYvku8qC9IJ76WDPnDEhPN7LOIrog1eSp Z/s= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 1f3fc626 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 00:24:23 +0000 (UTC) From: Vivien Kraus Date: Wed, 28 Dec 2022 03:20:54 +0100 Subject: [PATCH v8 4/4] gnu: guile-gnutls: Update to 3.7.11. To: 60358@debbugs.gnu.org Message-ID: MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..2c7e36a6c5 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,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 +424,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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 19:24:37 2022 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 00:24:37 +0000 Received: from localhost ([127.0.0.1]:40025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBm9U-0004x2-Pu for submit@debbugs.gnu.org; Sat, 31 Dec 2022 19:24:36 -0500 Received: from planete-kraus.eu ([89.234.140.182]:55732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBm9O-0004wQ-Fo for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 19:24:31 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 8c78cfd8; Sun, 1 Jan 2023 00:24:27 +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=qdGUCRh1 mE/Cm/UpgSW0nDmXroU=; b=t2PjQjPOcwsirUvTal0+K63yCpbrZt8wqJ8mcL0+ 1jkPToNtKCGvzJMcGvvEzhw45IGnFe9rYxCyp0nzXtF9zEquh3VTZy9bNAEgQaeG YEba5b8k7BMFsE/VXPAfe4wwIAAoTy5xkfyOwbt3jL3+Lp+B3DMS8C/4qA9Co6Wm Y1s= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ff2db27a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 00:24:26 +0000 (UTC) From: Vivien Kraus Date: Sat, 31 Dec 2022 18:33:47 +0100 Subject: [PATCH v8 1/4] gnu: libunibreak: Use ucd instead of ucd-next. To: 60358@debbugs.gnu.org Message-ID: MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 libu [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) * 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 base-commit: 343c220e1b73d8294b1b9a54d7a4ef2db9931e24 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 19:24:37 2022 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 00:24:37 +0000 Received: from localhost ([127.0.0.1]:40027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBm9V-0004x4-14 for submit@debbugs.gnu.org; Sat, 31 Dec 2022 19:24:37 -0500 Received: from planete-kraus.eu ([89.234.140.182]:55732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBm9P-0004wQ-DI for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 19:24:33 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id af52ce31; Sun, 1 Jan 2023 00:24:29 +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=SZnmHd4m WOiBOI83iMeQazMG6C4=; b=ScEUykqe/9w4IJ4LtXAhasgA9LjUzZ8qcTayzkWa 8PUKAaCHSc4Mvmwc5RD0rJBYpFFAaY0mFrEdcdEj8hhMzJOvcRWqG8PmgbDXi2W4 2bvNTgY18DtKOe7ixfKzjThfnF95F7tIgKcy0kybbn13FrjB1sIgshgOlgKivYv4 Jak= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id d9282f30 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 00:24:28 +0000 (UTC) From: Vivien Kraus Date: Sat, 31 Dec 2022 18:34:35 +0100 Subject: [PATCH v8 2/4] gnu: ucd-next: Update to 15.0.0. To: 60358@debbugs.gnu.org Message-ID: <4a28e85195e4972e96d6b4647e337f681027de00.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 uc [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 19:24:38 2022 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 00:24:38 +0000 Received: from localhost ([127.0.0.1]:40029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBm9V-0004xD-BA for submit@debbugs.gnu.org; Sat, 31 Dec 2022 19:24:37 -0500 Received: from planete-kraus.eu ([89.234.140.182]:55732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBm9S-0004wQ-1o for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 19:24:35 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 9f365d51; Sun, 1 Jan 2023 00:24:31 +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=aE2jookO ePpd/yNxeH/+wH6HMio=; b=ZttEUdRfV7z7kEf3HeDyMmWhUQ9ij69yNj1jyRTk XO6YvHEegWRNpjOazJzR5YGNEVV4bUefW7vePa+/EMM3TOtdT6K7tZAcXlOVso4D Zlxq835l791lueyS6PEP+U0cPnf6UlGpUhyasVeI/hkIrqXRugVzHU6+wKsKrfWP N+s= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 5d6832a7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 00:24:30 +0000 (UTC) From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v8 3/4] gnu: Add gnulib. To: 60358@debbugs.gnu.org Message-ID: <8889b453ec239817651fb1e06d35b99422d121f9.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables --- gnu/packages/build-tools.scm | 201 +++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..6b60820649 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,27 +32,36 @@ ; [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables --- gnu/packages/build-tools.scm | 201 +++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..6b60820649 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,27 +32,36 @@ ; [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables --- gnu/packages/build-tools.scm | 201 +++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..6b60820649 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,27 +32,36 @@ ;;; 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) #: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 (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 +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)) @@ -803,3 +813,194 @@ (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 gnu-build-system) + (arguments + (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 =") + ;; 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") + "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) + (add-after 'unpack 'regenerate-unicode + (lambda* (#:key inputs #:allow-other-keys) + (define (find-ucd-file name) + (search-input-file inputs (string-append "share/ucd/" name))) + (define PropList-3.0.1.txt + #$(origin + (method url-fetch) + (uri "https://www.unicode.org/Public/3.0-Update1/PropList-3.0.1.txt") + (sha256 + (base32 + "0k6wyijyzdl5g3nibcwfm898kfydx1pqaz28v7fdvnzdvd5fz7lh")))) + (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 find-ucd-file + '("UnicodeData.txt" + "PropList.txt" + "DerivedCoreProperties.txt" + "emoji/emoji-data.txt" + "ArabicShaping.txt" + "Scripts.txt" + "Blocks.txt")) + ,PropList-3.0.1.txt + ,@(map find-ucd-file + '("EastAsianWidth.txt" + "LineBreak.txt" + "auxiliary/WordBreakProperty.txt" + "auxiliary/GraphemeBreakProperty.txt" + "CompositionExclusions.txt" + "SpecialCasing.txt" + "CaseFolding.txt")) + #$(package-version (this-package-native-input "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" + (string-append #$output "/bin")) + (delete-file-recursively ".git") + (copy-recursively "." (string-append #$output "/src/gnulib/"))))))) + (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-28" + #:commit "14a7b0ce5462c90ce86d97bf952185ec2500d341" + #:hash (base32 "0fz25ccdlxf4xp37rjsl1fslc4g0x12qpvadz4qw0cq18dvx5kbx"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 19:25:06 2022 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 00:25:06 +0000 Received: from localhost ([127.0.0.1]:40036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBm9y-0004yt-1A for submit@debbugs.gnu.org; Sat, 31 Dec 2022 19:25:06 -0500 Received: from planete-kraus.eu ([89.234.140.182]:49288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBm9v-0004yM-LA for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 19:25:04 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id b4ed69d4; Sun, 1 Jan 2023 00:25:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s=dkim; bh=Kp9ptD/PMYIt5SRk8JUra5VDx9U=; b=ekcW+Pqkj9/1ZkoBxkev0EI+4Hhb yxl9iax45GNWpi93KydvNbj/NLaCImaNR0fePXoUCPFk5kWq040rvIe6ijBCwxjm qOBbDqvNfQ0xT0+SYEx4qUzfZ668D+bZM9IND0tMJjqVY9X/1oryZBndeoRte4Hl yL5uDZfRtSqjP98= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 539783e9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 00:24:59 +0000 (UTC) Message-ID: <2206897d7f4826d78caf52b1b7eca47c92313255.camel@planete-kraus.eu> Subject: Re: [PATCH v7 3/5] gnu: UCD: Add version 3.0-update1. From: Vivien Kraus To: Liliana Marie Prikler , 60358@debbugs.gnu.org Date: Sun, 01 Jan 2023 01:24:58 +0100 In-Reply-To: <4f6066deb9488cfe7bcb5bce1ae93d452f517b9f.camel@gmail.com> References: <86ed1bdd80433e8f3a0407bfe51d1ed4713e875f.camel@planete-kraus.eu> <4f6066deb9488cfe7bcb5bce1ae93d452f517b9f.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Happy new year! Le samedi 31 d=C3=A9cembre 2022 =C3=A0 20:17 +0100, Liliana Marie Prikler a =C3=A9crit=C2=A0: > Am Freitag, dem 30.12.2022 um 22:20 +0100 schrieb Vivien Kraus: > > * gnu/packages/unicode.scm (ucd3.0-update1): New variable. > Once again, do you need all of these, or just a single file?=C2=A0 (Or > indeed none at all?) The build fails if I pass an empty file or a file with just the header. I switched to an unnamed origin in the build phase, is that better? Vivien From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 31 20:28:47 2022 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 01:28:47 +0000 Received: from localhost ([127.0.0.1]:40047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBn9a-0006dV-QS for submit@debbugs.gnu.org; Sat, 31 Dec 2022 20:28:47 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:41497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBn9Y-0006dD-UX for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 20:28:45 -0500 Received: by mail-ed1-f68.google.com with SMTP id g1so21382905edj.8 for <60358@debbugs.gnu.org>; Sat, 31 Dec 2022 17:28:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=V7guXbru5yH7sFkDcdV4JQVzbYBY8qg5niqvzje+Tjw=; b=jblovc50YWVgKG3UcaZ9DT26OwXvmH45j0xhJcXGh9r9j6891ToTXIH+aqV7cMr3e4 bNccNqVMysN1cQOW9NzE8Hv4TcyypDRn8ftagxkTmeUc7954VvOETP/zef1xcx2eFfwi WIsD8ogQFsy4iJnHavijbDYlAWRLfrSCP0kSg0exM4CkmePgqq1sfQKA4PZDweE/1DKr sYO7ACTYya/iw2NqkkKNjhdwHFzXKvQ4kxskDnP6TicQCxgOF5FVP55qNTtOQmr8fDRE RG/U53u7uKE8WKuK5mmVGDsKZGOMCwXHmZLB87lT88fj8ve8VowpdT3WOvKDTEXcOLSo MoBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=V7guXbru5yH7sFkDcdV4JQVzbYBY8qg5niqvzje+Tjw=; b=M6k940MwavxI7P/sgMyWFMUFMHdpPDpxnlUjQE2gRjFxM5UtvIW4yO+GyMqtw7oagw Y1QOQqEhnwptBNJ+qzehawYTMjpUejMsrtjZjyCUcVweFiaUkhXTxkuwjn0p/wpoAkIn 9sL+cGsrtSWsVpfJr+1CBOVIWCxUZfUk/+Vd5AHXyOqHnX8bm2Ctd+5X8iiWdwgosHwh HGdDqevavb6asEJEAPf0CGxao1ObIfHU00JfsKxqN8zOg3gTQfoX+rZ76CExEY8hBQxc bFjB5k1be6gs07XbmBtZ/hzeov/qKzuuPQzDzteLMz8Z9kihMj1Cgm0pC5auSKL6GoDR dzXA== X-Gm-Message-State: AFqh2krBFmgos0BkMv110LQnw7gKDfF7gNS/d6sthDIMhN+cpfzpNoBA k1MwBfQ5QKa7kZSmA28NoZw= X-Google-Smtp-Source: AMrXdXv03bWMFTHTJk7+Nfb2bFSZHqMs8F9IdvmrgLhjNATxo2PdLjawPKWBa1Nz8Z1ki3Q/2agCBw== X-Received: by 2002:aa7:dd13:0:b0:46b:8d4f:1699 with SMTP id i19-20020aa7dd13000000b0046b8d4f1699mr43606980edv.14.1672536518790; Sat, 31 Dec 2022 17:28:38 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r7-20020aa7c147000000b0046cbcc86bdesm11130584edp.7.2022.12.31.17.28.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Dec 2022 17:28:38 -0800 (PST) Message-ID: <73cdf6ccd738d27a1b92bf106f91f9a8a6662559.camel@gmail.com> Subject: Re: [PATCH v7 3/5] gnu: UCD: Add version 3.0-update1. From: Liliana Marie Prikler To: Vivien Kraus , 60358@debbugs.gnu.org Date: Sun, 01 Jan 2023 02:28:36 +0100 In-Reply-To: <2206897d7f4826d78caf52b1b7eca47c92313255.camel@planete-kraus.eu> References: <86ed1bdd80433e8f3a0407bfe51d1ed4713e875f.camel@planete-kraus.eu> <4f6066deb9488cfe7bcb5bce1ae93d452f517b9f.camel@gmail.com> <2206897d7f4826d78caf52b1b7eca47c92313255.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sonntag, dem 01.01.2023 um 01:24 +0100 schrieb Vivien Kraus: > Happy new year! >=20 > Le samedi 31 d=C3=A9cembre 2022 =C3=A0 20:17 +0100, Liliana Marie Prikler= a > =C3=A9crit=C2=A0: > > Am Freitag, dem 30.12.2022 um 22:20 +0100 schrieb Vivien Kraus: > > > * gnu/packages/unicode.scm (ucd3.0-update1): New variable. > > Once again, do you need all of these, or just a single file?=C2=A0 (Or > > indeed none at all?) >=20 > The build fails if I pass an empty file or a file with just the > header. >=20 > I switched to an unnamed origin in the build phase, is that better? Yes, that is better =E2=80=93 an outside variable would also have been, but= it works for now. > + (("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")))) I think matching the name and then doing (string-append "disabled_" test) should work better and possibly lets you group some. > + (define (find-ucd-file name) > + (search-input-file inputs (string-append > "share/ucd/" name))) I think you should also=C2=A0 (define (find-ucd-files . files) (map find-ucd-file files)) Then you can > + (apply invoke > + "./gen-uni-tables" > + `(,@(map find-ucd-file > + '("UnicodeData.txt" > + "PropList.txt" > + "DerivedCoreProperties.txt" > + "emoji/emoji-data.txt" > + "ArabicShaping.txt" > + "Scripts.txt" > + "Blocks.txt")) > + ,PropList-3.0.1.txt > + ,@(map find-ucd-file > + '("EastAsianWidth.txt" > + "LineBreak.txt" > + "auxiliary/WordBreakProperty.txt" > + =20 > "auxiliary/GraphemeBreakProperty.txt" > + "CompositionExclusions.txt" > + "SpecialCasing.txt" > + "CaseFolding.txt")) (apply invoke (append (find-ucd-files "UnicodeData.txt" "PropList.txt" ...) (list PropList-3.0.1.txt) ; or inline the origin here (find-ucd-files "EastAsianWidth.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") Can we simplify this in terms of for-each and directory excursions? Also reuse find-ucd-file(s). > + (replace 'install > + (lambda _ > + (install-file "gnulib-tool" > + (string-append #$output "/bin")) > + (delete-file-recursively ".git") > + (copy-recursively "." (string-append #$output > "/src/gnulib/"))))))) Should we perhaps use copy-build-system instead and just copy over gnu:build and gnu:test? Cheers From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 10:15:42 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 15:15:42 +0000 Received: from localhost ([127.0.0.1]:40734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC03p-0008IE-A3 for submit@debbugs.gnu.org; Sun, 01 Jan 2023 10:15:42 -0500 Received: from planete-kraus.eu ([89.234.140.182]:33652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC03m-0008Hm-2W for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 10:15:39 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ad5a4783; Sun, 1 Jan 2023 15:15:33 +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=16P0fqJJ WM8rMX/FsD1VylcXV9k=; b=JeGPGxTBUFblHi69jAfEBpIWfkAj8sIDaq/zoBKd Kjsy0SUrlcVBazK3+NFTwjYfN39/fDY/NPwVNjuja4CJOJLH30P7esEtFvqiJi/k NcR+14EBHNTxgTc7EejZQgq6xXSi0rxIE5O8w6+0rQbKmPWvNElzqMFRtUIhVHuB mS0= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ea81a14a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 15:15:30 +0000 (UTC) From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v9 3/4] gnu: Add gnulib. To: 60358@debbugs.gnu.org Message-ID: <18b9463408e0f046dec50c933e3f02fb2783467d.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables --- gnu/packages/build-tools.scm | 201 +++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..3e6a16f3f5 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,27 +32,37 @@ ; [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables --- gnu/packages/build-tools.scm | 201 +++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..3e6a16f3f5 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,27 +32,37 @@ ; [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables --- gnu/packages/build-tools.scm | 201 +++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..3e6a16f3f5 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,27 +32,37 @@ ;;; 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) #: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 (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,193 @@ (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 'gnu:check + (assoc-ref gnu:%standard-phases 'check)) + (add-before 'gnu: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 'gnu: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)\ +|cpp_indent_check\ +|prohibit_(AC_LIBOBJ_in_m4|leading_TABs)\ +|prefer_ac_check_funcs_once)" rule) + (string-append "disabled_" rule))))) + (add-before 'gnu: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" + (search-input-file inputs "share/ucd/UnicodeData.txt") + "uniname/uninames.h" + (search-input-file inputs "share/ucd/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"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 10:15:57 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 15:15:57 +0000 Received: from localhost ([127.0.0.1]:40747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC043-0008JA-Dw for submit@debbugs.gnu.org; Sun, 01 Jan 2023 10:15:57 -0500 Received: from planete-kraus.eu ([89.234.140.182]:33652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC03s-0008Hm-D7 for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 10:15:47 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 92a3b12e; Sun, 1 Jan 2023 15:15:40 +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=B3zegkLM Ay0b2y1YJ4Jlq8vLNOM=; b=BcUAaf4WpU1p989BTL/pjwhwIGz57QzUb63QmdKm VhBUxwHU7w/a3EiIApd9NJfNOQ3jSPN+yYc7O7HQjZBrFPpdVMBZcyoG85USRFCm VnDf5GqTFqMkLER7MARAP4LwwZEEGH/VcRxozUXP7EFI83aI4rBiSkSf6n7NvA69 +wM= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 6b509030 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 15:15:38 +0000 (UTC) From: Vivien Kraus Date: Wed, 28 Dec 2022 03:20:54 +0100 Subject: [PATCH v9 4/4] gnu: guile-gnutls: Update to 3.7.11. To: 60358@debbugs.gnu.org Message-ID: <60cfcae3fa9ffe400224566a8a284bb00bbf572f.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 42 +++++ [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 42 +++++ [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..2c7e36a6c5 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,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 +424,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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 10:15:57 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 15:15:57 +0000 Received: from localhost ([127.0.0.1]:40749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC045-0008JK-7J for submit@debbugs.gnu.org; Sun, 01 Jan 2023 10:15:57 -0500 Received: from planete-kraus.eu ([89.234.140.182]:33652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC040-0008Hm-2l for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 10:15:52 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 64cfebc5; Sun, 1 Jan 2023 15:15:50 +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=oXnp32GE tCM4VhxTufFsNx4/gTo=; b=Q39JFXr5NLyHehNVCpiOvbWB9+HgiVCx8/cBJ1QO UbU3evGmOrOV7iVc4Xlx/armLFt748lksVKmBA3AQa5sKpfKwnxgSA2cG1p5VZTk YOhGBKNt/pgFYavzGZI0dxLLC6BVKPZigRxDQmIH3/CM5HgVn6m9x6qykv9v0d4V AxQ= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ed09712a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 15:15:48 +0000 (UTC) From: Vivien Kraus Date: Sat, 31 Dec 2022 18:33:47 +0100 Subject: [PATCH v9 1/4] gnu: libunibreak: Use ucd instead of ucd-next. To: 60358@debbugs.gnu.org Message-ID: MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * 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 base-commit: 87cc524f52b65f7f12c9b87d25b467772e357cab -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 10:16:07 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 15:16:07 +0000 Received: from localhost ([127.0.0.1]:40815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC04E-0008LS-NG for submit@debbugs.gnu.org; Sun, 01 Jan 2023 10:16:07 -0500 Received: from planete-kraus.eu ([89.234.140.182]:33652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC048-0008Hm-TD for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 10:16:01 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 46aa921b; Sun, 1 Jan 2023 15:15:59 +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=SZnmHd4m WOiBOI83iMeQazMG6C4=; b=KGRPlUPlmAzA4kg8uDydYmxki/wpBbRJPqJmOoTP 0yJ5+M64y1XoCCLPnWJad8HrmY1tSON6Ri2fxBI4ouLC9NwGJEsD8iE7Fr3VjLFi OrSnSCBlRfbsq2B/zeJ2O5mPA7fK+GdhcRDfHzhJ0sRB3Fg8xajHNoMJsgdVzCF8 zqY= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 983bb421 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 15:15:58 +0000 (UTC) From: Vivien Kraus Date: Sat, 31 Dec 2022 18:34:35 +0100 Subject: [PATCH v9 2/4] gnu: ucd-next: Update to 15.0.0. To: 60358@debbugs.gnu.org Message-ID: <100fe3b18156d0e02a24a933edfcf5ea09e1b862.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 11:25:33 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 16:25:33 +0000 Received: from localhost ([127.0.0.1]:41548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC19Q-0002IJ-8n for submit@debbugs.gnu.org; Sun, 01 Jan 2023 11:25:33 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:33369) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC19N-0002I5-55 for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 11:25:30 -0500 Received: by mail-ej1-f67.google.com with SMTP id u9so62080786ejo.0 for <60358@debbugs.gnu.org>; Sun, 01 Jan 2023 08:25:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=2UL8hlYD7u0I7Hf03J+yjqNVslLNAB7tzCOawi64a3I=; b=QRs3EE1YtsF88qiLq+RIzVRhnnL8EOK+kuQIg/r5Dvz1MAwS5IPwuGtnHpfWO4TYv+ 1Lw2T+ZkEs2nGeZ0YtbPH1Zt6kMU4X6KzmXC6P/VVnmiqypNr/OljZK/vm1ZqZqvcIS4 bIyGpjumfccERT/r1YAwKGJ2KernfKfRnTkYDVNlS5SPUYBEAJADU9453AmKxWM2kJo9 KAVtP01VjwBFle83fWtIjaoBUAi++yQwiFWs7qvJFtlsQ+COiIe40mqGFiwLERy23rcH xg3jOgWoMXiFWLVL1ohsODL59IPk0NAi4krRGHUA2kHGFzYHE+jrwdZB9k7jBX945R/W 6w6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2UL8hlYD7u0I7Hf03J+yjqNVslLNAB7tzCOawi64a3I=; b=YKhnR8cQTGHUWB8D4NDlsqK0qo7wXzpgzsx1y7wxBmamEsjipWWuy49gFyIcPYu94m jG8JQ1/NDN4W/K0KuDmG53CK0UW7uO4LKYuEJ61/NXNjfVM6nZOBYdbxds72HKWi8xdO MYDfcL6cpYPy0u4XCBEIAjMVH18ajf0lc1JRPVAft4XB2fWzr4PPSirLQFdDI3mgqUrB dpH30FuH9FHiEe/+Oe0WMoQHcQNqfNPxkD499MefYrmDDhGMJo6FvE8RaKnKwTCJGCla RIR8nrfskVSHrHeCb/9zM+qF9gTZq6Jk0zoPOxlaY8ABEhht+vjhr1mszj/s//zmXPGt 0KAg== X-Gm-Message-State: AFqh2kp5NOPjRWjkJaNN/zwoGXxqEVMoLX6/tGD6V9a7vwQQxQM5YASN txF/KK+Ge/SaG4qSBucDLIw= X-Google-Smtp-Source: AMrXdXvsMFtdou50z6eo/vuu0cctfLi/F5yfxfao3Qe/y+58N/jVnXNM9FA//Zs7pWd8l3Ia0XwLSQ== X-Received: by 2002:a17:907:8c8e:b0:7c0:e0d9:c1df with SMTP id td14-20020a1709078c8e00b007c0e0d9c1dfmr31129006ejc.10.1672590323057; Sun, 01 Jan 2023 08:25:23 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id kv3-20020a17090778c300b007c00323cc23sm12014448ejc.27.2023.01.01.08.25.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 08:25:22 -0800 (PST) Message-ID: <84209b920016bb7c7fb5b95da42c1ed81f045a69.camel@gmail.com> Subject: Re: [PATCH v9 3/4] gnu: Add gnulib. From: Liliana Marie Prikler To: Vivien Kraus , 60358@debbugs.gnu.org Date: Sun, 01 Jan 2023 17:25:19 +0100 In-Reply-To: <18b9463408e0f046dec50c933e3f02fb2783467d.camel@planete-kraus.eu> References: <18b9463408e0f046dec50c933e3f02fb2783467d.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gRGllbnN0YWcsIGRlbSAyNy4xMi4yMDIyIHVtIDE3OjIzICswMTAwIHNjaHJpZWIgVml2aWVu IEtyYXVzOgo+ICogZ251L3BhY2thZ2VzL2J1aWxkLXRvb2xzLnNjbSAoZ251bGliLWNoZWNrb3V0 LCBnbnVsaWIpOiBOZXcKPiB2YXJpYWJsZXMKTWlzc2luZyB0aGUgZG90IDopCj4gLS0tCj4gwqBn bnUvcGFja2FnZXMvYnVpbGQtdG9vbHMuc2NtIHwgMjAxCj4gKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKPiDCoDEgZmlsZSBjaGFuZ2VkLCAyMDEgaW5zZXJ0aW9ucygrKQo+IAo+ IGRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvYnVpbGQtdG9vbHMuc2NtIGIvZ251L3BhY2thZ2Vz L2J1aWxkLQo+IHRvb2xzLnNjbQo+IGluZGV4IDZjMTM1MGM0NGYuLjNlNmExNmYzZjUgMTAwNjQ0 Cj4gLS0tIGEvZ251L3BhY2thZ2VzL2J1aWxkLXRvb2xzLnNjbQo+ICsrKyBiL2dudS9wYWNrYWdl cy9idWlsZC10b29scy5zY20KPiBAQCAtMzIsMjcgKzMyLDM3IEBACj4gwqA7OzsgYWxvbmcgd2l0 aCBHTlUgR3VpeC7CoCBJZiBub3QsIHNlZQo+IDxodHRwOi8vd3d3LmdudS5vcmcvbGljZW5zZXMv Pi4KPiDCoAo+IMKgKGRlZmluZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBidWlsZC10b29scykKPiAr wqAgIzp1c2UtbW9kdWxlIChpY2UtOSBvcHRhcmdzKQo+IMKgwqAgIzp1c2UtbW9kdWxlICgoZ3Vp eCBsaWNlbnNlcykgIzpwcmVmaXggbGljZW5zZTopCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGd1aXgg dXRpbHMpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGd1aXggcGFja2FnZXMpCj4gwqDCoCAjOnVzZS1t b2R1bGUgKGd1aXggZ2V4cCkKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ3VpeCBkb3dubG9hZCkKPiDC oMKgICM6dXNlLW1vZHVsZSAoZ3VpeCBnaXQtZG93bmxvYWQpCj4gK8KgICM6dXNlLW1vZHVsZSAo Z3VpeCBnaXQpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGd1aXggYnVpbGQtc3lzdGVtIGNtYWtlKQo+ ICvCoCAjOnVzZS1tb2R1bGUgKGd1aXggYnVpbGQtc3lzdGVtIGNvcHkpCj4gK8KgICM6dXNlLW1v ZHVsZSAoZ3VpeCBtb2R1bGVzKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMpCj4g wqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBhZG5zKQo+ICvCoCAjOnVzZS1tb2R1bGUg KGdudSBwYWNrYWdlcyBhdXRvdG9vbHMpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdl cyBiYXNlKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgYmFzaCkKPiDCoMKgICM6 dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGNoZWNrKQo+ICvCoCAjOnVzZS1tb2R1bGUgKGdudSBw YWNrYWdlcyBjb2RlKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgY29tcHJlc3Np b24pCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBjcHApCj4gK8KgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIGNwcGkpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdl cyBlbGYpCj4gK8KgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdjYykKPiDCoMKgICM6dXNl LW1vZHVsZSAoZ251IHBhY2thZ2VzIGxpbnV4KQo+ICvCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBsaXNwKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgbG9nZ2luZykKPiDC oMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGx1YSkKPiDCoMKgICM6dXNlLW1vZHVsZSAo Z251IHBhY2thZ2VzIG5pbmphKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcGFj a2FnZS1tYW5hZ2VtZW50KQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcGNyZSkK PiArwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcGVybCkKPiDCoMKgICM6dXNlLW1vZHVs ZSAoZ251IHBhY2thZ2VzIHBrZy1jb25maWcpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBwcmV0dHktcHJpbnQpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwcm90 b2J1ZikKPiBAQCAtNjUsNiArNzUsNyBAQCAoZGVmaW5lLW1vZHVsZSAoZ251IHBhY2thZ2VzIGJ1 aWxkLXRvb2xzKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcnBjKQo+IMKgwqAg Izp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgc3FsaXRlKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChn bnUgcGFja2FnZXMgdGxzKQo+ICvCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB1bmljb2Rl KQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgdmVyc2lvbi1jb250cm9sKQo+IMKg wqAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSBnbnUpCj4gwqDCoCAjOnVzZS1tb2R1 bGUgKGd1aXggYnVpbGQtc3lzdGVtIHB5dGhvbikpCj4gQEAgLTgwMywzICs4MTQsMTkzIEBAIChk ZWZpbmUtcHVibGljIGdlbmllCj4gwqBzYW1lIHNldHRpbmdzIHRvIG11bHRpcGxlIHByb2plY3Rz LsKgIEl0IHN1cHBvcnRzIGdlbmVyYXRpbmcgcHJvamVjdHMKPiB1c2luZyBHTlUKPiDCoE1ha2Vm aWxlcywgSlNPTiBDb21waWxhdGlvbiBEYXRhYmFzZSwgYW5kIGV4cGVyaW1lbnRhbGx5IE5pbmph LiIpCj4gwqDCoMKgwqDCoMKgIChsaWNlbnNlIGxpY2Vuc2U6YnNkLTMpKSkpCj4gKwo+ICsoZGVm aW5lKi1wdWJsaWMgKGdudWxpYi1jaGVja291dCAjOmtleQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIHZlcnNpb24KPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAocmV2aXNpb24gIjEiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGNvbW1pdAo+ICvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGhhc2gp Cj4gK8KgICJSZXR1cm4gYXMgYSBwYWNrYWdlIHRoZSBleGFjdCBnbnVsaWIgY2hlY2tvdXQuIgo+ ICvCoCAocGFja2FnZQo+ICvCoMKgwqAgKG5hbWUgImdudWxpYiIpCj4gK8KgwqDCoCAodmVyc2lv biAoZ2l0LXZlcnNpb24gdmVyc2lvbiByZXZpc2lvbiBjb21taXQpKQo+ICvCoMKgwqAgKHNvdXJj ZQo+ICvCoMKgwqDCoCAob3JpZ2luCj4gK8KgwqDCoMKgwqDCoCAobWV0aG9kIGdpdC1mZXRjaCkK PiArwqDCoMKgwqDCoMKgICh1cmkgKGdpdC1yZWZlcmVuY2UKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgICh1cmwgImh0dHBzOi8vZ2l0LnNhdmFubmFoLmdudS5vcmcvZ2l0L2dudWxpYi5naXQv IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjb21taXQgY29tbWl0KSkpCj4gK8KgwqDC oMKgwqDCoCAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCj4gK8KgwqDC oMKgwqDCoCAoc2hhMjU2IGhhc2gpCj4gK8KgwqDCoMKgwqDCoCAoc25pcHBldAo+ICvCoMKgwqDC oMKgwqDCoCAod2l0aC1pbXBvcnRlZC1tb2R1bGVzIChzb3VyY2UtbW9kdWxlLWNsb3N1cmUgJygo Z3VpeCBidWlsZAo+IHV0aWxzKSkpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoCAjfihiZWdpbgo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAodXNlLW1vZHVsZXMgKGd1aXggYnVpbGQgdXRpbHMp Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KGljZS05IGZ0dykKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAoaWNlLTkgcmRlbGltKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg OzsgLmMsIC5oIGFuZCAuZ3BlcmYgZmlsZXMgd2hvc2UgZmlyc3QgbGluZSBpcyAvKiBETwo+IE5P VCBFRElUIQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBHRU5FUkFURUQgQVVUT01B VElDQUxMWSEgKi8gYXJlIGdlbmVyYXRlZAo+IGF1dG9tYXRpY2FsbHkgYmFzZWQKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgb24gdGhlIHVuaWNvZGUgZGF0YWJhc2UuIFNpbmNlIHdl IHJlcGxhY2UgdGhlCj4gdW5pY29kZQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBk YXRhYmFzZSB3aXRoIG91ciBvd24sIHdlIG5lZWQgdG8gcmVnZW5lcmF0ZSB0aGVtLgo+IFNvLCB0 aGV5Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IGFyZSByZW1vdmVkIGZyb20gdGhl IHNvdXJjZS4gVGhleSBhcmUgc3ByaW5rbGVkIGFsbAo+IG92ZXIgdGhlCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIDs7IHBsYWNlIHVuZm9ydHVuYXRlbHksIHNvIHdlIGNhbuKAmXQgZXhj bHVkZSB3aG9sZQo+IGRpcmVjdG9yaWVzLgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo bGV0ICgoZ2VuZXJhdGVkLWF1dG9tYXRpY2FsbHk/Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSAoZmlsZW5hbWUgLiB1bnVzZWQpCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChhbmQgKG9yIChzdHJpbmctc3Vm Zml4PyAiLmMiIGZpbGVuYW1lKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3RyaW5nLXN1ZmZpeD8gIi5oIiBmaWxlbmFt ZSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgKHN0cmluZy1zdWZmaXg/ICIuZ3BlcmYiIGZpbGVuYW1lKSkKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjYWxsLXdp dGgtaW5wdXQtZmlsZSBmaWxlbmFtZQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEgKHBvcnQpCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsZXQg KChmaXJzdC1saW5lIChyZWFkLWxpbmUgcG9ydCkpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGVxdWFsPwo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCBmaXJzdC1saW5lCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICIvKiBETyBOT1QgRURJVCEgR0VO RVJBVEVECj4gQVVUT01BVElDQUxMWSEgKi8iKSkpKSkpKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChmb3ItZWFjaCBkZWxldGUtZmlsZSAoZmluZC1maWxlcyAoZ2V0Y3dkKQo+ IGdlbmVyYXRlZC1hdXRvbWF0aWNhbGx5PykpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCA7OyBPdGhlciBmaWxlcyBhcmUgY29waWVkIGZyb20gVUNELgo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAoZm9yLWVhY2ggZGVsZXRlLWZpbGUKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAnKCJ0ZXN0cy91bmlnYnJrL0dyYXBoZW1lQnJlYWtU ZXN0LnR4dCIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgInRlc3RzL3VuaW5vcm0vTm9ybWFsaXphdGlvblRlc3QudHh0Igo+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAidGVzdHMvdW5pbmFtZS9V bmljb2RlRGF0YS50eHQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgICJ0ZXN0cy91bmluYW1lL05hbWVBbGlhc2VzLnR4dCIKPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgRklYTUU6Cj4gdGVz dHMvdW5pbmFtZS9IYW5ndWxTeWxsYWJsZU5hbWVzLnR4dAo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBzZWVtcyBsaWtlIGEgVUNEIGZpbGUg YnV0IGl0IGlzIG5vdAo+IGRpc3RyaWJ1dGVkCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IHdpdGggVUNELgo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAidGVzdHMvdW5pd2Jyay9Xb3JkQnJl YWtUZXN0LnR4dCIpKSkpKSkpCj4gK8KgwqDCoCAoYnVpbGQtc3lzdGVtIGNvcHktYnVpbGQtc3lz dGVtKQo+ICvCoMKgwqAgKGFyZ3VtZW50cwo+ICvCoMKgwqDCoCAobGlzdAo+ICvCoMKgwqDCoMKg ICM6aW5zdGFsbC1wbGFuCj4gK8KgwqDCoMKgwqAgI34nKCgiLi9nbnVsaWItdG9vbCIgImJpbi8i KQo+ICvCoMKgwqDCoMKgwqDCoMKgwqAgKCIuIiAic3JjL2dudWxpYiIgIzpleGNsdWRlLXJlZ2V4 cCAoIlxcLmdpdC4qIikpKQo+ICvCoMKgwqDCoMKgICM6bW9kdWxlcyAnKChpY2UtOSBtYXRjaCkK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZ3VpeCBidWlsZCB1dGlscykK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZ3VpeCBidWlsZCBjb3B5LWJ1 aWxkLXN5c3RlbSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKGd1aXgg YnVpbGQgZ251LWJ1aWxkLXN5c3RlbSkgIzpwcmVmaXggZ251OikpCj4gK8KgwqDCoMKgwqAgIzpw aGFzZXMKPiArwqDCoMKgwqDCoCAjfihtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKPiAr wqDCoMKgwqDCoMKgwqDCoMKgIChhZGQtYmVmb3JlICdpbnN0YWxsICdnbnU6Y2hlY2sKPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoYXNzb2MtcmVmIGdudTolc3RhbmRhcmQtcGhhc2VzICdjaGVj aykKPiApClVzZSBqdXN0ICJjaGVjayIgZm9yIHRoZSBwaGFzZSBuYW1lLgo+ICvCoMKgwqDCoMKg wqDCoMKgwqAgKGFkZC1iZWZvcmUgJ2dudTpjaGVjayAnZml4LXRlc3RzCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqAgKGxhbWJkYSBfCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdWJz dGl0dXRlKiAiTWFrZWZpbGUiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCIt ZiBtYWludC5tayBzeW50YXgtY2hlY2siKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAiX2dsLU1ha2VmaWxlPXllcyAtZiBtYWludC5tayBzeW50YXgtY2hlY2siKSkKPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGludm9rZSAiZ2l0IiAiaW5pdCIpCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIChpbnZva2UgImdpdCIgImNvbmZpZyIgInVzZXIubmFtZSIgIkd1 aXgiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoaW52b2tlICJnaXQiICJjb25maWci ICJ1c2VyLmVtYWlsIiAiZ3VpeEBsb2NhbGhvc3QiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAoaW52b2tlICJnaXQiICJhZGQiICIuIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgOzsgU3ludGF4IGNoZWNrcyBhcmUgb25seSBydW4gYWdhaW5zdCBjb21taXR0ZWQgZmlsZXMu Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChpbnZva2UgImdpdCIgImNvbW1pdCIgIi1t IiAiUHJlcGFyZSBmb3IgdGVzdHMuIikpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqAgKGFkZC1iZWZv cmUgJ2dudTpjaGVjayAnZGlzYWJsZS1mYWlsaW5nLXRlc3RzCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqAgKGxhbWJkYSBfCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdWJzdGl0dXRl KiAiY2ZnLm1rIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgibG9jYWwtY2hl Y2tzLXRvLXNraXAgPSIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IHNj X2NvcHlyaWdodF9jaGVjayBmYWlscyBiZWNhdXNlIHRoZSBmYWtlIGNvbW1pdAo+IGRhdGUgbWF5 Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IGJlIGxhdGVyIHRoYW4gdGhl IGNvcHlyaWdodCB5ZWFyLgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAibG9j YWwtY2hlY2tzLXRvLXNraXAgPSBcXAo+ICvCoCBzY19XdW5kZWZfYm9vbGVhbiBcXAo+ICvCoCBz Y19jb3B5cmlnaHRfY2hlY2sgXFwKPiArwqAgc2NfZmlsZV9zeXN0ZW0gXFwKPiArwqAgc2NfaW5k ZW50IFxcCj4gK8KgIHNjX2tlZXBfZ251bGliX3RleGlfZmlsZXNfbW9zdGx5X2FzY2lpIFxcCj4g K8KgIHNjX3Byb2hpYml0X2Fzc2VydF93aXRob3V0X3VzZSBcXAo+ICvCoCBzY19wcm9oaWJpdF9j bG9zZV9zdHJlYW1fd2l0aG91dF91c2UgXFwKPiArwqAgc2NfcHJvaGliaXRfZGVmaW5lZF9oYXZl X2RlY2xfdGVzdHMgXFwKPiArwqAgc2NfcHJvaGliaXRfZG91YmxlZF93b3JkIFxcCj4gK8KgIHNj X3Byb2hpYml0X2VtcHR5X2xpbmVzX2F0X0VPRiBcXAo+ICvCoCBzY19wcm9oaWJpdF9pbnRwcm9w c193aXRob3V0X3VzZSBcXAo+ICvCoCBzY19wcm9oaWJpdF9vcGVuYXRfd2l0aG91dF91c2UgXFwK PiArwqAgc2NfcHJvaGliaXRfdGVzdF9taW51c19hbyBcXAo+ICvCoCBzY191bnBvcnRhYmxlX2dy ZXBfcSIpKQpDYW4gd2UgcHJvdmlkZSB0aGVzZSB2aWEgIzptYWtlLWZsYWdzIChhc3N1bWluZyB0 aGV5IGdldCBmb3J3YXJkZWQKdGhyb3VnaCBjb3B5LWJ1aWxkLXN5c3RlbSk/Cj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIChzdWJzdGl0dXRlKiAiTWFrZWZpbGUiCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJzY18oXAo+ICtjaGVja18oc3ltX2xpc3R8Y29weXJpZ2h0 KVwKPiArfGNwcF9pbmRlbnRfY2hlY2tcCj4gK3xwcm9oaWJpdF8oQUNfTElCT0JKX2luX200fGxl YWRpbmdfVEFCcylcCj4gK3xwcmVmZXJfYWNfY2hlY2tfZnVuY3Nfb25jZSkiIHJ1bGUpCkkgZG8g dGhpbmsgc3BsaXR0aW5nIHRoaXMgaW50byA0IHNlcGFyYXRlIHJ1bGVzIGlzIGEgY29tZnkgbWlk ZGxlCmdyb3VuZCBiZXR3ZWVuIG9iaXZvdXNseSBzcGxpdHRpbmcgYSByZWdleHAgb3ZlciBtdWx0 aXBsZSBsaW5lcyBhbmQKbGlzdGluZyAxMCBydWxlcyBzZXBhcmF0ZWx5Lgo+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3RyaW5nLWFwcGVuZCAiZGlzYWJsZWRfIiBydWxlKSkp KSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgIChhZGQtYmVmb3JlICdnbnU6Y2hlY2sgJ3JlZ2VuZXJh dGUtdW5pY29kZQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEqICgjOmtleSBpbnB1 dHMgIzphbGxvdy1vdGhlci1rZXlzKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZGVm aW5lIChmaW5kLXVjZC1maWxlIG5hbWUpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAoc2VhcmNoLWlucHV0LWZpbGUgaW5wdXRzIChzdHJpbmctYXBwZW5kCj4gInNoYXJlL3VjZC8i IG5hbWUpKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGRlZmluZSAoZmluZC11Y2Qt ZmlsZXMgLiBuYW1lcykKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChtYXAgZmlu ZC11Y2QtZmlsZSBuYW1lcykpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICh3aXRoLWRp cmVjdG9yeS1leGN1cnNpb24gImxpYiIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IDs7IFNlZSB0aGUgY29tcGlsZS1jb21tYW5kIGJ1ZmZlci1sb2NhbCB2YXJpYWJsZSBpbgo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgbGliL2dlbi11bmktdGFibGVzLmMKPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChpbnZva2UgIysoZmlsZS1hcHBlbmQgZ2Nj ICIvYmluL2djYyIpICItTyIgIi1XYWxsIgo+ICJnZW4tdW5pLXRhYmxlcy5jIgo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICItSXVuaWN0eXBlIiAiLW8i ICJnZW4tdW5pLXRhYmxlcyIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoYXBw bHkgaW52b2tlCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg ICIuL2dlbi11bmktdGFibGVzIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAoYXBwZW5kCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgKGZpbmQtdWNkLWZpbGVzICJVbmljb2RlRGF0YS50eHQiCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAiUHJvcExpc3QudHh0Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIkRl cml2ZWRDb3JlUHJvcGVydGllcy50eHQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiZW1vamkv ZW1vamktZGF0YS50eHQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiQXJhYmljU2hhcGluZy50 eHQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiU2NyaXB0cy50eHQiCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAiQmxvY2tzLnR4dCIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKGxpc3QKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgICMkKG9yaWdpbgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobWV0aG9kIHVybC1mZXRjaCkKPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHVy aSAoc3RyaW5nLWFwcGVuZAo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiaHR0cHM6Ly93d3cudW5pY29kZS5vcmcv UHVibGljLyIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIjMuMC1VcGRhdGUxL1Byb3BMaXN0LQo+IDMuMC4xLnR4 dCIpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoc2hhMjU2Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKGJhc2UzMgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAKPiAiMGs2d3lpanl6ZGw1ZzNuaWJj d2ZtODk4a2Z5ZHgxcHFhejI4djdmZHZuemR2ZDVmejdsaCIpKSkpCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGZpbmQtdWNkLWZpbGVzICJFYXN0QXNp YW5XaWR0aC50eHQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiTGluZUJyZWFrLnR4dCIKPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgCj4gImF1eGlsaWFyeS9Xb3JkQnJlYWtQcm9wZXJ0eS50eHQi Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoAo+ICJhdXhpbGlhcnkvR3JhcGhlbWVCcmVha1Byb3Bl cnR5LnR4dCIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJDb21wb3NpdGlvbkV4Y2x1c2lvbnMu dHh0Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIlNwZWNpYWxDYXNpbmcudHh0Igo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgIkNhc2VGb2xkaW5nLnR4dCIpCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGlzdCAjJChwYWNrYWdlLXZlcnNpb24g KHRoaXMtcGFja2FnZS0KPiBuYXRpdmUtaW5wdXQgInVjZCIpKSkpKQo+ICvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKGludm9rZSAiY2xpc3AiICItQyIgInVuaW5hbWUvZ2VuLXVuaW5h bWVzLmxpc3AiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKHNlYXJjaC1pbnB1dC1maWxlIGlucHV0cwo+ICJzaGFyZS91Y2QvVW5pY29kZURhdGEudHh0 IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAidW5p bmFtZS91bmluYW1lcy5oIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIChzZWFyY2gtaW5wdXQtZmlsZSBpbnB1dHMKPiAic2hhcmUvdWNkL05hbWVBbGlh c2VzLnR4dCIpKQpXaHkgbm90IChmaW5kLXVjZC1maWxlICJVbmljb2RlRGF0YS50eHQiKSBhbmQg KGZpbmQtdWNkLWZpbGUKIk5hbWVBbGlhc2VzLnR4dCIpIHJlc3BlY3RpdmVseT8KPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChmb3ItZWFjaAo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAobWF0Y2gtbGFtYmRhCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKCh1Y2QtZmlsZSAuIGRpcmVjdG9yeSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChjb3B5LWZpbGUgKGZpbmQtdWNkLWZpbGUgdWNkLWZpbGUpCj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KHN0cmluZy1hcHBlbmQgIi4uL3Rlc3RzLyIgZGlyZWN0b3J5Cj4gIi8iCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKGJhc2VuYW1lIHVjZC1maWxlKSkpKSkKPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgJygoIk5hbWVBbGlhc2VzLnR4dCIgLiAidW5pbmFtZSIp Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoIlVuaWNvZGVEYXRhLnR4 dCIgLiAidW5pbmFtZSIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo Ik5vcm1hbGl6YXRpb25UZXN0LnR4dCIgLiAidW5pbm9ybSIpCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoImF1eGlsaWFyeS9HcmFwaGVtZUJyZWFrVGVzdC50eHQiIC4g InVuaWdicmsiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCJhdXhp bGlhcnkvV29yZEJyZWFrVGVzdC50eHQiIC4gInVuaXdicmsiKSkpCkxHVE0uCgpDaGVlcnMK From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 11:56:01 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 16:56:01 +0000 Received: from localhost ([127.0.0.1]:41580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC1cu-00032J-QU for submit@debbugs.gnu.org; Sun, 01 Jan 2023 11:56:01 -0500 Received: from planete-kraus.eu ([89.234.140.182]:39184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC1cs-00032A-RP for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 11:55:59 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e2210202; Sun, 1 Jan 2023 16:55:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s=dkim; bh=q9pk4QGR+ezmzfqFYArxSTTRb2Y=; b=ZqN71sLcKu7nO05xhWDmI9TndYla d3V/zzjnic+prJQosLDfrAciANuzKga5QvbsP7934jY+MEOhg1wfv9h06XfVrcep vgv2ubVozmCJ6g9zKf4mJqTWUN+pVlb+z4POEMJ34elNjl64VkEHF1aLVE/e0d5Q QNt9qDZuqYe8F+U= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id f25b7d22 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 16:55:53 +0000 (UTC) Message-ID: <6a8aefb9ff81c1d8a64e4dc4927231c438742757.camel@planete-kraus.eu> Subject: Re: [PATCH v9 3/4] gnu: Add gnulib. From: Vivien Kraus To: Liliana Marie Prikler , 60358@debbugs.gnu.org Date: Sun, 01 Jan 2023 17:55:49 +0100 In-Reply-To: <84209b920016bb7c7fb5b95da42c1ed81f045a69.camel@gmail.com> References: <18b9463408e0f046dec50c933e3f02fb2783467d.camel@planete-kraus.eu> <84209b920016bb7c7fb5b95da42c1ed81f045a69.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le dimanche 01 janvier 2023 =C3=A0 17:25 +0100, Liliana Marie Prikler a =C3=A9crit=C2=A0: > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 (substitute* "cfg.mk" > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (("local-checks-to-skip =3D") > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; sc_copyright_check fails because the fake > > commit > > date may > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; be later than the copyright year. > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 "local-checks-to-skip =3D \\ > > +=C2=A0 sc_Wundef_boolean \\ > > +=C2=A0 sc_copyright_check \\ > > +=C2=A0 sc_file_system \\ > > +=C2=A0 sc_indent \\ > > +=C2=A0 sc_keep_gnulib_texi_files_mostly_ascii \\ > > +=C2=A0 sc_prohibit_assert_without_use \\ > > +=C2=A0 sc_prohibit_close_stream_without_use \\ > > +=C2=A0 sc_prohibit_defined_have_decl_tests \\ > > +=C2=A0 sc_prohibit_doubled_word \\ > > +=C2=A0 sc_prohibit_empty_lines_at_EOF \\ > > +=C2=A0 sc_prohibit_intprops_without_use \\ > > +=C2=A0 sc_prohibit_openat_without_use \\ > > +=C2=A0 sc_prohibit_test_minus_ao \\ > > +=C2=A0 sc_unportable_grep_q")) > Can we provide these via #:make-flags (assuming they get forwarded > through copy-build-system)? The copy-build-system does not recognize #:make-flags, unfortunately. Vivien From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 11:56:07 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 16:56:07 +0000 Received: from localhost ([127.0.0.1]:41584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC1d0-000330-64 for submit@debbugs.gnu.org; Sun, 01 Jan 2023 11:56:07 -0500 Received: from planete-kraus.eu ([89.234.140.182]:39184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC1cx-00032A-B0 for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 11:56:05 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id f4cc8d94; Sun, 1 Jan 2023 16:56:01 +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=B3zegkLM Ay0b2y1YJ4Jlq8vLNOM=; b=I1hLxZ3SPLOxkILGrb/AYPlaUuH1j6/+HfEdEgJp /2jeaGqmbP58uJqVVbks1u4U+SA++bA6tVvUs0Bv4yNhAIu1nIejHzxtJM+2vJm7 NKZOrM9u7SOhdYhBsvLJV9PMs8lOvHLH7brgnKXN0gES1on2RmkQ/qIrGz6H/Brl 4v8= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 67e49176 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 16:56:01 +0000 (UTC) From: Vivien Kraus Date: Wed, 28 Dec 2022 03:20:54 +0100 Subject: [PATCH v10 4/4] gnu: guile-gnutls: Update to 3.7.11. To: 60358@debbugs.gnu.org Message-ID: <10de0b6632a0ebf6e3baa56fd56948a5b21b7d9d.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 42 +++++ [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 42 +++++ [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..2c7e36a6c5 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,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 +424,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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 11:56:12 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 16:56:12 +0000 Received: from localhost ([127.0.0.1]:41587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC1d5-00033O-PX for submit@debbugs.gnu.org; Sun, 01 Jan 2023 11:56:11 -0500 Received: from planete-kraus.eu ([89.234.140.182]:39184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC1d4-00032A-BY for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 11:56:11 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 8387d784; Sun, 1 Jan 2023 16:56:08 +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=oXnp32GE tCM4VhxTufFsNx4/gTo=; b=w6ItqbGYZ31KHaFCGW+e8rW7yXslwimjzhj0Mh3b mjOwaNPKoRodkh5xNsH7lIcPIO7OQLpilHAusEpuQcWoY8AepFEBTBsxPmARL50o G3qRMNnkUEWnbgRJjpQncRqu1rY6UZEs2TdM8ZFbv9qBhRRFGWdUE+aWJDWY3wSt Za4= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 37a50808 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 16:56:08 +0000 (UTC) From: Vivien Kraus Date: Sat, 31 Dec 2022 18:33:47 +0100 Subject: [PATCH v10 1/4] gnu: libunibreak: Use ucd instead of ucd-next. To: 60358@debbugs.gnu.org Message-ID: MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * 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 base-commit: 87cc524f52b65f7f12c9b87d25b467772e357cab -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 11:56:18 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 16:56:18 +0000 Received: from localhost ([127.0.0.1]:41590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC1dC-00033h-1L for submit@debbugs.gnu.org; Sun, 01 Jan 2023 11:56:18 -0500 Received: from planete-kraus.eu ([89.234.140.182]:39184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC1dA-00032A-K6 for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 11:56:17 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ad908445; Sun, 1 Jan 2023 16:56:13 +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=SZnmHd4m WOiBOI83iMeQazMG6C4=; b=N/Az14OKv0DlSXG2DL3lw0oCM/OsdW/92cOekxta e8pdDmQlwCRa53KGJPoX9Bnwv4cUQ7OjmhOBLcQmhtC+SRfrG7ck6AAuHcfKOOOI zdEW2WpHRZPU+Po8uXaKYGgt/3KVjEyxRe+1BJhG1LJF6F53UPrHiWN4e9UUZ9XY plE= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 6cdc5459 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 16:56:12 +0000 (UTC) From: Vivien Kraus Date: Sat, 31 Dec 2022 18:34:35 +0100 Subject: [PATCH v10 2/4] gnu: ucd-next: Update to 15.0.0. To: 60358@debbugs.gnu.org Message-ID: <657f79f8c9c527268a0708e43c71e8c8350dddda.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 11:56:25 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 16:56:25 +0000 Received: from localhost ([127.0.0.1]:41593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC1dI-00033z-C8 for submit@debbugs.gnu.org; Sun, 01 Jan 2023 11:56:25 -0500 Received: from planete-kraus.eu ([89.234.140.182]:39184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC1dF-00032A-CW for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 11:56:22 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id af960154; Sun, 1 Jan 2023 16:56:19 +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=/cprEfK1 pgl6v8Lr1jIvezX9HI0=; b=Dum9xPgF4I+C9WOjnfhEpX4VnFaRf9Bg0DFo3iWf aRvsl5fcBkrvwrBiJc13/Wiw1HmmGoTlew8DAkJ3zewcJaCJaaMklCoESl5gWiqv 9IPXt8t7edwSX3lP/fMM69IzPqa/zPl4+AjOB/VqpFjtMwnH7onpZr5jkMUq3JqK Lj4= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 49ff4b8c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 1 Jan 2023 16:56:18 +0000 (UTC) From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v10 3/4] gnu: Add gnulib. To: 60358@debbugs.gnu.org Message-ID: <50a67c3cc0f9ce511ae1aa5abb5e4fd3ee4f9ded.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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..3a3d2a22b7 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,27 +32,37 @@ ; [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't X-Debbugs-Envelope-To: 60358 Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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..3a3d2a22b7 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,27 +32,37 @@ ; [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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..3a3d2a22b7 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,27 +32,37 @@ ;;; 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) #: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 (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"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 12:31:39 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 17:31:39 +0000 Received: from localhost ([127.0.0.1]:41639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC2BO-00045C-Q6 for submit@debbugs.gnu.org; Sun, 01 Jan 2023 12:31:39 -0500 Received: from mail-ej1-f65.google.com ([209.85.218.65]:35417) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC2BN-00044x-GX for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 12:31:38 -0500 Received: by mail-ej1-f65.google.com with SMTP id vm8so55259028ejc.2 for <60358@debbugs.gnu.org>; Sun, 01 Jan 2023 09:31:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=3PXuKaZQjFZY+EPE2Wz5LulpEsFEsrbcYexFffXB/jg=; b=YpRsZYRRACPRp+YXA1kHBq1k61yrL4ds4EucpZVwF90IIqO+5uahYvSegUT0DXvlPq t9emb5rJab/rZDbqJGGP2LbVZCEDkPkz5kni/5avqAws5PcyAK8i+pzupZErwdWNMSKl azmJ5N5SR+HkoEb+G3HTX/n4e3UhEp6WWiWiH0UTR9HzQ3tVXd0yQ882knQ5ezzBuCy2 On3Pl2GP1yMNsrsQQYucHc/EKU7O0WuqHQ3aR+JmH+BgIWXx7Le8PFM3sdzllh6zWBKb p8oWNkREzm5Jjx2zG8IQUiehZ8UnHIZnOvPu1YV5/lXSPn3zvMHE/eUhiLpOM2AZqj6S 2aMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3PXuKaZQjFZY+EPE2Wz5LulpEsFEsrbcYexFffXB/jg=; b=0Ebsg7f0BMnqMslSUP0iHbPG5tf34HdhaNkbrogPhsY3XcRkaatksjypR2vAg5zq/Q 7B4Cp2KOteEIbuIlhvsvOYtBq3Erp4Ys70f1HxvjU8/WPVvNJCuDeUTCUajR1o13c6Tt pPrYnWbSSeArbZkWDvzR/XTXhLpC/HQH4cktjOFpZ4fJSbErJLzICL66Yc+aoMJgS8Kc GivQDjCCCHs+ASXQIuGClCP+EalHaeaKrxIOxfcU2Jt3idv5TfvG8Km4Ea+yBwbHWMwi NUmTtio/pDhNU4tg10zhfFHlHXO1nkPav1pOg1JCrjhmIBuYH51td/jZGW2V6Zg2Zfga 2Gjg== X-Gm-Message-State: AFqh2koaVaFqGqoGjhjj2gAPIDHH+ddyoh6ffirZlLRM4r5OmT+N5VaH Vv8SD0ycGEHcG7B2uz/x610= X-Google-Smtp-Source: AMrXdXtDcFCqtLb5yFGbMSnZxA0A5RS5rLY2tng0RTvJTvIBvAj4Hqo1ZRV3Xtt1oac5O1AzAB04RQ== X-Received: by 2002:a17:907:d50e:b0:81f:fc05:2ba0 with SMTP id wb14-20020a170907d50e00b0081ffc052ba0mr34164688ejc.2.1672594291606; Sun, 01 Jan 2023 09:31:31 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id 19-20020a170906329300b007bc8ef7416asm12007063ejw.25.2023.01.01.09.31.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 09:31:31 -0800 (PST) Message-ID: Subject: Re: [PATCH v9 3/4] gnu: Add gnulib. From: Liliana Marie Prikler To: Vivien Kraus , 60358@debbugs.gnu.org Date: Sun, 01 Jan 2023 18:31:29 +0100 In-Reply-To: <6a8aefb9ff81c1d8a64e4dc4927231c438742757.camel@planete-kraus.eu> References: <18b9463408e0f046dec50c933e3f02fb2783467d.camel@planete-kraus.eu> <84209b920016bb7c7fb5b95da42c1ed81f045a69.camel@gmail.com> <6a8aefb9ff81c1d8a64e4dc4927231c438742757.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Am Sonntag, dem 01.01.2023 um 17:55 +0100 schrieb Vivien Kraus: > Le dimanche 01 janvier 2023 à 17:25 +0100, Liliana Marie Prikler a > écrit : > > > +              (substitute* "cfg.mk [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.218.65 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.65 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Am Sonntag, dem 01.01.2023 um 17:55 +0100 schrieb Vivien Kraus: > Le dimanche 01 janvier 2023 =C3=A0 17:25 +0100, Liliana Marie Prikler a > =C3=A9crit=C2=A0: > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 (substitute* "cfg.mk" > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 (("local-checks-to-skip =3D") > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; sc_copyright_check fails because the fake > > > commit > > > date may > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; be later than the copyright year. > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "local-checks-to-skip =3D \\ > > > +=C2=A0 sc_Wundef_boolean \\ > > > +=C2=A0 sc_copyright_check \\ > > > +=C2=A0 sc_file_system \\ > > > +=C2=A0 sc_indent \\ > > > +=C2=A0 sc_keep_gnulib_texi_files_mostly_ascii \\ > > > +=C2=A0 sc_prohibit_assert_without_use \\ > > > +=C2=A0 sc_prohibit_close_stream_without_use \\ > > > +=C2=A0 sc_prohibit_defined_have_decl_tests \\ > > > +=C2=A0 sc_prohibit_doubled_word \\ > > > +=C2=A0 sc_prohibit_empty_lines_at_EOF \\ > > > +=C2=A0 sc_prohibit_intprops_without_use \\ > > > +=C2=A0 sc_prohibit_openat_without_use \\ > > > +=C2=A0 sc_prohibit_test_minus_ao \\ > > > +=C2=A0 sc_unportable_grep_q")) > > Can we provide these via #:make-flags (assuming they get forwarded > > through copy-build-system)? >=20 > The copy-build-system does not recognize #:make-flags, unfortunately. Okay. I've now built this series locally and queued it for upstreaming on the 15th. Might do it earlier if QA lights green. Cheers=20 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 15:48:03 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 20:48:03 +0000 Received: from localhost ([127.0.0.1]:41881 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC5FS-00012z-52 for submit@debbugs.gnu.org; Sun, 01 Jan 2023 15:48:03 -0500 Received: from planete-kraus.eu ([89.234.140.182]:40142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC5FO-000124-MX for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 15:48:00 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 144abfb2 for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 20:47:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:to:message-id:mime-version; s=dkim; bh=B3zegkLMAy0 b2y1YJ4Jlq8vLNOM=; b=j7SrvHAFNLuUyp5wXV3ykbPU84RYGO8/7uIKAginh+O m0+T2SYSOZas5fH1JINRtAgDygp1cVzxp35MHJJJXZzuL+HKmqz6STad/cTkTWsg VrD08F7KePAK4YAmv18jU1vZEnfQbxl2HA2DNfp4HoGbIdCRD099CySY+UjygZC8 = Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id a5532f6b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 20:47:54 +0000 (UTC) From: Vivien Kraus Date: Wed, 28 Dec 2022 03:20:54 +0100 Subject: [PATCH v11 4/4] gnu: guile-gnutls: Update to 3.7.11. To: 60358@debbugs.gnu.org Message-ID: <82bf98d5239e2da28bfac80ca9ef536b27201ef0.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 42 +++++ [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 42 +++++ [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..2c7e36a6c5 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,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 +424,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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 15:48:09 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 20:48:09 +0000 Received: from localhost ([127.0.0.1]:41886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC5FY-000143-LC for submit@debbugs.gnu.org; Sun, 01 Jan 2023 15:48:09 -0500 Received: from planete-kraus.eu ([89.234.140.182]:40142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC5FR-000124-Fv for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 15:48:03 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 289a6c10 for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 20:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:to:message-id:mime-version; s=dkim; bh=Wm1XgUIhpOs R9Ts4LvO1lgxgdZU=; b=qh5hFqXhwEaFcVptSNDkvvNxfiEqdxo6dCcLtugMhIt pDvhyhT8Z8MTE5ztb600Uz1LsmMkwso0PpOlvbsUiHtabwtCVX/uiZJNG9RkRE83 gn2SNFg3KfSLZRY0Yu5GBd2hBir2UMCyExhTW/OhRAsmtjW7ICX34FgFyfhPrO5k = Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id b863397c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 20:47:57 +0000 (UTC) From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v11 3/4] gnu: Add gnulib. To: 60358@debbugs.gnu.org Message-ID: <8f3409e46325bae45614dd0661b32f6af4f2dc4e.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables. --- gnu/packages/build-tools.scm | 202 +++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..5f6d0c6b4e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,6 +32,7 @@ ;;; [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables. --- gnu/packages/build-tools.scm | 202 +++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..5f6d0c6b4e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,6 +32,7 @@ ;;; [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables. --- gnu/packages/build-tools.scm | 202 +++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..5f6d0c6b4e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,6 +32,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 +40,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 +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)) @@ -803,3 +813,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"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 15:48:09 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 20:48:09 +0000 Received: from localhost ([127.0.0.1]:41888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC5FZ-000148-ED for submit@debbugs.gnu.org; Sun, 01 Jan 2023 15:48:09 -0500 Received: from planete-kraus.eu ([89.234.140.182]:40142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC5FU-000124-2r for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 15:48:04 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 1e63ebbd for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 20:48:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:to:message-id:mime-version; s=dkim; bh=SZnmHd4mWOi BOI83iMeQazMG6C4=; b=H/ODyFw5QxDFx2eRxC7Tqu/pb8adwl0jPGxR8oKYu1u PCmARAx4YHTea0SFqLNVqMW6e5CFP1QRakPzndYeRhvJJoaMeRPBcaCPIRC1x6+T fkrc+PMVYs2UX37xGZfM126ZlaO1jSBAiSKXHXzFyZziusID9EL4JVbCwMWW9baE = Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 6331b4e6 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 20:48:01 +0000 (UTC) From: Vivien Kraus Date: Sat, 31 Dec 2022 18:34:35 +0100 Subject: [PATCH v11 2/4] gnu: ucd-next: Update to 15.0.0. To: 60358@debbugs.gnu.org Message-ID: MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 15:48:10 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 20:48:10 +0000 Received: from localhost ([127.0.0.1]:41890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC5FZ-00014H-Qq for submit@debbugs.gnu.org; Sun, 01 Jan 2023 15:48:10 -0500 Received: from planete-kraus.eu ([89.234.140.182]:40142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC5FX-000124-07 for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 15:48:07 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 15154e01 for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 20:48:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:to:message-id:mime-version; s=dkim; bh=D8MN7ZlC1m+ yQNQGmAQpM4O97Ko=; b=b7Ze7tHMvsbJQ23BFPNXUKOVkA8nS3V+infKmnpV2Kq BtWDEF4gKQyJXym8ZBiCGT+eWYskCIVJmXTyietWI9X6KMkSdtq5yRsNTm9jk3v6 FRlpJ2OCgMb5Mw9RUf5WxAPUWWwCkm9SsxxtgFB/SuW3pAwwmda+7puYpmJRZqFM = Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 4eb867fc (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 20:48:04 +0000 (UTC) From: Vivien Kraus Date: Sat, 31 Dec 2022 18:33:47 +0100 Subject: [PATCH v11 1/4] gnu: libunibreak: Use ucd instead of ucd-next. To: 60358@debbugs.gnu.org Message-ID: <387eed38e84cfe3ff7f8d3f5855338cdb42a6e38.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * 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 base-commit: 6d4c53893308d7db340a2978307a214103660341 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 15:48:51 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 20:48:51 +0000 Received: from localhost ([127.0.0.1]:41893 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC5GF-000169-AJ for submit@debbugs.gnu.org; Sun, 01 Jan 2023 15:48:51 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC5GD-000160-Eh for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 15:48:49 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ff3db505 for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 20:48:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s=dkim; bh=b1mYZGtsNRxLJoi2xtwI7G8uK94=; b=wXhfAVFS5yfFWT4v+OqTbWMQHuo6 v3L4xyMZ/ygkfwEooai2q5wmpz5CTM7UVbvhcQAHBqyo7dqazoty93CPhyIeJvd5 nGAVyGM96fwpEv80tKrP2Xs1qj9r7nnCmNsBvhc9awk4lWxWSNeke48TqPBcfACP xUKFcxlU+SIbgYk= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 6ecaa93a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 20:48:46 +0000 (UTC) Message-ID: <0c9d0eb4ddcfcebe6a636b5376a1aa21f23314ff.camel@planete-kraus.eu> Subject: Re: [PATCH v11 3/4] gnu: Add gnulib. From: Vivien Kraus To: 60358@debbugs.gnu.org Date: Sun, 01 Jan 2023 21:48:44 +0100 In-Reply-To: <8f3409e46325bae45614dd0661b32f6af4f2dc4e.camel@planete-kraus.eu> References: <8f3409e46325bae45614dd0661b32f6af4f2dc4e.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le mardi 27 d=C3=A9cembre 2022 =C3=A0 17:23 +0100, Vivien Kraus a =C3=A9cri= t=C2=A0: > * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New > variables. > --- > =C2=A0gnu/packages/build-tools.scm | 202 > +++++++++++++++++++++++++++++++++++ > =C2=A01 file changed, 202 insertions(+) I removed the (guix git) import that I introduced earlier in the series and forgot to remove. It caused the Guix QA to fail. From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 16:52:49 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 21:52:49 +0000 Received: from localhost ([127.0.0.1]:41916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6G9-0002o2-L3 for submit@debbugs.gnu.org; Sun, 01 Jan 2023 16:52:49 -0500 Received: from planete-kraus.eu ([89.234.140.182]:35908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6G6-0002nl-UR for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 16:52:48 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ee35195d for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 21:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:mime-version; s=dkim; bh=q0Pm/7S BcY7a+htrdHH5rCYWWaY=; b=ftkyJcrnIEJUn4nNStfyGubhnLyKcVFpW6cjDoT hFEc4bnsHniRpKSFJndFYdXzJ0KPauPvUIOPBzvQDGRg+W6q/WF8yASFJkUb42Mv 9ENHOHqA9Jf9LeCuKVlJE1/sbFemsE9UYj887MOiED2obT5dtvrecdoZDQPBBGFa LNUk= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id d2a197a8 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 21:52:41 +0000 (UTC) Message-Id: From: Vivien Kraus Date: Sun, 1 Jan 2023 22:45:41 +0100 Subject: [PATCH v11 0/4] Use a cover letter. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I’m trying to learn how to make QA happy. I have not changed anything from last time, but now I’m trying the "deep" thread style with a cover letter for patches on my end, so maybe it will work? Sorry for the spam. Vivien Kraus (4): gnu: libunibreak: Use ucd instead of ucd-next. gnu: ucd-next: Update to 15.0.0. gnu: Add gnulib. gnu: guile-gnutls: Update to 3.7.11. gnu/packages/build-tools.scm | 202 +++++++++++++++++++++++++++++++++++ gnu/packages/tls.scm | 42 +++++--- gnu/packages/unicode.scm | 9 +- 3 files changed, 235 insertions(+), 18 deletions(-) base-commit: 6d4c53893308d7db340a2978307a214103660341 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 16:52:51 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 21:52:51 +0000 Received: from localhost ([127.0.0.1]:41919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6GA-0002oA-TS for submit@debbugs.gnu.org; Sun, 01 Jan 2023 16:52:51 -0500 Received: from planete-kraus.eu ([89.234.140.182]:35908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6G8-0002nl-Qd for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 16:52:49 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a51eead6 for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 21:52: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=i6HRk/x3OCFiSMV8LWpPjPoLWmo=; b=RBARUp udU962WC4SYkHIwNKmMtGRSWMEsOKh3ZT3TsGCgX/ol263iqVrz8jdmdSEyvH1fF JwFEANRsE27noof4zIkqWkoHIshf089KYCmyOYKNMGJRBl8CtlA65pIiRaT1uff8 Wo+NxjsMDY5RAe96oMSz1YUShNOEltKjxNgdY= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 8a68a320 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 21:52:44 +0000 (UTC) Message-Id: <9f42688c30bcaf8aae892321d38cd645dcf17a30.1672609541.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Sat, 31 Dec 2022 18:33:47 +0100 Subject: [PATCH v11 1/4] gnu: libunibreak: Use ucd instead of ucd-next. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 16:52:56 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 21:52:56 +0000 Received: from localhost ([127.0.0.1]:41923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6GF-0002oc-6I for submit@debbugs.gnu.org; Sun, 01 Jan 2023 16:52:56 -0500 Received: from planete-kraus.eu ([89.234.140.182]:35908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6G9-0002nl-Nn for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 16:52:51 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 747f7d33 for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 21:52:47 +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=B3zegkLMAy0b2y1YJ4Jlq8vLNOM=; b=Db0eQq fArcDYPQ58B9pD+tQ+d1LkKXrAhLVpwXTTdpSWpmhKYv9ui8ABchIsYUUwmCim4c +JfT4PtAcQgXdeeU59d6ghH56yC/xzuiKtU4PuofPMIUrdJ5OAJwZg7NmdC5NFUa psDF9Zioa2A4a4VK111/7LFkVih7Bvl9YW3e0= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 062679c4 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 21:52:46 +0000 (UTC) Message-Id: <6b35ad2a2ad95ac51fa248e561d9f67b96ff1df1.1672609541.git.vivien@planete-kraus.eu> In-Reply-To: References: <9f42688c30bcaf8aae892321d38cd645dcf17a30.1672609541.git.vivien@planete-kraus.eu> <92747f38e8b329c3e5a2595758d7770992300a96.1672609541.git.vivien@planete-kraus.eu> From: Vivien Kraus Date: Wed, 28 Dec 2022 03:20:54 +0100 Subject: [PATCH v11 4/4] gnu: guile-gnutls: Update to 3.7.11. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 42 +++++ [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 42 +++++ [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..2c7e36a6c5 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,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 +424,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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 16:52:57 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 21:52:57 +0000 Received: from localhost ([127.0.0.1]:41925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6GG-0002of-PM for submit@debbugs.gnu.org; Sun, 01 Jan 2023 16:52:57 -0500 Received: from planete-kraus.eu ([89.234.140.182]:35908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6GC-0002nl-1u for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 16:52:52 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 2fa7aa95 for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 21:52:48 +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=y+Fky+ ja2vufFvEoyTcmea4eqZ/+HoD6zf/RFMHTWp/lkdqCTM1wYAXtf9+9SeKVH6ngh6 W32D0n6Wc9US3SmHmSXEECqIy43oj6i9oXmSFrPOGLFKjGtv1Ur+jYV1d5V5hKTl GcfzZVruYxUc837kjCnc971+en2iwWUZvz56A= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 30b79e6b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 21:52:48 +0000 (UTC) Message-Id: <92747f38e8b329c3e5a2595758d7770992300a96.1672609541.git.vivien@planete-kraus.eu> In-Reply-To: <9f42688c30bcaf8aae892321d38cd645dcf17a30.1672609541.git.vivien@planete-kraus.eu> References: <9f42688c30bcaf8aae892321d38cd645dcf17a30.1672609541.git.vivien@planete-kraus.eu> From: Vivien Kraus Date: Sat, 31 Dec 2022 18:34:35 +0100 Subject: [PATCH v11 2/4] gnu: ucd-next: Update to 15.0.0. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 16:52:57 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 21:52:57 +0000 Received: from localhost ([127.0.0.1]:41927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6GH-0002om-2c for submit@debbugs.gnu.org; Sun, 01 Jan 2023 16:52:57 -0500 Received: from planete-kraus.eu ([89.234.140.182]:35908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6GC-0002nl-TW for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 16:52:53 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 703f3be4 for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 21:52:51 +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=Wm1XgUIhpOsR9Ts4LvO1lgxgdZU=; b=AUBawV pj+BzmxzMUpE9dR0zvdi7VRHUSvPrJLMgyrrkpia8d2JXx6Xt234V5fOYA2bs8nI gJwJNfYuOD5KvkofVfGeIg/j6KLl4CB1fcGBruKOqbrGihst2Y9oK6Xu00+04AGB rKuZVB0zyzphIIpA3uXIX3RducT2NifyBMj1c= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 1907dad7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 21:52:50 +0000 (UTC) Message-Id: In-Reply-To: <92747f38e8b329c3e5a2595758d7770992300a96.1672609541.git.vivien@planete-kraus.eu> References: <9f42688c30bcaf8aae892321d38cd645dcf17a30.1672609541.git.vivien@planete-kraus.eu> <92747f38e8b329c3e5a2595758d7770992300a96.1672609541.git.vivien@planete-kraus.eu> From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v11 3/4] gnu: Add gnulib. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables. --- gnu/packages/build-tools.scm | 202 +++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..5f6d0c6b4e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,6 +32,7 @@ ;;; [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables. --- gnu/packages/build-tools.scm | 202 +++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..5f6d0c6b4e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,6 +32,7 @@ ;;; [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables. --- gnu/packages/build-tools.scm | 202 +++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..5f6d0c6b4e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,6 +32,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 +40,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 +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)) @@ -803,3 +813,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"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 17:09:04 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 22:09:05 +0000 Received: from localhost ([127.0.0.1]:41944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6Vs-0003GR-5u for submit@debbugs.gnu.org; Sun, 01 Jan 2023 17:09:04 -0500 Received: from planete-kraus.eu ([89.234.140.182]:44656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6Vp-0003Fr-EI for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 17:09:02 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 5988caa8 for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 22:08: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=Wm1XgUIhpOsR9Ts4LvO1lgxgdZU=; b=JyrSTj rJ/bTL69TuDLtXmGhnNuMEOXcxbxfRVAh5TY+0qt7Zn8kAHXwY3slLv8JjAdiMBs X/pQ57cz/bXVaVFCf4o2yIXaqI10aWpbbcTI0gTXLZ+qloh0E3x9EenDZm/1+vph IG1SxFvq4OFlhh+xNQZnRj6NjUcuyg0HHBzy4= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id fe07cb34 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 22:08:56 +0000 (UTC) Message-Id: In-Reply-To: References: From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v11 3/4] gnu: Add gnulib. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables. --- gnu/packages/build-tools.scm | 202 +++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..5f6d0c6b4e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,6 +32,7 @@ ;;; [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables. --- gnu/packages/build-tools.scm | 202 +++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..5f6d0c6b4e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,6 +32,7 @@ ;;; [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables. --- gnu/packages/build-tools.scm | 202 +++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..5f6d0c6b4e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,6 +32,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 +40,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 +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)) @@ -803,3 +813,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"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 17:09:10 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 22:09:10 +0000 Received: from localhost ([127.0.0.1]:41948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6Vy-0003Gl-00 for submit@debbugs.gnu.org; Sun, 01 Jan 2023 17:09:10 -0500 Received: from planete-kraus.eu ([89.234.140.182]:44656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6Vr-0003Fr-4G for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 17:09:03 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ec126b8d for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 22:09:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:mime-version; s=dkim; bh=WNOJBmk 8uC25BC4I9Egd8MIWaU8=; b=pxGMHozsGxxU4ysGodRZ2TeDqOgJ9VFNrgo/3vf UJwgAKmsB6p6r0XVhR7pQWCtX4jyWceZpZ5Z2wzez98myK+2rXg/ip2R8KcBsRXL OxewooHS6rjtX75Nx/9+OgoTgFHVnKw0woTyo7TvHYfViVM7uBexplZohlgbfG+p b6Ow= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 2cc9a67c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 22:09:01 +0000 (UTC) Message-Id: From: Vivien Kraus Date: Sun, 1 Jan 2023 22:59:29 +0100 Subject: [PATCH v11 0/4] Using a cover letter with a shallow thread style. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I tried the "deep" thread style, but unfortunately it seems that Patchwork only picked the last commit. My guess is that the email thread model that Patchwork recognizes is one cover letter, and every patch links to the cover letter. Maybe the deep thread style means that Patchwork recognizes the last commit as a new commit, looks up its parent and interprets it as the cover letter. So, maybe the penultimate patch was interpreted as the cover letter and so only the last patch made its way. I understand that you are upset because of the spam. I don’t like that either when it happens to me. I have more or less exhausted all the options that I can easily tweak in order to make the patch work with patchwork. If this doesn’t work, then I won’t try again and I will let the QA fail. That’s my last "sorry for the spam" on this issue. Sorry for the spam! Vivien Kraus (4): gnu: libunibreak: Use ucd instead of ucd-next. gnu: ucd-next: Update to 15.0.0. gnu: Add gnulib. gnu: guile-gnutls: Update to 3.7.11. gnu/packages/build-tools.scm | 202 +++++++++++++++++++++++++++++++++++ gnu/packages/tls.scm | 42 +++++--- gnu/packages/unicode.scm | 9 +- 3 files changed, 235 insertions(+), 18 deletions(-) base-commit: 6d4c53893308d7db340a2978307a214103660341 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 17:09:10 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 22:09:10 +0000 Received: from localhost ([127.0.0.1]:41950 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6Vy-0003Gn-Ak for submit@debbugs.gnu.org; Sun, 01 Jan 2023 17:09:10 -0500 Received: from planete-kraus.eu ([89.234.140.182]:44656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6Vu-0003Fr-G2 for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 17:09:07 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 626169e9 for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 22:09:05 +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=m88Wj3 HNJn70Ok2y78qxNG4IDR/x38v8R4pWRBdRacvaxGS9auKSevjVZm7QRbEG2XR+qB 9IbPiinLPjxoK2IFCZaAPl08Cpg/iMxFJjjrDaregtClPFXMBo31vnAsDsod97Pu KNZrMFkABQcbBfLPoLgM6rWJDzlCyAJP8GE6w= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 8f1ece83 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 22:09:04 +0000 (UTC) Message-Id: <9f42688c30bcaf8aae892321d38cd645dcf17a30.1672610369.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Sat, 31 Dec 2022 18:33:47 +0100 Subject: [PATCH v11 1/4] gnu: libunibreak: Use ucd instead of ucd-next. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 17:09:17 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 22:09:17 +0000 Received: from localhost ([127.0.0.1]:41953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6W3-0003HG-Mu for submit@debbugs.gnu.org; Sun, 01 Jan 2023 17:09:17 -0500 Received: from planete-kraus.eu ([89.234.140.182]:44656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6Vx-0003Fr-G7 for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 17:09:11 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 53dbd4f2 for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 22:09:08 +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=B3zegkLMAy0b2y1YJ4Jlq8vLNOM=; b=ZXiz58 JIcap3Yhn7XTfmfQloy4RWZKfaEYklsLldI7uyMw4RInP772zl2dvJ+7OxKUvgel stJye/G6wYl0iKPo4nRDYbCWAUMinaT+bDBtjPGIHJKWtICg1LU8fgvqeQGEkKJv 5ZW/1wJH+aUyxU7eWP5H3tf0DQOGdaSznWv6I= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id e13d06bf (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 22:09:07 +0000 (UTC) Message-Id: <6b35ad2a2ad95ac51fa248e561d9f67b96ff1df1.1672610369.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Wed, 28 Dec 2022 03:20:54 +0100 Subject: [PATCH v11 4/4] gnu: guile-gnutls: Update to 3.7.11. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 42 +++++ [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 42 +++++ [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..2c7e36a6c5 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,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 +424,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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 17:09:17 2023 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 22:09:17 +0000 Received: from localhost ([127.0.0.1]:41955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6W5-0003HJ-BG for submit@debbugs.gnu.org; Sun, 01 Jan 2023 17:09:17 -0500 Received: from planete-kraus.eu ([89.234.140.182]:44656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC6W1-0003Fr-G8 for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 17:09:14 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 0b3030bd for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 22:09:12 +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=ya74s0 sVd7Kb8XbqK1Mt2GuJVCAX8S6UrxgoI7LTk+S/uzRRM+Nld9tt2PBKBWPnrdyumH VH+rDRpTjXH/g4YF+IHo8tDZ5lD2zuawM9176EKfD3Gl0VOSRCm7d+WjkfgylG8G 4SmY+MU9H2wUHa98j/vF0k8j0OUY5m9gyvigk= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 59eccb9f (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 22:09:11 +0000 (UTC) Message-Id: <92747f38e8b329c3e5a2595758d7770992300a96.1672610369.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Sat, 31 Dec 2022 18:34:35 +0100 Subject: [PATCH v11 2/4] gnu: ucd-next: Update to 15.0.0. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 02 14:47:50 2023 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: From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v12 3/4] gnu: Add gnulib. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 @@ ;;; [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 @@ ;;; [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 02 14:47:57 2023 Received: (at 60358) by debbugs.gnu.org; 2 Jan 2023 19:47:58 +0000 Received: from localhost ([127.0.0.1]:44089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmr-0007OS-JU for submit@debbugs.gnu.org; Mon, 02 Jan 2023 14:47:57 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmj-0007Mu-G4 for 60358@debbugs.gnu.org; Mon, 02 Jan 2023 14:47:50 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id bd5c4222 for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:mime-version; s=dkim; bh=RVWG79/ SkJ804KfBRTpkk8NjUn8=; b=Lu5DjjPGrOzDmnLoT3IzLtXXC3kXPH35KRxh7kg Q4U8Wdl05FI3aPVuDwQ/S39w/KXfGaa5RdlPwLSYvJHg80Aj2S8lZI+nP45w44fM D/3aeQEo3M42nyA0+WwdsRJbHe1rSk/giYKYdq1ob2wnH9Ukv5JJOrOR+6zd5ehM LuLE= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 2be96323 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:46 +0000 (UTC) Message-Id: From: Vivien Kraus Date: Mon, 2 Jan 2023 20:43:10 +0100 Subject: [PATCH v12 0/4] Add my name to the copyright line. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I added my name to the copyright line of build-tools (for gnulib) and also of tls (for guile-gnutls). I used the 2022 year because the initial work was done in 2022. Vivien Kraus (4): gnu: libunibreak: Use ucd instead of ucd-next. gnu: ucd-next: Update to 15.0.0. gnu: Add gnulib. gnu: guile-gnutls: Update to 3.7.11. gnu/packages/build-tools.scm | 203 +++++++++++++++++++++++++++++++++++ gnu/packages/tls.scm | 43 +++++--- gnu/packages/unicode.scm | 9 +- 3 files changed, 237 insertions(+), 18 deletions(-) base-commit: 7efcf36e3b753a1dba6f8208f3c22d151007eaf0 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 02 14:47:58 2023 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: From: Vivien Kraus Date: Sat, 31 Dec 2022 18:33:47 +0100 Subject: [PATCH v12 1/4] gnu: libunibreak: Use ucd instead of ucd-next. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 02 14:48:05 2023 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: From: Vivien Kraus Date: Wed, 28 Dec 2022 03:20:54 +0100 Subject: [PATCH v12 4/4] gnu: guile-gnutls: Update to 3.7.11. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 +++++ [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 +++++ [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 02 14:48:06 2023 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: From: Vivien Kraus Date: Sat, 31 Dec 2022 18:34:35 +0100 Subject: [PATCH v12 2/4] gnu: ucd-next: Update to 15.0.0. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 07 05:21:14 2023 Received: (at 60358) by debbugs.gnu.org; 7 Jan 2023 10:21:14 +0000 Received: from localhost ([127.0.0.1]:56514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pE6KA-0002cl-2I for submit@debbugs.gnu.org; Sat, 07 Jan 2023 05:21:14 -0500 Received: from planete-kraus.eu ([89.234.140.182]:49022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pE6K8-0002cc-Dc for 60358@debbugs.gnu.org; Sat, 07 Jan 2023 05:21:13 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d06a70f8 for <60358@debbugs.gnu.org>; Sat, 7 Jan 2023 10:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:content-type :content-transfer-encoding:mime-version; s=dkim; bh=Ftgm+8SUKNpo eKkcTSKe+wn54/E=; b=xN+oV0aj0Vvtxu8IVeaYJnDSbdOWzZKgMbN4EelPfcd8 qZxFuiolD2IVt9VOhK2cpXF+AwkpPXd7sFR68BjdBPrVjNlUb93oCVpneQs85EXF LH8PB0qkLCTwFsILMSimEe7OwmVq/IPYSuCdMGjAUUTtQ2zBh2BkWb6sRWGOQVE= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id b0daf75b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sat, 7 Jan 2023 10:21:07 +0000 (UTC) Message-ID: <546f2bfcef0e4e8d0be31ad6e06d41f9adb3bc95.camel@planete-kraus.eu> Subject: gnulib: Should this be in its own module? From: Vivien Kraus To: 60358 <60358@debbugs.gnu.org> Date: Sat, 07 Jan 2023 11:21:04 +0100 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60358 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dear guix, gnulib is a useful tool to recreate distribution tarballs from git on many GNU projects. In the future, it may be a native input for many. Should I move it to its own module, (gnu packages gnulib) for instance? That would certainly help with forseeable mess with circular guile module dependencies. What do you think? Best regards, Vivien From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 02:07:45 2023 Received: (at 60358-done) by debbugs.gnu.org; 15 Jan 2023 07:07:45 +0000 Received: from localhost ([127.0.0.1]:56013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGx7H-00005g-Ku for submit@debbugs.gnu.org; Sun, 15 Jan 2023 02:07:45 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:42592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGx7E-00005S-Fw for 60358-done@debbugs.gnu.org; Sun, 15 Jan 2023 02:07:42 -0500 Received: by mail-ej1-f66.google.com with SMTP id bk15so3822165ejb.9 for <60358-done@debbugs.gnu.org>; Sat, 14 Jan 2023 23:07:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=0G+ZJhzaAifYbhGO4PRqQoq6DkcgEtLS0NxwkT2jwCM=; b=FmPwudkXmIMZGTlGgSyhbEpk4vRe+uwmtxemPqZwGnx3Gh45o2vMssrRLQx7+LAF5q Am+kv7aOZh44Ggn/27p2sH75p37RWkwxWN3F3FKjkBJKN7bCOVfXoqaR94GzQE7Oy3vO txFzKCn5Fp6OcOb423hwmukMdY1JHIXHYmNBy76ZOTmaI0SRohpxGsZqfYj9NJl6gy79 yTefxP6L64UscD2ykXprFoR86EGkjQ4bgbJqwBGX3rjOEx5Zddyveo7Styikr5VqvhGp zfyi5BWXAkIOO9/8WqexYEvKlzTTEdD6l/gzH2X4VTXH1TcH5YnNnrjPGwQWzo30g+PU obzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=0G+ZJhzaAifYbhGO4PRqQoq6DkcgEtLS0NxwkT2jwCM=; b=LGv2T/n2dYGZEYRSqTLLOso+8tlvXyU28/uMismjYZpFioHi/O5fYDg1AiQCwTsCZj Is0u55F1p/pF11ylp7LZGdUwcz/07WbBvWUP4VfZpbQcut8neewPQdEig6rwxwon3aaX 46GEZbsejXam6pucQBMB/OcUFnfHFZ1W/2nrS9UnswHMDIx/9U8NrWOw+YyaeqG8wQ/t MbXgpl0kiy1p79XcSkpoH/jSV64oliyiTO7oxQCW8bpIA6je5kWwmLkk0SjxsPPBLtso AW4yOOzCodxczHXPBqBPqLrqbw6+k3a3irS44hbi2LmGx7r9esDNFWiQWOywjFgZ2D8B Np5A== X-Gm-Message-State: AFqh2krWhwRzacQXH+NkjFHD/PSYGp/hGFcCPLUqnY34dRH9hJUxbBUv F8aEJdAL/eE6LFBC6ML7emk= X-Google-Smtp-Source: AMrXdXvFdlmdjTN3jltnZJ5vvjUv+NeWHp36rq2/AEEIg8TfTY5uM2/QClX7Oz0FQGDPQzysMS9RMQ== X-Received: by 2002:a17:906:33cb:b0:86d:7c0e:c816 with SMTP id w11-20020a17090633cb00b0086d7c0ec816mr3853848eja.27.1673766454551; Sat, 14 Jan 2023 23:07:34 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id k23-20020a17090632d700b00837ac146a53sm10408561ejk.23.2023.01.14.23.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Jan 2023 23:07:34 -0800 (PST) Message-ID: <86557646c6687aac336fad9be44101d1efcd344d.camel@gmail.com> Subject: Re: [PATCH v10 4/4] gnu: guile-gnutls: Update to 3.7.11. From: Liliana Marie Prikler To: Vivien Kraus , 60358-done@debbugs.gnu.org Date: Sun, 15 Jan 2023 08:07:30 +0100 In-Reply-To: <10de0b6632a0ebf6e3baa56fd56948a5b21b7d9d.camel@planete-kraus.eu> References: <10de0b6632a0ebf6e3baa56fd56948a5b21b7d9d.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Am Mittwoch, dem 28.12.2022 um 03:20 +0100 schrieb Vivien Kraus: > * gnu/packages/tls.scm (guile-gnutls) [phases]: Patch-shebang > autopull.sh and autogen.sh. > * gnu/packages/tls.scm (guile-gnutls) [ [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.218.66 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.66 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.66 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 60358-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Am Mittwoch, dem 28.12.2022 um 03:20 +0100 schrieb Vivien Kraus: > * 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. > --- Pushed now. Incidentally, git was not actually added, but I forgot to augment the ChangeLog. Sorry for that. Cheers From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 16 07:00:02 2023 Received: (at 60358) by debbugs.gnu.org; 16 Jan 2023 12:00:03 +0000 Received: from localhost ([127.0.0.1]:60643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHO9i-0005w4-3U for submit@debbugs.gnu.org; Mon, 16 Jan 2023 07:00:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHO9f-0005vT-Dt for 60358@debbugs.gnu.org; Mon, 16 Jan 2023 07:00:00 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHO9Z-0004tM-Ag; Mon, 16 Jan 2023 06:59:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=2EtjLiQB95NUse7ctX3BMXJQyZdOiTBTHcAtMj1mh1U=; b=bhhtc7LC5YVcMzhCOhW7 uHyJ8yXwQEEIv9/E7y2aJxk4VbYR9xhUzjHPkPKMEA6OxJdZDOmYootzm+43IolhEpGl5C42IGbl2 srOSSTm4NYr52TEqMRWcRct+gH7Zqm41BaLDY7f+9HmqSSevGsdYRqfTIY2Gt9mnm32keNMeiepFU JAOT3SppN9PLqIZh1guNHXxQxCEB+kJM15zx+hoFfRK7HA3d08sbU1Hr3kAovsuTNiOUtS6qrgHFb hnU4LPUg2sbaUu2zfpf3vmhk6BM3rFGtROmyxYSd/SCZXAgzNirS/4aH4S3W0lmVLRdrFnt+gUgJG CDqif4InNx1k+A==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHO9G-0002hz-I1; Mon, 16 Jan 2023 06:59:52 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Vivien Kraus Subject: Re: bug#60358: [PATCH] gnu: Add gnulib. References: Date: Mon, 16 Jan 2023 12:59:31 +0100 In-Reply-To: (Vivien Kraus's message of "Tue, 27 Dec 2022 17:23:30 +0100") Message-ID: <874jsqn10c.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 60358 Cc: 60358@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Vivien, Vivien Kraus skribis: > + (native-search-paths > + (list (search-path-specification > + (variable "GNULIB_SRCDIR") > + (files (list "src/gnulib"))))) Perhaps you need (separator #f) if it=E2=80=99s meant to contain a single directory name (as opposed to a colon-separate search path)? Thanks, Ludo=E2=80=99. From unknown Mon Jun 23 18:27:40 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 13 Feb 2023 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator