From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0snt-00072g-5d for guix-patches@gnu.org; Wed, 19 Apr 2017 12:50:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0snp-0002T1-Sf for guix-patches@gnu.org; Wed, 19 Apr 2017 12:50:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59026) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d0snp-0002Sx-PS for guix-patches@gnu.org; Wed, 19 Apr 2017 12:50:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d0snp-0005LI-Kf for guix-patches@gnu.org; Wed, 19 Apr 2017 12:50:01 -0400 Subject: bug#26238: core-updates: Fix time zone bug in `date` 8.26 Resent-Message-ID: From: Marius Bakke In-Reply-To: <87h91ls8mh.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> <87r30pv9yn.fsf@fastmail.com> <87h91ls8mh.fsf@gnu.org> Date: Wed, 19 Apr 2017 18:49:04 +0200 Message-ID: <87efwouyv3.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: > Marius Bakke skribis: > >> 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? > > Bah! The system uses =E2=80=98coreutils-final=E2=80=99 due to this stanz= a in (gnu > system): > > ;; The packages below are also in %FINAL-INPUTS, so take them from > ;; there to avoid duplication. > (map canonical-package > (list guile-2.0 bash coreutils findutils grep sed > diffutils patch gawk tar gzip bzip2 xz lzip)) > > Not sure how to handle it. We could explicitly write =E2=80=98coreutils-= 8.27=E2=80=99 > above, which would solve the problem. It would also make the graft much > less useful, except for people explicitly doing: > > guix package -i coreutils > > So we might just as well remove the graft. Okay, that makes sense. I dropped the graft in the patch below and can confirm it works on my system. Note that coreutils-8.27 is now public so that `guix package -i coreutils` will pull in 8.27 regardless. PTAL. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-workaround-for-date-regression-in-coreutils-.patch Content-Transfer-Encoding: quoted-printable From=205be25413a76ca84c18e4f4174629af5fe6e87db1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 18 Apr 2017 20:13:45 +0200 Subject: [PATCH] gnu: Add workaround for `date` regression in coreutils@8.2= 6. See and . * gnu/packages/base.scm (coreutils-8.27): New variable. * gnu/system.scm (%base-packages): Use that instead of COREUTILS. =2D-- gnu/packages/base.scm | 16 ++++++++++++++++ gnu/system.scm | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 5c36b612f..a95ca2888 100644 =2D-- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -361,6 +361,22 @@ functionality beyond that which is outlined in the POS= IX standard.") (license gpl3+) (home-page "https://www.gnu.org/software/coreutils/"))) =20 +;; We add version 8.27 here for use in (gnu system) due to a time +;; zone bug in `date' versions 8.25 - 8.26. +;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D23035 +;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26238 +(define-public 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 diff --git a/gnu/system.scm b/gnu/system.scm index 89c4150f9..f6ab7ded8 100644 =2D-- a/gnu/system.scm +++ b/gnu/system.scm @@ -385,7 +385,7 @@ explicitly appear in OS." ;; The packages below are also in %FINAL-INPUTS, so take them from ;; there to avoid duplication. (map canonical-package =2D (list guile-2.0 bash coreutils findutils grep sed + (list guile-2.0 bash coreutils-8.27 findutils grep sed diffutils patch gawk tar gzip bzip2 xz lzip)))) =20 (define %default-issue =2D-=20 2.12.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlj3lQAACgkQoqBt8qM6 VPo6bQf/SRTCnnqv42uNKi9Fsf0wEJRC8B1y5bZ3Isr01IL0aReWlxBS6WZGiarc STN3ySn1TW8WrBZjZC4usVu8Mso6V2s3xtDwwYaYbarQujK8PSdKgW6K16np7iPh fuA5JLi32mbN7tqB8/yf5Fe3NkRuMZG/qyCgzMK4FAwQ1UorfknHP9n0l6Pv66TO 3gIkMjy/bnYEZo1QLq+J435mFsdyL7Rdxb5FuYjm3eP0DpDwUamxKCJbYSNRxRwV 432UZUTs+pahkJn/ZLZLaI7y317xvJCzJRwiRJacPelZyFRsIAQDSaJZuPiGYN8c GlxrahI+1Bm5EILyd/oPVH5N7IImTQ== =3l7b -----END PGP SIGNATURE----- --==-=-=--