diff options
author | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
commit | 933204e5b1473a54367aef1f90de22424e9074ab (patch) | |
tree | d0ccfee2b903c5fac827bc4a52ec7de17bdc1e7b /tests/profiles.scm | |
parent | 9128e323c0a23243c3f70b1716c68ad0b241f30d (diff) | |
parent | 5e25ebe2fa70297d094fe891b81c4970e45a906a (diff) | |
download | guix-patches-933204e5b1473a54367aef1f90de22424e9074ab.tar guix-patches-933204e5b1473a54367aef1f90de22424e9074ab.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
gnu/packages/gstreamer.scm
Diffstat (limited to 'tests/profiles.scm')
-rw-r--r-- | tests/profiles.scm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/profiles.scm b/tests/profiles.scm index d20cb9d808..54fbaea864 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -183,9 +183,7 @@ ((entry -> (package->manifest-entry %bootstrap-guile)) (guile (package->derivation %bootstrap-guile)) (drv (profile-derivation (manifest (list entry)) - #:info-dir? #f - #:ghc-package-cache? #f - #:ca-certificate-bundle? #f)) + #:hooks '())) (profile -> (derivation->output-path drv)) (bindir -> (string-append profile "/bin")) (_ (built-derivations (list drv)))) @@ -197,9 +195,7 @@ (mlet* %store-monad ((entry -> (package->manifest-entry packages:glibc "debug")) (drv (profile-derivation (manifest (list entry)) - #:info-dir? #f - #:ghc-package-cache? #f - #:ca-certificate-bundle? #f))) + #:hooks '()))) (return (derivation-inputs drv)))) (test-end "profiles") |