diff options
author | Ludovic Courtès <ludo@gnu.org> | 2020-10-20 09:18:07 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2020-10-20 16:30:15 +0200 |
commit | 8db4ebb0cd9bfdcf1aea63eb8d20eb6af0c87c93 (patch) | |
tree | 8510a314aad6e64e3709ba231ecb13d7959549cf /config-daemon.ac | |
parent | 2bd60ca1fb1b3a830ee644369b9a7f8c8b5d0404 (diff) | |
download | guix-8db4ebb0cd9bfdcf1aea63eb8d20eb6af0c87c93.tar.gz guix-8db4ebb0cd9bfdcf1aea63eb8d20eb6af0c87c93.zip |
packages: Better preserve object identity when rewriting.
Fixes a bug whereby the presence of propagated inputs could lead to two
non-eq? but actually equal packages in a bag's inputs. The problem
would manifest itself when running, for instance:
guix build inkscape -d --with-graft=glib=glib-networking --no-grafts
The resulting derivation would differ due from that without
'--with-graft'. This was due to the fact that glib propagates libffi;
this instance of libffi was not rewritten even though other instances in
the graph were rewritten. Thus, glib would end up with two non-eq?
libffi instances, which in turn would lead to duplicate entries in its
'%build-inputs' variable.
Fixes <https://bugs.gnu.org/43890>.
* guix/packages.scm (package-mapping)[rewrite]: Remove call to 'cut?'
and call 'replace' unconditionally.
[replace]: Add 'cut?' case.
* tests/guix-build.sh: Add test combining '--no-grafts' and
'--with-graft'.
* tests/packages.scm ("package-input-rewriting/spec, identity")
("package-input-rewriting, identity"): New tests.
Diffstat (limited to 'config-daemon.ac')
0 files changed, 0 insertions, 0 deletions