diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-02-06 13:03:26 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-02-06 13:03:26 +0100 |
| commit | ba88eea2b3a8a33ecd7fc0ec64e3917c6c2fe21d (patch) | |
| tree | 75c68e44d3d76440f416552711b1a47ec83e411e /tests/profiles.scm | |
| parent | f380f9d55e6757c242acf6c71c4a3ccfcdb066b2 (diff) | |
| parent | 4aeb7f34c948f32363f2ae29c6942c6328df758c (diff) | |
| download | patches-ba88eea2b3a8a33ecd7fc0ec64e3917c6c2fe21d.tar patches-ba88eea2b3a8a33ecd7fc0ec64e3917c6c2fe21d.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests/profiles.scm')
| -rw-r--r-- | tests/profiles.scm | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/tests/profiles.scm b/tests/profiles.scm index 1f9bbd099d..9a05030aff 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Alex Kost <alezost@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -330,7 +330,7 @@ (test-assert "package->manifest-entry, search paths" ;; See <http://bugs.gnu.org/22073>. - (let ((mpl (@ (gnu packages python) python2-matplotlib))) + (let ((mpl (@ (gnu packages python-xyz) python2-matplotlib))) (lset= eq? (package-transitive-native-search-paths mpl) (manifest-entry-search-paths @@ -591,6 +591,36 @@ (built-derivations (list drv)) (return (readlink (readlink (string-append profile "/dangling"))))))) +(test-equalm "profile in profile" + '("foo" "0") + + ;; Make sure we can build a profile that has another profile has one of its + ;; entries. The new profile's /manifest and /etc/profile must override the + ;; other's. + (mlet* %store-monad + ((prof0 (profile-derivation + (manifest + (list (package->manifest-entry %bootstrap-guile))) + #:hooks '() + #:locales? #f)) + (prof1 (profile-derivation + (manifest (list (manifest-entry + (name "foo") + (version "0") + (item prof0)))) + #:hooks '() + #:locales? #f))) + (mbegin %store-monad + (built-derivations (list prof1)) + (let ((out (derivation->output-path prof1))) + (return (and (file-exists? + (string-append out "/bin/guile")) + (let ((manifest (profile-manifest out))) + (match (manifest-entries manifest) + ((entry) + (list (manifest-entry-name entry) + (manifest-entry-version entry))))))))))) + (test-end "profiles") ;;; Local Variables: |