me/guix
Archived
1
0
Fork 0
Code Activity

gnu: guix: Update to 0.4.

Browse source 
* gnu/packages/package-management.scm (guix): Update to 0.4.
  (guix-0.4): Remove.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Use GUIX instead of
  GUIX-0.4.
This commit is contained in:
Ludovic Courtès 2013-09-27 21:09:02 +02:00
parent 867e3c5553
commit f887601ac8
2 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,14 +30,14 @@
(define-public guix (define-public guix
(package (package
(name "guix") (name "guix")
(version "0.3") (version "0.4")
(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
"0xpfdmlfkkpmgrb8lpaqs5wxx31m4jslajs6b9waz5wp91zk7fix")))) "1mmh28ds5p8mpzm2yfvgm6z92wgknqc3dlw6r6z16s13sk386igk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list `(#:configure-flags (list
@ -104,16 +104,3 @@ A user-land free software distribution for GNU/Linux comes as part of Guix.
Guix is based on the Nix package manager.") Guix is based on the Nix package manager.")
(license gpl3+))) (license gpl3+)))
(define-public guix-0.4
;; XXX: Hack to allow the use of a 0.4ish tarball. This assumes that you
;; have run 'make dist' in your build tree. Remove when 0.4 is out.
(let* ((builddir (dirname
(canonicalize-path
(dirname (search-path %load-path
"guix/config.scm")))))
(tarball (string-append builddir "/guix-0.4.tar.gz")))
(package (inherit guix)
(version "0.4rc")
(source (if (file-exists? tarball)
tarball
(package-source guix))))))

6
gnu/system/vm.scm
View file

@ -390,7 +390,7 @@ such as /etc files."
("util-linux" ,util-linux) ("util-linux" ,util-linux)
,@(if initialize-store? ,@(if initialize-store?
`(("guix" ,guix-0.4)) `(("guix" ,guix))
'()) '())
,@inputs-to-copy) ,@inputs-to-copy)
@ -462,7 +462,7 @@ Happy birthday, GNU! http://www.gnu.org/gnu30
(mingetty-service store "tty5") (mingetty-service store "tty5")
(mingetty-service store "tty6") (mingetty-service store "tty6")
(syslog-service store) (syslog-service store)
(guix-service store #:guix guix-0.4) (guix-service store)
(nscd-service store) (nscd-service store)
;; QEMU networking settings. ;; QEMU networking settings.
@ -540,7 +540,7 @@ Happy birthday, GNU! http://www.gnu.org/gnu30
("procps" ,procps) ("procps" ,procps)
("psmisc" ,psmisc) ("psmisc" ,psmisc)
("zile" ,zile) ("zile" ,zile)
("guix" ,guix-0.4))) ("guix" ,guix)))
;; TODO: Replace with a real profile with a manifest. ;; TODO: Replace with a real profile with a manifest.
;; TODO: Generate bashrc from packages' search-paths. ;; TODO: Generate bashrc from packages' search-paths.