* [PATCH 1/2] gnu: guile-redis: Remove hard-coded Guile effective version. @ 2016-09-13 14:21 Ricardo Wurmus 2016-09-13 14:21 ` [PATCH 2/2] gnu: Add guile2.2-redis Ricardo Wurmus 2016-09-13 22:03 ` [PATCH 1/2] gnu: guile-redis: Remove hard-coded Guile effective version Ludovic Courtès 0 siblings, 2 replies; 6+ messages in thread From: Ricardo Wurmus @ 2016-09-13 14:21 UTC (permalink / raw) To: guix-devel * gnu/packages/guile.scm (guile-redis)[snippet]: Modify 'ac_subst_vars' in 'configure', and use "@GUILE_EFFECTIVE_VERSION@" instead of "2.0" in 'Makefile.in'. --- gnu/packages/guile.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 2294b16..5b8fffe 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -935,13 +935,17 @@ above command-line parameters.") "0vx6if6b4r3kwx64vzbs6vpc0cpcr85x11w9vkzq27gw8n7isv56")) (modules '((guix build utils))) (snippet - ;; Make sure everything goes under .../site/2.0, like Guile's + ;; Make sure everything goes under .../site/X.Y, like Guile's ;; search paths expects. - '(substitute* '("Makefile.in" - "redis/Makefile.in" - "redis/commands/Makefile.in") - (("moddir =.*/share/guile/site" all) - (string-append all "/2.0")))))) + '(begin + (substitute* "configure" + (("ac_subst_vars='") + "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n")) + (substitute* '("Makefile.in" + "redis/Makefile.in" + "redis/commands/Makefile.in") + (("moddir =.*/share/guile/site" all) + (string-append all "/@GUILE_EFFECTIVE_VERSION@"))))))) (build-system gnu-build-system) (native-inputs `(("guile" ,guile-2.0))) -- 2.10.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] gnu: Add guile2.2-redis. 2016-09-13 14:21 [PATCH 1/2] gnu: guile-redis: Remove hard-coded Guile effective version Ricardo Wurmus @ 2016-09-13 14:21 ` Ricardo Wurmus 2016-09-13 22:03 ` Ludovic Courtès 2016-09-13 22:03 ` [PATCH 1/2] gnu: guile-redis: Remove hard-coded Guile effective version Ludovic Courtès 1 sibling, 1 reply; 6+ messages in thread From: Ricardo Wurmus @ 2016-09-13 14:21 UTC (permalink / raw) To: guix-devel * gnu/packages/guile.scm (guile2.2-redis): New variable. --- gnu/packages/guile.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 5b8fffe..08430ad 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -955,6 +955,9 @@ above command-line parameters.") key-value cache and store.") (license lgpl3+))) +(define-public guile2.2-redis + (package-for-guile-2.2 guile-redis)) + (define-public guile-wisp (package (name "guile-wisp") -- 2.10.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] gnu: Add guile2.2-redis. 2016-09-13 14:21 ` [PATCH 2/2] gnu: Add guile2.2-redis Ricardo Wurmus @ 2016-09-13 22:03 ` Ludovic Courtès 2016-09-14 7:35 ` Ricardo Wurmus 0 siblings, 1 reply; 6+ messages in thread From: Ludovic Courtès @ 2016-09-13 22:03 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel Ricardo Wurmus <rekado@elephly.net> skribis: > * gnu/packages/guile.scm (guile2.2-redis): New variable. OK ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] gnu: Add guile2.2-redis. 2016-09-13 22:03 ` Ludovic Courtès @ 2016-09-14 7:35 ` Ricardo Wurmus 0 siblings, 0 replies; 6+ messages in thread From: Ricardo Wurmus @ 2016-09-14 7:35 UTC (permalink / raw) To: Ludovic Courtès; +Cc: guix-devel Ludovic Courtès <ludo@gnu.org> writes: > Ricardo Wurmus <rekado@elephly.net> skribis: > >> * gnu/packages/guile.scm (guile2.2-redis): New variable. > > OK Pushed to master as 85313be89d57a99f32f7991448ec06af7462f338. Thanks! ~~ Ricardo ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] gnu: guile-redis: Remove hard-coded Guile effective version. 2016-09-13 14:21 [PATCH 1/2] gnu: guile-redis: Remove hard-coded Guile effective version Ricardo Wurmus 2016-09-13 14:21 ` [PATCH 2/2] gnu: Add guile2.2-redis Ricardo Wurmus @ 2016-09-13 22:03 ` Ludovic Courtès 2016-09-14 7:36 ` Ricardo Wurmus 1 sibling, 1 reply; 6+ messages in thread From: Ludovic Courtès @ 2016-09-13 22:03 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel Ricardo Wurmus <rekado@elephly.net> skribis: > * gnu/packages/guile.scm (guile-redis)[snippet]: Modify 'ac_subst_vars' > in 'configure', and use "@GUILE_EFFECTIVE_VERSION@" instead of "2.0" in > 'Makefile.in'. OK! ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] gnu: guile-redis: Remove hard-coded Guile effective version. 2016-09-13 22:03 ` [PATCH 1/2] gnu: guile-redis: Remove hard-coded Guile effective version Ludovic Courtès @ 2016-09-14 7:36 ` Ricardo Wurmus 0 siblings, 0 replies; 6+ messages in thread From: Ricardo Wurmus @ 2016-09-14 7:36 UTC (permalink / raw) To: Ludovic Courtès; +Cc: guix-devel Ludovic Courtès <ludo@gnu.org> writes: > Ricardo Wurmus <rekado@elephly.net> skribis: > >> * gnu/packages/guile.scm (guile-redis)[snippet]: Modify 'ac_subst_vars' >> in 'configure', and use "@GUILE_EFFECTIVE_VERSION@" instead of "2.0" in >> 'Makefile.in'. > > OK! Pushed as ea833d301b0f4ff17dbc9403e18484a03258067e. ~~ Ricardo ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-14 7:37 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-09-13 14:21 [PATCH 1/2] gnu: guile-redis: Remove hard-coded Guile effective version Ricardo Wurmus 2016-09-13 14:21 ` [PATCH 2/2] gnu: Add guile2.2-redis Ricardo Wurmus 2016-09-13 22:03 ` Ludovic Courtès 2016-09-14 7:35 ` Ricardo Wurmus 2016-09-13 22:03 ` [PATCH 1/2] gnu: guile-redis: Remove hard-coded Guile effective version Ludovic Courtès 2016-09-14 7:36 ` Ricardo Wurmus
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.