[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/14: gnu: Remove package/inherit from commencement.
From: |
Efraim Flashner |
Subject: |
03/14: gnu: Remove package/inherit from commencement. |
Date: |
Sun, 1 Oct 2017 16:13:16 -0400 (EDT) |
efraim pushed a commit to branch core-updates
in repository guix.
commit 848f550f2c105326dc3be4033c8aaf35ec21cde4
Author: Efraim Flashner <address@hidden>
Date: Sun Oct 1 20:59:05 2017 +0300
gnu: Remove package/inherit from commencement.
This is a follow-up to several security grafts.
* gnu/packages/commencement.scm (file-boot0, glibc-final,
glibc-final-with-bootstrap-bash): Use '(package (inherit ...)'
in place of '(package/inherit'.
---
gnu/packages/commencement.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 68faf36..d58c896 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -113,7 +113,7 @@
(define file-boot0
(package-with-bootstrap-guile
- (package-with-explicit-inputs (package/inherit file
+ (package-with-explicit-inputs (package (inherit file)
(name "file-boot0"))
`(("make" ,gnu-make-boot0)
,@%bootstrap-inputs)
@@ -466,7 +466,7 @@ the bootstrap environment."
;; built just below; the only difference is that this one uses the
;; bootstrap Bash.
(package-with-bootstrap-guile
- (package/inherit glibc
+ (package (inherit glibc)
(name "glibc-intermediate")
(arguments
`(#:guile ,%bootstrap-guile
@@ -644,7 +644,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"address@hidden"~%"
(define glibc-final
;; The final glibc, which embeds the statically-linked Bash built above.
- (package/inherit glibc-final-with-bootstrap-bash
+ (package (inherit glibc-final-with-bootstrap-bash)
(name "glibc")
(inputs `(("static-bash" ,static-bash-for-glibc)
,@(alist-delete
- branch core-updates updated (b83ad3a -> b33c255), Efraim Flashner, 2017/10/01
- 04/14: gnu: libarchive: Update to 3.3.2., Efraim Flashner, 2017/10/01
- 03/14: gnu: Remove package/inherit from commencement.,
Efraim Flashner <=
- 05/14: gnu: libarchive: Use 'modify-phases' syntax., Efraim Flashner, 2017/10/01
- 10/14: gnu: bluez: Ungraft package., Efraim Flashner, 2017/10/01
- 02/14: gnu: binutils: Update to 2.28.1., Efraim Flashner, 2017/10/01
- 06/14: gnu: curl: Update to 7.55.0., Efraim Flashner, 2017/10/01
- 08/14: gnu: libgcrypt: Update to 1.8.1., Efraim Flashner, 2017/10/01
- 13/14: gnu: libtasn1: Ungraft package., Efraim Flashner, 2017/10/01
- 14/14: gnu: expat: Update to 2.2.2., Efraim Flashner, 2017/10/01
- 09/14: gnu: gdk-pixbuf: Update to 2.36.10., Efraim Flashner, 2017/10/01
- 12/14: gnu: ruby: Update to 2.4.2., Efraim Flashner, 2017/10/01
- 01/14: Merge remote-tracking branch 'origin/master' into core-updates, Efraim Flashner, 2017/10/01