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

maint: update-guix-package: Really register GC roots. 

Previously we'd pass a relative file name to 'add-indirect-root', which
the daemon would interpret as relative to "/".  Consequently, checkouts
were not protected from GC.

* build-aux/update-guix-package.scm (main): Pass an absolute file name
to 'add-indirect-root'.
This commit is contained in:
Ludovic Courtès 2018-12-07 14:16:07 +01:00
parent ed9c8eb4e5
commit 6eac835f17
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build-aux/update-guix-package.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -133,7 +133,8 @@ COMMIT."
;; Add an indirect GC root for SOURCE in the current directory. ;; Add an indirect GC root for SOURCE in the current directory.
(false-if-exception (delete-file root)) (false-if-exception (delete-file root))
(symlink source root) (symlink source root)
(add-indirect-root store root) (add-indirect-root store
(string-append (getcwd) "/" root))
(format #t "source code for commit ~a: ~a (GC root: ~a)~%" (format #t "source code for commit ~a: ~a (GC root: ~a)~%"
commit source root))))) commit source root)))))

6
gnu/packages/package-management.scm
View File

@ -102,8 +102,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to ;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this. ;; start precisely like this.
(let ((version "0.16.0") (let ((version "0.16.0")
(commit "c845323d4b0a31ce5241a9d98187e1eeed43f71c") (commit "5227d938e2b7bda22e2a7aa733e1e09a6c726f18")
(revision 1)) (revision 2))
(package (package
(name "guix") (name "guix")
@ -119,7 +119,7 @@
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"0i431d5p9ckr7kxfiwpp94wgjgqn6mgyypf0smw64bk635fn6ycr")) "0v1a99k0qpxa5ksgqqwydd1nb00hkd71fj7374rqhklvk0a2cdz9"))
(file-name (string-append "guix-" version "-checkout")))) (file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments