From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id wOVxGqNZq2OR+wAAbAwnHQ (envelope-from ) for ; Tue, 27 Dec 2022 21:46:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id GDhUGqNZq2MaNQEAauVa8A (envelope-from ) for ; Tue, 27 Dec 2022 21:46:27 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DF5082E68F for ; Tue, 27 Dec 2022 21:46:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAGpo-0001gv-2y; Tue, 27 Dec 2022 15:46:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAGpn-0001gl-0R for guix-patches@gnu.org; Tue, 27 Dec 2022 15:46:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAGpm-0005Ki-OJ for guix-patches@gnu.org; Tue, 27 Dec 2022 15:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAGpm-0006qI-4y for guix-patches@gnu.org; Tue, 27 Dec 2022 15:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH] gnu: Add gnulib. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Dec 2022 20:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vivien Kraus , 60358@debbugs.gnu.org Received: via spool by 60358-submit@debbugs.gnu.org id=B60358.167217395826288 (code B ref 60358); Tue, 27 Dec 2022 20:46:02 +0000 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> From: Liliana Marie Prikler 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672173987; a=rsa-sha256; cv=none; b=EgkDiJYb2vMXpxgKSw1W6ZCrt2Qz9fg04PpmfjgiFryZepjHViGfB4wQGEryxkbuOaCLjt TI6HK0mxI+zIBVbmhxN92uVpIMobBdtRdB+zhonfr1IkFFox8x/a+VN2pieWVPyUblCgK8 zm77xx3fRGvaLPj4QJ/klHaKHViuWrd+XAfn2YAByobiHyi8wwffSS48jW8/EGiLyYbrd1 QCBMcs2yMRTLfsET4aA97I4u7ivdgd/xkGzvMaIFVNVwfnN2RNs9ySpzf37cmUx7gtIW9m IEfdpBWEKLCJurlHjtyrK6dSnt7u3D4jIxaaKQSms87fl5Xc07Ej4ZcR8yDZ1g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=i5FblFlW; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672173987; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ddGfvbbfRJ8zCvHzZc5WDQcIC0Mh8K7iMRkT/KqjsXY=; b=GvvzQ+h4bisHrNtVN6cX9tn4yL8tb1kolWOGtylmKI37r+XCSBwlmdSp9NEmcRr5A94LnW /umhkLNTN6SnxOrU0VCY0rx5I/FSer7Lbfr2R4mH7lDjZHDGpSTUsEXxjvBijlO7oXBHbW gK6KOdPgVLyhWnXe/n45G5J4h4mxoaJ+QRz4cLAdbs/gsdGJyaPqaGXqAA8ZwrERHwmXO5 sX1L4yS7mbtIDyCJZvEVgEO9Z2j7IwyvkXqooRsZLJh1qYfqO3zkGue0sHnov/MBg8BhBl xLFFpOwFDx0si7Sm5xnnCSa59HDXNRr401tDgFe90OgERbmsfK7XKcOy1JZnZw== X-Spam-Score: -2.03 X-Migadu-Queue-Id: DF5082E68F Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=i5FblFlW; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -2.03 X-TUID: h4LIo1lgx89+ 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