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

gnu: guix: Upgrade to 0.6. 

* gnu/packages/package-management.scm (guix): Upgrade to 0.6.
* gnu/services/dmd.scm (dmd-configuration-file): Change /var/nix to
  /var/guix.
* gnu/system/vm.scm (operating-system-default-contents): Likewise.
This commit is contained in:
Ludovic Courtès 2014-04-09 16:43:13 +02:00
parent 4ec91959f2
commit 2e4e01eebf
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -31,15 +31,14 @@
(define-public guix (define-public guix
(package (package
(name "guix") (name "guix")
(version "0.5") (version "0.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://alpha.gnu.org/gnu/guix/guix-" (uri (string-append "ftp://alpha.gnu.org/gnu/guix/guix-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"15azhc3lb1m64545q8cs8dzcgjbd2wjxhl6nw0rq6lnvrxz2wjmv")) "01xw51wizhsk827w4xp79k2b6dxjaviw04r6rbrb85qdxnwg6k9n"))))
(patches (list (search-patch "guix-test-networking.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list `(#:configure-flags (list

4
gnu/services/dmd.scm
View File

@ -66,8 +66,8 @@ ETC (the name of a directory in the store) on startup."
(not (member file '("." "..")))))) (not (member file '("." ".."))))))
;; Prevent ETC from being GC'd. ;; Prevent ETC from being GC'd.
(rm-f "/var/nix/gcroots/etc-directory") (rm-f "/var/guix/gcroots/etc-directory")
(symlink ,etc "/var/nix/gcroots/etc-directory")) (symlink ,etc "/var/guix/gcroots/etc-directory"))
(format #t "starting services...~%") (format #t "starting services...~%")
(for-each start ',(append-map service-provision services)))) (for-each start ',(append-map service-provision services))))

8
gnu/system/vm.scm
View File

@ -449,7 +449,7 @@ basic contents of the root file system of OS."
;; XXX: Deal with automatically allocated ids. ;; XXX: Deal with automatically allocated ids.
(uid (or (user-account-uid user) 0)) (uid (or (user-account-uid user) 0))
(gid (or (user-account-gid user) 0)) (gid (or (user-account-gid user) 0))
(root (string-append "/var/nix/profiles/per-user/" (root (string-append "/var/guix/profiles/per-user/"
(user-account-name user)))) (user-account-name user))))
`((directory ,root ,uid ,gid) `((directory ,root ,uid ,gid)
(directory ,home ,uid ,gid)))) (directory ,home ,uid ,gid))))
@ -462,14 +462,14 @@ basic contents of the root file system of OS."
(directory "/etc") (directory "/etc")
(directory "/var/log") ; for dmd (directory "/var/log") ; for dmd
(directory "/var/run/nscd") (directory "/var/run/nscd")
(directory "/var/nix/gcroots") (directory "/var/guix/gcroots")
("/var/nix/gcroots/system" -> ,os-dir) ("/var/guix/gcroots/system" -> ,os-dir)
(directory "/run") (directory "/run")
("/run/current-system" -> ,profile) ("/run/current-system" -> ,profile)
(directory "/bin") (directory "/bin")
("/bin/sh" -> "/run/current-system/bin/bash") ("/bin/sh" -> "/run/current-system/bin/bash")
(directory "/tmp") (directory "/tmp")
(directory "/var/nix/profiles/per-user/root" 0 0) (directory "/var/guix/profiles/per-user/root" 0 0)
(directory "/root" 0 0) ; an exception (directory "/root" 0 0) ; an exception
,@(append-map user-directories ,@(append-map user-directories