From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: bug#39771: [core-updates] 'guix pull' and './pre-inst-env' produces different derivations Date: Mon, 02 Mar 2020 21:23:32 +0100 Message-ID: <87d09ujykb.fsf@devup.no> References: <87a7574qnf.fsf@devup.no> <87imjmk4ip.fsf@devup.no> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:37041) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8rbf-0007RB-DJ for bug-guix@gnu.org; Mon, 02 Mar 2020 15:24:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8rbe-00023L-7S for bug-guix@gnu.org; Mon, 02 Mar 2020 15:24:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60655) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8rbd-00023F-Vj for bug-guix@gnu.org; Mon, 02 Mar 2020 15:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j8rbd-0000r3-Ra for bug-guix@gnu.org; Mon, 02 Mar 2020 15:24:01 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <87imjmk4ip.fsf@devup.no> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane-mx.org@gnu.org Sender: "bug-Guix" To: 39771@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Marius Bakke writes: > Marius Bakke writes: > >> Hello, >> >> There is a strange bug on the core-updates branch: if you 'guix pull >> --branch=core-updates', everything from around 'guile-bootstrap@2.0' in >> the package graph will have different derivations from what you get in >> the git checkout: >> >> On my local fork of core-updates: >> >> ./pre-inst-env guix build -d bash >> /gnu/store/y834q3sf056hkglpli4gr3ijmpvgzb7c-bash-5.0.16.drv >> >> After 'guix pull -p /tmp/core-updates --url=/my/checkout >> --branch=core-updates', on the same commit: >> >> /tmp/core-updates/bin/guix build -d bash >> /gnu/store/m3q1w669f7br5cs4admdy5p8rijrjmvp-bash-5.0.16.drv > > I've tracked this down to 'gash-boot'. Namely the use of ,(version): it > evaluates to '2.2.6' when run with ./pre-inst-env and "3.0.0" after > 'guix pull'. > > I suspect both are wrong, and that it really intends to use the version > of gash here. Timothy, can you confirm? > > Currently trying to 'guix pull' with a hard coded "2.2.6" version to > see if other instances need changing. This patch solves the problem without triggering a full rebuild: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=diff diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index cfbb5e3bff..0d5bfa4dfa 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -151,7 +151,7 @@ pure Scheme to Tar and decompression in one easy step.") (use-modules (guix build gnu-bootstrap)) (modify-phases %standard-phases (replace 'configure - (bootstrap-configure ,(version) "gash" "scripts")) + (bootstrap-configure "2.2.6" "gash" "scripts")) (replace 'build (bootstrap-build "gash")) (replace 'install (bootstrap-install "gash" "scripts")) (add-after 'install 'install-symlinks @@ -214,7 +214,7 @@ pure Scheme to Tar and decompression in one easy step.") (delete-file "scripts/template.in") #t)) (replace 'configure - (bootstrap-configure ,(version) "gash" "scripts")) + (bootstrap-configure "2.2.6" "gash" "scripts")) (replace 'build (bootstrap-build "gash")) (replace 'install (bootstrap-install "gash" "scripts")) ;; XXX: The scripts should add Gash to their load paths and --=-=-= Content-Type: text/plain I have another full-rebuild commit in the pipeline (bzip2 currently keeps a reference to the Mes toolchain), so we might as well fix it properly. Waiting for confirmation from Timothy as to what the proper fix is, though. --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl5da0QACgkQoqBt8qM6 VPoJmggAvH2TdXhyvF5Jw6sPJIjkBmXQSzdkfdWWpK1Uz3aXRIcJIkbxOhxxguMc 7Y+o4rwJKrw6Nf/fDcxl+PPCZ2ozVpa5/jYjOFAwJ3u8TzsxMl1/Emn+/8Dr0Ndp //44GMNKQTY+TYz57vxYaBKgRu2yNhc3pmuquvfyQvnEqVbrJ8lEyB4k0c/HhA00 S3pbyaPANM6MfN6sMkHwcLt3G6aN6cplpH3kM+QwGfBFTWdtM65cChb9xrilyMsu ffNbqc6p9EqKT4hRBXLoOHTH2rUK1emfo2C6AneVpLeMTXo/+b8+DBhG5E5r9fql pwqB78K/+jRSsepSrHd+sSmvbpB6VA== =6Z3c -----END PGP SIGNATURE----- --==-=-=--