From 296ad592166841c3b6762bc4e9114d12451498cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 10 Oct 2018 11:49:47 +0200 Subject: gnu: haunt: Make sure Guile-CommonMark and Guile-Reader are always visible. * gnu/packages/guile.scm (haunt)[arguments]: In 'wrap-haunt' phase, add Guile-Reader and Guile-CommonMark to the search paths. --- gnu/packages/guile.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 1d330668a7..f7baff4718 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1192,13 +1192,15 @@ Guile's foreign function interface.") #:tests? #f ; test suite is non-deterministic :( #:phases (modify-phases %standard-phases (add-after 'install 'wrap-haunt - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; Wrap the 'haunt' command to refer to the right ;; modules. (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (site (string-append - out "/share/guile/site"))) + out "/share/guile/site")) + (deps (list (assoc-ref inputs "guile-reader") + (assoc-ref inputs "guile-commonmark")))) (match (scandir site) (("." ".." version) (let ((modules (string-append site "/" version)) @@ -1207,9 +1209,19 @@ Guile's foreign function interface.") "/site-ccache"))) (wrap-program (string-append bin "/haunt") `("GUILE_LOAD_PATH" ":" prefix - (,modules)) + (,modules + ,@(map (lambda (dep) + (string-append dep + "/share/guile/site/" + version)) + deps))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,compiled-modules))) + (,compiled-modules + ,@(map (lambda (dep) + (string-append dep "/lib/guile/" + version + "/site-ccache")) + deps)))) #t))))))))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 121f32a104de6d88774c4a819eb40334a618199c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 10 Oct 2018 14:48:46 +0200 Subject: gnu: guile-next: Update to 2.9.1. * gnu/packages/guile.scm (guile-next): Update to 2.9.1. [native-inputs, arguments]: Remove. [properties]: New field. --- gnu/packages/guile.scm | 39 ++++++++------------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f7baff4718..e223edb9fc 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -323,39 +323,14 @@ without requiring the source code to be rewritten.") (package (inherit guile-2.2) (name "guile-next") - (version (git-version "2.99" revision commit)) + (version "2.9.1") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/guile.git") - (commit commit))) + (inherit (package-source guile-2.2)) + (uri (string-append "https://alpha.gnu.org/gnu/guile/guile-" + version ".tar.xz")) (sha256 (base32 - "1c2xy5cflg0hws48914rz3z8mdmf8w3lblfic0kxnymcmdv9cbhv")) - (file-name (git-file-name name version)))) - (native-inputs - `(("autoconf", autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("gettext" ,gnu-gettext) - ("texinfo" ,texinfo) - ("flex" ,flex) - ,@(package-native-inputs guile-2.2))) - (arguments - (substitute-keyword-arguments (package-arguments guile-2.2) - ((#:phases phases '%standard-phases) - ;; XXX: The default 'bootstrap' phase tries to execute the - ;; ./bootstrap directory. - `(modify-phases ,phases - (replace 'bootstrap - (lambda _ - (patch-shebang "build-aux/git-version-gen") - (invoke "autoreconf" "-vfi"))) - (add-before 'check 'skip-version-test - (lambda _ - ;; Remove this test that's bound to fail. - (delete-file "test-suite/tests/version.test") - #t)))))) + "0iba93yqn6mvgid0rfsrg4amym36pg9m8cqdplxsy222blrj9gh1")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") @@ -363,7 +338,9 @@ without requiring the source code to be rewritten.") (search-path-specification (variable "GUILE_LOAD_COMPILED_PATH") (files '("lib/guile/3.0/site-ccache" - "share/guile/site/3.0")))))))) + "share/guile/site/3.0"))))) + (properties '((ftp-server . "alpha.gnu.org") + (upstream-name . "guile")))))) (define (make-guile-readline guile) (package -- cgit v1.2.3 From c8e3651a824bbc28915802265d9a5e7cc6405eea Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 10 Oct 2018 13:26:54 -0500 Subject: gnu: guile2.0-guix: Fix build. * gnu/packages/gnupg.scm (guile2.0-gcrypt): New variable. * gnu/packages/guile.scm (guile2.0-sqlite3): New variable. * gnu/packages/package-management.scm (guile2.0-guix)[propagated-inputs]: Use them. --- gnu/packages/guile.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index e223edb9fc..912b0218ef 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2018 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -1151,6 +1152,9 @@ Guile's foreign function interface.") "This package provides Guile bindings to the SQLite database system.") (license license:gpl3+))) +(define-public guile2.0-sqlite3 + (package-for-guile-2.0 guile-sqlite3)) + (define-public haunt (package (name "haunt") -- cgit v1.2.3 From 6f1ce09d79fa6148459c90120881e825551651b2 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 10 Oct 2018 13:33:15 -0500 Subject: 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. --- gnu/packages/guile.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 912b0218ef..9e33003375 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") -- cgit v1.2.3