From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAQAv-0007S7-Kh for guix-patches@gnu.org; Wed, 10 Oct 2018 21:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAQAt-0001Pe-3W for guix-patches@gnu.org; Wed, 10 Oct 2018 21:54:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:39756) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gAQAs-0001PP-VC for guix-patches@gnu.org; Wed, 10 Oct 2018 21:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gAQAs-0006Eh-T6 for guix-patches@gnu.org; Wed, 10 Oct 2018 21:54:02 -0400 Subject: [bug#33010] [PATCH 2/3] gnu: Add guix-minimal. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAQAD-0007Pb-SS for guix-patches@gnu.org; Wed, 10 Oct 2018 21:53:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAQAD-0000iE-24 for guix-patches@gnu.org; Wed, 10 Oct 2018 21:53:21 -0400 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:44951 helo=smtp.centurylink.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gAQAC-0000fS-Sd for guix-patches@gnu.org; Wed, 10 Oct 2018 21:53:20 -0400 From: ericbavier@centurylink.net Date: Wed, 10 Oct 2018 20:52:45 -0500 Message-Id: <20181011015246.24964-3-ericbavier@centurylink.net> In-Reply-To: <20181011015246.24964-1-ericbavier@centurylink.net> References: <20181011015246.24964-1-ericbavier@centurylink.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33010@debbugs.gnu.org Cc: Eric Bavier From: Eric Bavier * 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