bug#23132: Grafted system retains references to original store items

[Mark H Weaver]

I should have also included the guile-builder used by the gnome-session
grafting derivation.  Here it is:

/gnu/store/60a5vinj56nhxzszfyayjjy61b303c8r-gnome-session-3.18.1.2-guile-builder

contains:

(begin (use-modules (guix build graft) (guix build utils) (ice-9 match)) 
(define %output (getenv "out")) (define %outputs (map (lambda (o) (cons o 
(getenv o))) (quote ("out")))) (define %build-inputs (quote (("x" . 
"/gnu/store/2f25m1jyy7lvkjqgilza6bafbnv3k044-gnome-session-3.18.1.2") ("x" . 
"/gnu/store/xd6qk8kad1466v9z74nmikhapz64cszp-graphite2-1.3.5") ("x" . 
"/gnu/store/b8sicbpsjabfhfszsajpfvjw8ynx97iw-perl-5.22.1") ("x" . 
"/gnu/store/dgyc74zakg110dxj67z3mj9g1vk8l4xp-openssl-1.0.2f") ("x" . 
"/gnu/store/1146ja893l132cs1dn4jkmb047pw6rsk-perl-5.22.1") ("x" . 
"/gnu/store/6zsdzk0w99d5xmpw50mgqj9nfiwazpyx-gnome-desktop-3.18.1") ("x" . 
"/gnu/store/8s3k25609kj6cqfd737vd1y9wqfr0zzl-harfbuzz-1.0.6") ("x" . 
"/gnu/store/h3vpr7k7c2h3n7ixddyvr22sbzy98vhz-gtk+-3.18.2") ("x" . 
"/gnu/store/lhhgw9psfnf7c8sjax68sin7nqm3d2k0-cups-2.1.0") ("x" . 
"/gnu/store/bk3bplyp1cr6jv2hgv9d8cxlad3griqb-cups-filters-1.4.0") ("x" . 
"/gnu/store/2symxhixbs2rrhh59il0i8mlndl3x2d8-qpdf-5.1.3") ("x" . 
"/gnu/store/sxxqvvrf3f679m939yps51ddz327q0dr-pango-1.38.1") ("x" . 
"/gnu/store/zsaklr7zimhdnvb8z5yqld8jgqf31v9r-librsvg-2.40.13") ("x" . 
"/gnu/store/45j3scjfgz9ahlvn5lfqj2s0m2gkpdrk-graphite2-1.3.5") ("x" . 
"/gnu/store/h6bzcv3a0r9zm37gsi62visvc8kwg02a-perl-5.22.1") ("x" . 
"/gnu/store/fbmkb0xiwnr1823053dxal87m45bpy60-openssl-1.0.2f") ("x" . 
"/gnu/store/iam2djqw4s2bcpff8nhbsbkg7z73f3v3-perl-5.22.1") ("x" . 
"/gnu/store/crqvab6qkkxzxs18yf87wa67zr2rbl9x-gnome-desktop-3.18.1") ("x" . 
"/gnu/store/9bhhmn1p9932scrkhjqqmmxbl9yv9sdv-harfbuzz-1.0.6") ("x" . 
"/gnu/store/kpp4ica1hivpfnbsjjbzsgkxkx8zgghi-gtk+-3.18.2") ("x" . 
"/gnu/store/ffwac7n46xyicqz2ym6ghpf79gh0m8af-cups-2.1.0") ("x" . 
"/gnu/store/si7689f9wc4ppyi20hi44ypz6xnn786a-cups-filters-1.4.0") ("x" . 
"/gnu/store/6qwvlxhb4ms02xr9g5d3qb0wbvr2iwaa-qpdf-5.1.3") ("x" . 
"/gnu/store/bhpmhiyyz9bqw4h4v3x55m4z64c01i7l-pango-1.38.1") ("x" . 
"/gnu/store/zs0x1dn010n79b49rwcf5dp9dzccxc26-librsvg-2.40.13")))) (unsetenv 
"GUILE_LOAD_COMPILED_PATH") (unsetenv "LD_LIBRARY_PATH"))(exit (begin (let* 
((old-outputs (quote (("out" . 
"/gnu/store/2f25m1jyy7lvkjqgilza6bafbnv3k044-gnome-session-3.18.1.2")))) 
(mapping (append (quote 
(("/gnu/store/xd6qk8kad1466v9z74nmikhapz64cszp-graphite2-1.3.5" . 
"/gnu/store/45j3scjfgz9ahlvn5lfqj2s0m2gkpdrk-graphite2-1.3.5") 
("/gnu/store/b8sicbpsjabfhfszsajpfvjw8ynx97iw-perl-5.22.1" . 
"/gnu/store/h6bzcv3a0r9zm37gsi62visvc8kwg02a-perl-5.22.1") 
("/gnu/store/dgyc74zakg110dxj67z3mj9g1vk8l4xp-openssl-1.0.2f" . 
"/gnu/store/fbmkb0xiwnr1823053dxal87m45bpy60-openssl-1.0.2f") 
("/gnu/store/1146ja893l132cs1dn4jkmb047pw6rsk-perl-5.22.1" . 
"/gnu/store/iam2djqw4s2bcpff8nhbsbkg7z73f3v3-perl-5.22.1") 
("/gnu/store/6zsdzk0w99d5xmpw50mgqj9nfiwazpyx-gnome-desktop-3.18.1" . 
"/gnu/store/crqvab6qkkxzxs18yf87wa67zr2rbl9x-gnome-desktop-3.18.1") 
("/gnu/store/8s3k25609kj6cqfd737vd1y9wqfr0zzl-harfbuzz-1.0.6" . 
"/gnu/store/9bhhmn1p9932scrkhjqqmmxbl9yv9sdv-harfbuzz-1.0.6") 
("/gnu/store/h3vpr7k7c2h3n7ixddyvr22sbzy98vhz-gtk+-3.18.2" . 
"/gnu/store/kpp4ica1hivpfnbsjjbzsgkxkx8zgghi-gtk+-3.18.2") 
("/gnu/store/lhhgw9psfnf7c8sjax68sin7nqm3d2k0-cups-2.1.0" . 
"/gnu/store/ffwac7n46xyicqz2ym6ghpf79gh0m8af-cups-2.1.0") 
("/gnu/store/bk3bplyp1cr6jv2hgv9d8cxlad3griqb-cups-filters-1.4.0" . 
"/gnu/store/si7689f9wc4ppyi20hi44ypz6xnn786a-cups-filters-1.4.0") 
("/gnu/store/2symxhixbs2rrhh59il0i8mlndl3x2d8-qpdf-5.1.3" . 
"/gnu/store/6qwvlxhb4ms02xr9g5d3qb0wbvr2iwaa-qpdf-5.1.3") 
("/gnu/store/sxxqvvrf3f679m939yps51ddz327q0dr-pango-1.38.1" . 
"/gnu/store/bhpmhiyyz9bqw4h4v3x55m4z64c01i7l-pango-1.38.1") 
("/gnu/store/zsaklr7zimhdnvb8z5yqld8jgqf31v9r-librsvg-2.40.13" . 
"/gnu/store/zs0x1dn010n79b49rwcf5dp9dzccxc26-librsvg-2.40.13"))) (map 
(match-lambda ((name . file) (cons (assoc-ref old-outputs name) file))) 
%outputs)))) (for-each (lambda (input output) (format #t "grafting '~a' -> 
'~a'...~%" input output) (force-output) (rewrite-directory input output 
mapping)) (match old-outputs (((names . files) ...) files)) (match %outputs 
(((names . files) ...) files))))))

Also, I should mention that I'm doing these tests on master from before
the recent 'security-updates' merge, so I have grafts for openssl,
graphite2, and perl.

     Mark