GNU bug report logs - #33010
[PATCH 2/3] gnu: Add guix-minimal.

Previous Next

Full log

View this message in rfc822 format

From: ericbavier <at> centurylink.net
To: 33010 <at> debbugs.gnu.org
Cc: Eric Bavier <bavier <at> cray.com>
Subject: [bug#33010] [PATCH 2/3] gnu: Add guix-minimal.
Date: Wed, 10 Oct 2018 20:52:45 -0500

From: Eric Bavier <bavier <at> cray.com>

* 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.
---
 gnu/packages/guile.scm              | 14 ++++++++++++++
 gnu/packages/package-management.scm | 17 +++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 912b0218e..216f7c6d5 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -226,6 +226,20 @@ without requiring the source code to be rewritten.")
    (home-page "https://www.gnu.org/software/guile/")
    (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
   (package (inherit guile-2.0)
     (name "guile")
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 000c28632..4ddcb55f4 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -232,13 +232,13 @@
                                         (map (cut string-append <>
                                                   "/share/guile/site/"
                                                   effective)
-                                             deps)
+                                             (delete #f deps))
                                         ":"))
                                (gopath (string-join
                                         (map (cut string-append <>
                                                   "/lib/guile/" effective
                                                   "/site-ccache")
-                                             deps)
+                                             (delete #f deps))
                                         ":")))
 
                           (wrap-program (string-append out "/bin/guix")
@@ -371,6 +371,19 @@ the Nix package manager.")
        ("guile-ssh" ,guile2.0-ssh)
        ("guile-git" ,guile2.0-git)))))
 
+(define-public guix-minimal
+  (let ((guix guile2.0-guix))
+    (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)
   "Return true if FILE is likely a source file, false if it is a typical
 generated file."
-- 
2.19.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.