From: Mathieu Othacehe <m.othacehe@gmail.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 27275@debbugs.gnu.org
Subject: bug#27275: [PATCH 1/2] pull: Add a dependency to guile-git.
Date: Thu, 08 Jun 2017 16:49:15 +0200 [thread overview]
Message-ID: <86r2yuilg4.fsf@gmail.com> (raw)
In-Reply-To: <87bmpyznta.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1778 bytes --]
Hi Ludo !
> Maybe with a macro along these lines:
Nice, thanks !
I attached the patch I come up with. It's working ok :)
I have a shorter version using match :
--8<---------------cut here---------------start------------->8---
(letrec-syntax ((maybe-load-paths
(syntax-rules ()
((_ item rest ...)
(let ((tail (maybe-load-paths rest ...)))
(if (string? item)
(match tail
((load-path load-compiled-path)
(list
(cons (string-append item
"/share/guile/site/"
#$(effective-version))
load-path)
(cons (string-append item
"/lib/guile/"
#$(effective-version)
"/site-ccache")
load-compiled-path))))
tail)))
((_)
'(() ())))))
(match (maybe-load-paths #$guile-json #$guile-ssh
#$guile-git #$guile-bytestructures)
((module-load-path module-load-compiled-path)
(set! %load-path (append module-load-path %load-path)
(set! %load-compiled-path (append module-load-compiled-path %load-compiled-path))))))
--8<---------------cut here---------------end--------------->8---
It might seems preferable but I can't get guix-latest derivation to
include (ice-9 match), maybe because of #:module-path in
"(gexp->derivation "guix-latest" ...".
Mathieu
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-pull-Add-a-dependency-to-guile-git.patch --]
[-- Type: text/x-diff, Size: 3764 bytes --]
From 1130f8eafdb27216fc542bff253a940528bedc6a Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <m.othacehe@gmail.com>
Date: Wed, 7 Jun 2017 13:44:47 +0200
Subject: [PATCH 2/2] pull: Add a dependency to guile-git.
* build-aux/build-self.scm (guile-git, guile-bytestructures): New
variables.
(build): Add guile-git and guile-bytestructures to %load-path and
%load-compiled-path.
---
build-aux/build-self.scm | 52 ++++++++++++++++++++++++++++++++++++++----------
1 file changed, 41 insertions(+), 11 deletions(-)
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index a1335fea1..8fb9af23c 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -97,6 +97,13 @@ Guile major version (2.0 or 2.2), or #f if none of the packages matches."
"guile2.2-ssh"
"guile2.0-ssh"))
+(define guile-git
+ (package-for-current-guile "guile-git"
+ "guile2.0-git"))
+
+(define guile-bytestructures
+ (package-for-current-guile "guile-bytestructures"
+ "guile2.0-bytestructures"))
\f
;; The actual build procedure.
@@ -148,19 +155,42 @@ files."
#~(begin
(use-modules (guix build pull))
- (let ((json (string-append #$guile-json "/share/guile/site/"
- #$(effective-version))))
+ (letrec-syntax ((maybe-load-path
+ (syntax-rules ()
+ ((_ item rest ...)
+ (let ((tail (maybe-load-path rest ...)))
+ (if (string? item)
+ (cons (string-append item
+ "/share/guile/site/"
+ #$(effective-version))
+ tail)
+ tail)))
+ ((_)
+ '()))))
(set! %load-path
- (cons* json
- (string-append #$guile-ssh "/share/guile/site/"
- #$(effective-version))
- %load-path))
+ (append
+ (maybe-load-path #$guile-json #$guile-ssh
+ #$guile-git #$guile-bytestructures)
+ %load-path)))
+
+ (letrec-syntax ((maybe-load-compiled-path
+ (syntax-rules ()
+ ((_ item rest ...)
+ (let ((tail (maybe-load-compiled-path rest ...)))
+ (if (string? item)
+ (cons (string-append item
+ "/lib/guile/"
+ #$(effective-version)
+ "/site-ccache")
+ tail)
+ tail)))
+ ((_)
+ '()))))
(set! %load-compiled-path
- (cons* json
- (string-append #$guile-ssh "/lib/guile/"
- #$(effective-version)
- "/site-ccache")
- %load-compiled-path)))
+ (append
+ (maybe-load-compiled-path #$guile-json #$guile-ssh
+ #$guile-git #$guile-bytestructures)
+ %load-compiled-path)))
;; XXX: The 'guile-ssh' package prior to Guix commit 92b7258 was
;; broken: libguile-ssh could not be found. Work around that.
--
2.13.1
next prev parent reply other threads:[~2017-06-08 14:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-07 12:04 bug#27275: [PATCH 0/2] Add (guix git) module Mathieu Othacehe
2017-06-07 12:05 ` bug#27275: [PATCH 1/2] pull: Add a dependency to guile-git Mathieu Othacehe
2017-06-07 12:05 ` bug#27275: [PATCH 2/2] guix: git: Add new module Mathieu Othacehe
2017-06-07 12:21 ` Ludovic Courtès
2017-06-07 12:21 ` bug#27275: [PATCH 1/2] pull: Add a dependency to guile-git Ludovic Courtès
2017-06-07 13:58 ` Mathieu Othacehe
2017-06-08 12:06 ` Ludovic Courtès
2017-06-08 14:49 ` Mathieu Othacehe [this message]
2017-06-08 20:52 ` Ludovic Courtès
2017-06-09 7:51 ` Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86r2yuilg4.fsf@gmail.com \
--to=m.othacehe@gmail.com \
--cc=27275@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.