nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Efraim Flashner 2017-10-01 20:59:05 +03:00
parent 45953b1f67
commit 848f550f2c
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/commencement.scm
View File

@ -113,7 +113,7 @@
(define file-boot0 (define file-boot0
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package-with-explicit-inputs (package/inherit file (package-with-explicit-inputs (package (inherit file)
(name "file-boot0")) (name "file-boot0"))
`(("make" ,gnu-make-boot0) `(("make" ,gnu-make-boot0)
,@%bootstrap-inputs) ,@%bootstrap-inputs)
@ -466,7 +466,7 @@ the bootstrap environment."
;; built just below; the only difference is that this one uses the ;; built just below; the only difference is that this one uses the
;; bootstrap Bash. ;; bootstrap Bash.
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package/inherit glibc (package (inherit glibc)
(name "glibc-intermediate") (name "glibc-intermediate")
(arguments (arguments
`(#:guile ,%bootstrap-guile `(#:guile ,%bootstrap-guile
@ -644,7 +644,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(define glibc-final (define glibc-final
;; The final glibc, which embeds the statically-linked Bash built above. ;; 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") (name "glibc")
(inputs `(("static-bash" ,static-bash-for-glibc) (inputs `(("static-bash" ,static-bash-for-glibc)
,@(alist-delete ,@(alist-delete