From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0Y0r-0006Qb-8R for guix-patches@gnu.org; Tue, 18 Apr 2017 14:38:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0Y0o-00055r-14 for guix-patches@gnu.org; Tue, 18 Apr 2017 14:38:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:56908) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d0Y0n-00055n-U7 for guix-patches@gnu.org; Tue, 18 Apr 2017 14:38:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d0Y0n-0007hP-Im for guix-patches@gnu.org; Tue, 18 Apr 2017 14:38:01 -0400 Subject: bug#26238: core-updates: Fix time zone bug in `date` 8.26 Resent-Message-ID: From: Marius Bakke In-Reply-To: <87a87eup5p.fsf@gnu.org> References: <20170324162234.GA32596@jasmine> <87d1d4p1nr.fsf@gnu.org> <20170326200114.GA9140@jasmine> <87o9wnnmy8.fsf@gnu.org> <87vaq2oh6r.fsf@gnu.org> <87y3uyk95r.fsf@fastmail.com> <87a87eup5p.fsf@gnu.org> Date: Tue, 18 Apr 2017 20:37:04 +0200 Message-ID: <87r30pv9yn.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 26238@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Morning! > > Marius Bakke skribis: > >> Ludovic Court=C3=A8s writes: >> >>> Hi Leo! >>> >>> ludo@gnu.org (Ludovic Court=C3=A8s) skribis: >>> >>>> Leo Famulari skribis: >>>> >>>>> From 466a0ebad18ee5e38f280acf19ab19aadffa2206 Mon Sep 17 00:00:00 2001 >>>>> From: Leo Famulari >>>>> Date: Fri, 24 Mar 2017 12:18:21 -0400 >>>>> Subject: [PATCH] gnu: coreutils: Fix a time-zone bug in date 8.26. >>>>> >>>>> * gnu/packages/base.scm (coreutils)[replacement]: New field. >>>>> (coreutils/fixed): New variable. >>>>> (coreutils-minimal)[source]: Use the source of coreutils/fixed. >>>>> * gnu/packages/commencement.scm (coreutils-final)[replacement]: New f= ield. >>>>> * gnu/packages/patches/coreutils-fix-time-zone-conversion.patch: New = file. >>>>> * gnu/local.mk (dist_patch_DATA): Add it. >>>> >>>> LGTM, thanks! >>> >>> Was there anything wrong with this patch? Otherwise I still think it= =E2=80=99s >>> worth applying to =E2=80=98master=E2=80=99. >> >> It depends on this gnulib patch, which does not apply cleanly and needs >> a rather difficult backport: >> >> https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=3D4e6e16b3f43ce9= 6302b1e52e48730c1f15e18c14 > > Oh right, sorry for being sloppy. > > A while back you suggested using directly 8.27 as the replacement: > > https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26238#32 > > I think it would be a good idea. > > Thoughts? Here is a WIP patch that adds a graft for coreutils 8.27. I stole Leos code for the (gnu packages commencement) part. It builds with `./pre-inst-env guix build coreutils`, but my after reconfiguring my system on it, `date --version` still shows 8.26. Any idea what's wrong? --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-coreutils-Replace-with-8.27.patch Content-Transfer-Encoding: quoted-printable From=202636e565fa4847dc0d1c786345e98053cf783cc1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 18 Apr 2017 20:13:45 +0200 Subject: [PATCH] gnu: coreutils: Replace with 8.27. * gnu/packages/base.scm (coreutils-8.27): New variable. (coreutils)[replacement]: New field. (coreutils-minimal)[source]: Inherit from COREUTILS-8.27. [replacement]: New field. * gnu/packages/commencement.scm (coreutils-final): Set replacement #f on coreutils derivation. Co-authored-by: Leo Famulari =2D-- gnu/packages/base.scm | 15 +++++++++++++++ gnu/packages/commencement.scm | 20 ++++++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 5c36b612f..36eaabb36 100644 =2D-- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -285,6 +285,7 @@ used to apply commands with arbitrarily long arguments.= ") (package (name "coreutils") (version "8.26") + (replacement coreutils-8.27) (source (origin (method url-fetch) (uri (string-append "mirror://gnu/coreutils/coreutils-" @@ -361,11 +362,25 @@ functionality beyond that which is outlined in the PO= SIX standard.") (license gpl3+) (home-page "https://www.gnu.org/software/coreutils/"))) =20 +(define coreutils-8.27 + (package + (inherit coreutils) + (version "8.27") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/coreutils/coreutils-" + version ".tar.xz")) + (sha256 + (base32 + "0sv547572iq8ayy8klir4hnngnx92a9nsazmf1wgzfc7xr4x74c8"))))= )) + (define-public coreutils-minimal ;; Coreutils without its optional dependencies. (package (inherit coreutils) (name "coreutils-minimal") + (replacement #f) + (source (package-source coreutils-8.27)) (outputs '("out")) (inputs '()))) =20 diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 92f6e6c2e..c9d851c4d 100644 =2D-- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -868,15 +868,19 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a= /~a \"$@\"~%" ;; The final Coreutils. Treat them specially because some packages, suc= h as ;; Findutils, keep a reference to the Coreutils they were built with. (package-with-bootstrap-guile =2D (package-with-explicit-inputs coreutils =2D %boot5-inputs =2D (current-source-location) =20 =2D ;; Use the final Guile, linked against = the =2D ;; final libc with working iconv, so th= at =2D ;; 'substitute*' works well when touchi= ng =2D ;; test files in Gettext. =2D #:guile guile-final))) + + (let ((p (package-with-explicit-inputs coreutils + %boot5-inputs + (current-source-location) + + ;; Use the final Guile, linked a= gainst the + ;; final libc with working iconv= , so that + ;; 'substitute*' works well when= touching + ;; test files in Gettext. + #:guile guile-final))) + (package (inherit p) + (replacement #f))))) =20 (define grep-final ;; The final grep. Gzip holds a reference to it (via zgrep), so it must= be =2D-=20 2.12.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlj2XNEACgkQoqBt8qM6 VPp92Af/TH9oRIw8aXuvFNJE6bN/lY3Cq09Ycq+bIyvMBvcbBo2Ad6FW2kGm+tIg ezrF9STN3mh2r43QKexeucioeBS1nemHofWFi4CAVc7u44lSz7QVFfNUO+ED1lkt LFAbMEhvFRaCSbOKjZbR8DHP9HkcRYsaCNaUrpXVwe/q1jmNsxoplRcszFqb78g4 r1wY3zeaDOz9DtoCTHhKBmV8ejuAk7JN3/DpdR4Ncmnz+7HfQK4HnuaKgNfS7zw2 O+YjQ0abAvZYwCmcaiEpOaHHnWbfubci7LPRFNsQ2T9+dCasc1sH/M88GpwEHkdP hNgaicWtAAemMO+6ZMYftdR3xKfmkQ== =UEXf -----END PGP SIGNATURE----- --==-=-=--