diff options
author | Mark H Weaver <mhw@netris.org> | 2015-06-14 08:49:42 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-06-14 08:49:42 -0400 |
commit | bcf2971f6ebc965aa94391b2a8d39e5005885806 (patch) | |
tree | c12187a787b934fb79d159046a4a5516e5d39f97 /guix/profiles.scm | |
parent | ec2990716005b4b41bab6b707ada0206c1655be8 (diff) | |
parent | 7871724df7218428fac53133496c474bac8c5ea8 (diff) |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/commencement.scm
gnu/packages/xml.scm
Diffstat (limited to 'guix/profiles.scm')
-rw-r--r-- | guix/profiles.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm index 28150affb6..5c19c95d42 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -500,7 +500,10 @@ entries of MANIFEST, or #f if MANIFEST does not have any GHC packages." (string-append #$output "/" db-subdir)) (define (conf-files top) - (find-files (string-append top "/" db-subdir) "\\.conf$")) + (let ((db (string-append top "/" db-subdir))) + (if (file-exists? db) + (find-files db "\\.conf$") + '()))) (define (copy-conf-file conf) (let ((base (basename conf))) @@ -509,7 +512,8 @@ entries of MANIFEST, or #f if MANIFEST does not have any GHC packages." (system* (string-append #+ghc "/bin/ghc-pkg") "init" db-dir) (for-each copy-conf-file (append-map conf-files - '#$(manifest-inputs manifest))) + (delete-duplicates + '#$(manifest-inputs manifest)))) (let ((success (zero? (system* (string-append #+ghc "/bin/ghc-pkg") "recache" |