From 0325e536cf557ff48d885948bf5fab8f59bfc444 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 May 2017 14:32:06 +0200 Subject: [PATCH 3/4] profiles: Don't use PACKAGE-FULL-NAME. The non-hash parts of store paths aren't constructed according to PACKAGE-FULL-NAME rules. They just happened to match in the past. * tests/profile.scm ("profile-derivation, cross-compilation"): Use PACKAGE-NAME and PACKAGE-VERSION directly. --- tests/profiles.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/profiles.scm b/tests/profiles.scm index d0b1e14a8..68e73c4ca 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -230,15 +230,18 @@ (and (string-suffix? name input) input))) (derivation-inputs drv)))) + (define (package-store-suffix package) + (string-append (package-name package) "-" (package-version package))) + ;; The inputs for grep and sed should be cross-build derivations, but that ;; for the glibc-utf8-locales should be a native build. (return (and (string=? (derivation-system drv) (%current-system)) - (string=? (find-input (package-full-name packages:grep)) + (string=? (find-input (package-store-suffix packages:grep)) (derivation-file-name grep)) - (string=? (find-input (package-full-name packages:sed)) + (string=? (find-input (package-store-suffix packages:sed)) (derivation-file-name sed)) (string=? (find-input - (package-full-name packages:glibc-utf8-locales)) + (package-store-suffix packages:glibc-utf8-locales)) (derivation-file-name locales)))))) (test-assert "package->manifest-entry defaults to \"out\"" -- 2.12.2