gnu: Add guix-minimal.

* gnu/packages/guile.scm (guile-2.0.13): New variable.
* gnu/packages/package-management.scm (guix)[arguments]: Adjust 'wrap-program'
phase to handle "missing" inputs.
(guix-minimal): New variable.
This commit is contained in:
Eric Bavier 2018-10-10 13:33:15 -05:00 committed by Eric Bavier
parent c8e3651a82
commit 6f1ce09d79
No known key found for this signature in database
GPG Key ID: FD73CAC719D32566
2 changed files with 34 additions and 2 deletions

View File

@ -226,6 +226,20 @@ without requiring the source code to be rewritten.")
(home-page "https://www.gnu.org/software/guile/") (home-page "https://www.gnu.org/software/guile/")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public guile-2.0.13
;; For testing a "minimal" Guix
(hidden-package
(package (inherit guile-2.0)
(name "guile")
(version "2.0.13")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/guile/guile-" version
".tar.xz"))
(sha256
(base32
"12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p")))))))
(define-public guile-2.2 (define-public guile-2.2
(package (inherit guile-2.0) (package (inherit guile-2.0)
(name "guile") (name "guile")

View File

@ -8,6 +8,7 @@
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org> ;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -232,13 +233,13 @@
(map (cut string-append <> (map (cut string-append <>
"/share/guile/site/" "/share/guile/site/"
effective) effective)
deps) (delete #f deps))
":")) ":"))
(gopath (string-join (gopath (string-join
(map (cut string-append <> (map (cut string-append <>
"/lib/guile/" effective "/lib/guile/" effective
"/site-ccache") "/site-ccache")
deps) (delete #f deps))
":"))) ":")))
(wrap-program (string-append out "/bin/guix") (wrap-program (string-append out "/bin/guix")
@ -373,6 +374,23 @@ the Nix package manager.")
("guile-ssh" ,guile2.0-ssh) ("guile-ssh" ,guile2.0-ssh)
("guile-git" ,guile2.0-git))))) ("guile-git" ,guile2.0-git)))))
(define-public guix-minimal
;; A version of Guix which is built with the minimal set of dependencies, as
;; outlined in the README "Requirements" section. Intended as a CI job, so
;; marked as hidden.
(let ((guix guile2.0-guix))
(hidden-package
(package
(inherit guix)
(name "guix-minimal")
(inputs
`(("guile" ,guile-2.0.13)
,@(alist-delete "guile" (package-inputs guix))))
(propagated-inputs
(fold alist-delete
(package-propagated-inputs guix)
'("guile-json" "guile-ssh")))))))
(define (source-file? file stat) (define (source-file? file stat)
"Return true if FILE is likely a source file, false if it is a typical "Return true if FILE is likely a source file, false if it is a typical
generated file." generated file."