diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
commit | 030f6f489fe9544f35ebaf95135acd1dd67ce63f (patch) | |
tree | f1d5d1f1b68de81daec6f05d032a0410a475d960 /guix/profiles.scm | |
parent | 95c14929a7fbd3c55c5e8756953c2f257625e2b7 (diff) | |
parent | 938df0de739aa13c2fb483f440ec1db281a52aaa (diff) | |
download | patches-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar patches-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
etc/news.scm
gnu/local.mk
gnu/packages/bootloaders.scm
gnu/packages/linphone.scm
gnu/packages/linux.scm
gnu/packages/tls.scm
gnu/system.scm
Diffstat (limited to 'guix/profiles.scm')
-rw-r--r-- | guix/profiles.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm index 7bcf4e3172..fbadf41284 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1549,6 +1549,7 @@ MANIFEST." (define* (profile-derivation manifest #:key + (name "profile") (hooks %default-profile-hooks) (locales? #t) (allow-collisions? #f) @@ -1638,7 +1639,7 @@ are cross-built for TARGET." #:manifest '#$(manifest->gexp manifest) #:search-paths search-paths)))) - (gexp->derivation "profile" builder + (gexp->derivation name builder #:system system #:target target |