me/guix
Archived
1
0
Fork 0
Code Activity

gnu: guix: Update to cc98b00.

Browse source 
* gnu/packages/package-management.scm (guix): Update to cc98b00.
(guix-daemon)[arguments]: Remove 'install' phase; add
'change-default-guix' phase.
This commit is contained in:
Ludovic Courtès 2019-09-08 14:04:50 +02:00
parent 28ac73358f
commit 74781c65f3
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gnu/packages/package-management.scm
View file

@ -123,8 +123,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 "1.0.1") (let ((version "1.0.1")
(commit "c902458863d1d341ffd74970b75e69c2bb848183") (commit "cc98b00857e29074de96a6ed60e325cdfffaea1a")
(revision 4)) (revision 5))
(package (package
(name "guix") (name "guix")
@ -140,7 +140,7 @@
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"0w93qjgy9n0qqyij12s7hm7fl4wb6h99bmfril4cqf4ynckpdvbb")) "0r5v4a0lyvn97gvp1q6algpw91k77r36vlnxx8w4s0c6r767b6z3"))
(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
@ -355,6 +355,19 @@ the Nix package manager.")
#f) #f)
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'change-default-guix
(lambda _
;; We need to tell 'guix-daemon' which 'guix' command to use.
;; Here we use a questionable hack where we hard-code root's
;; current guix, which could be wrong (XXX). Note that scripts
;; like 'guix perform-download' do not run as root so we assume
;; that they have access to /var/guix/profiles/per-user/root.
(substitute* "nix/libstore/globals.cc"
(("guixProgram = (.*)nixBinDir + \"/guix\"" _ before)
(string-append "guixProgram = " before
"/var/guix/profiles/per-user/root\
/current-guix/bin/guix")))
#t))
(replace 'build (replace 'build
(lambda _ (lambda _
(invoke "make" "nix/libstore/schema.sql.hh") (invoke "make" "nix/libstore/schema.sql.hh")
@ -364,19 +377,7 @@ the Nix package manager.")
(delete 'copy-bootstrap-guile) (delete 'copy-bootstrap-guile)
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "install-binPROGRAMS" (invoke "make" "install-binPROGRAMS")))
"install-nodist_pkglibexecSCRIPTS")
;; We need to tell 'guix-daemon' which 'guix' command to use.
;; Here we use a questionable hack where we hard-code root's
;; current guix, which could be wrong (XXX). Note that scripts
;; like 'guix perform-download' do not run as root so we assume
;; that they have access to /var/guix/profiles/per-user/root.
(let ((out (assoc-ref outputs "out")))
(substitute* (find-files (string-append out "/libexec"))
(("exec \".*/bin/guix\"")
"exec \"${GUIX:-/var/guix/profiles/per-user/root/current-guix/bin/guix}\""))
#t)))
(delete 'wrap-program))))))) (delete 'wrap-program)))))))
(define-public guile2.0-guix (define-public guile2.0-guix