diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-09-09 17:40:35 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-09-09 17:40:35 +0200 |
| commit | 0aeb13485055975d71ec8283040f007c79599bba (patch) | |
| tree | a06139136c809b00d166d6d66bdf757f20566704 /gnu/packages/guile.scm | |
| parent | b03f270e3d5ab5315b50ef3ebac35735cc28d4a2 (diff) | |
| parent | 0084744b3af0a6f8e125120143f57567902339a8 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/guile.scm')
| -rw-r--r-- | gnu/packages/guile.scm | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8c561b0210..7c88454300 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -866,7 +866,7 @@ for Guile\".") (define-public guile-json (package (name "guile-json") - (version "1.1.1") + (version "1.2.0") (home-page "https://github.com/aconchillo/guile-json") (source (origin (method url-fetch) @@ -875,7 +875,7 @@ for Guile\".") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12jqkn9qgwdlxbasy2n25a2a7apf30dww1nnxqfam5735k3jdngv")))) + "02kqv0q98fmchn7i4y7ycmrjlh4b2c93ij0z7k036qwpp204w4gh")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -893,7 +893,9 @@ specification. These are the main features: @item Unicode support for strings. @item Allows JSON pretty printing. @end itemize\n") - (license license:lgpl3+))) + + ;; Version 1.2.0 switched to GPLv3+ (from LGPLv3+). + (license license:gpl3+))) (define-public guile2.2-json (deprecated-package "guile2.2-json" guile-json)) @@ -1581,8 +1583,10 @@ you send to a FIFO file.") (("ac_subst_vars='") "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n")) (substitute* "Makefile.in" - (("/site/2.0") - "/site/@GUILE_EFFECTIVE_VERSION@")) + (("moddir =.*") + "moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@\n") + (("godir =.*") + "godir = $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) #t)))) (build-system gnu-build-system) (inputs @@ -1786,6 +1790,20 @@ Note that 8sync is only available for Guile 2.2.") (base32 "0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0")))) (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'install 'mode-guile-objects + (lambda* (#:key outputs #:allow-other-keys) + ;; .go files are installed to "lib/guile/X.Y/cache". + ;; This phase moves them to "…/site-ccache". + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/guile")) + (old (car (find-files lib "^ccache$" + #:directories? #t))) + (new (string-append (dirname old) + "/site-ccache"))) + (rename-file old new) + #t)))))) (native-inputs `(("texinfo" ,texinfo) ("pkg-config" ,pkg-config))) |