From 234ea3d65330af4c62b086419f23343433cd58c3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Apr 2017 10:37:52 +0200 Subject: gnu: guile-aspell: Update to 0.4. * gnu/packages/guile.scm (guile-aspell): Update to 0.4. [arguments] <#:phases>: Adjust 'set-libaspell-file-name' to new source tree layout. --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 96fc84a960..99b2ca1180 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1520,7 +1520,7 @@ type system, elevating types to first-class status.") (define-public guile-aspell (package (name "guile-aspell") - (version "0.3") + (version "0.4") (source (origin (method url-fetch) (uri (string-append @@ -1528,7 +1528,7 @@ type system, elevating types to first-class status.") version ".tar.gz")) (sha256 (base32 - "1wknn57x2qcsbn7zw6sbn1ma6fjsg8cvpnf78ak47s8jw6k6j75n")))) + "0vpk5xj9m9qc702z3khmkwhgpb949qbsyz8kw2qycda6qnxk0077")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--with-guilesitedir=" @@ -1538,7 +1538,7 @@ type system, elevating types to first-class status.") (add-before 'build 'set-libaspell-file-name (lambda* (#:key inputs #:allow-other-keys) (let ((aspell (assoc-ref inputs "aspell"))) - (substitute* "aspell/aspell.scm" + (substitute* "aspell.scm" (("\"libaspell\\.so\"") (string-append "\"" aspell "/lib/libaspell\""))) -- cgit v1.2.3 From 7295087eb1fad67978b7f787b8e92de3fdf70f91 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Apr 2017 10:41:59 +0200 Subject: gnu: guile-aspell: Remove hard-coded "site/2.0" from $(guilesitedir). * gnu/packages/guile.scm (guile-aspell)[arguments]: Remove #:configure-flags. Add 'set-guilesitedir' phase. --- gnu/packages/guile.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 99b2ca1180..62a58dcf98 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1531,10 +1531,14 @@ type system, elevating types to first-class status.") "0vpk5xj9m9qc702z3khmkwhgpb949qbsyz8kw2qycda6qnxk0077")))) (build-system gnu-build-system) (arguments - '(#:configure-flags (list (string-append "--with-guilesitedir=" - (assoc-ref %outputs "out") - "/share/guile/site/2.0")) - #:phases (modify-phases %standard-phases + '(#:phases (modify-phases %standard-phases + (add-before 'configure 'set-guilesitedir + (lambda _ + (substitute* "Makefile.in" + (("^guilesitedir =.*$") + "guilesitedir = \ +$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) + #t)) (add-before 'build 'set-libaspell-file-name (lambda* (#:key inputs #:allow-other-keys) (let ((aspell (assoc-ref inputs "aspell"))) -- cgit v1.2.3 From cb5be6df9191ae00b495cf37a35e6b3b3cd4b5a9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Apr 2017 10:45:29 +0200 Subject: gnu: guile-aspell: Switch to Guile 2.2. * gnu/packages/guile.scm (guile-aspell)[inputs]: Replace GUILE-2.0 with GUILE-2.2. --- gnu/packages/guile.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 62a58dcf98..d69b627f9a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1548,7 +1548,7 @@ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) "/lib/libaspell\""))) #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.0) + (inputs `(("guile" ,guile-2.2) ("aspell" ,aspell))) (home-page "https://github.com/spk121/guile-aspell") (synopsis "Spell-checking from Guile") -- cgit v1.2.3 From 958d357a38cf2811ce64229a515e488dc957d7bc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Apr 2017 15:00:27 +0200 Subject: gnu: guile-ncurses: Update to 2.2. * gnu/packages/guile.scm (guile-ncurses): Update to 2.2. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d69b627f9a..93567da4e9 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -470,14 +470,14 @@ many readers as needed).") (define-public guile-ncurses (package (name "guile-ncurses") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/guile-ncurses/guile-ncurses-" version ".tar.gz")) (sha256 (base32 - "1h7rnq4g7xlxxybcb3vjq6nscm9zhlmfaxb7258c8ax7him4azg6")))) + "1wvggbr4xv8idh1hzd8caj4xfp4pln78a7w1wqzd4zgzwmnzxr2f")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) ("guile" ,guile-2.0))) -- cgit v1.2.3 From 81eaa3f8579df42dbf0410db78b45a718fc544e7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Apr 2017 15:03:07 +0200 Subject: gnu: guile-ncurses: Switch to Guile 2.2. * gnu/packages/guile.scm (guile-ncurses)[inputs]: Switch to GUILE-2.2. [arguments] : Ajust accordingly. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 93567da4e9..d2e832aae5 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -480,7 +480,7 @@ many readers as needed).") "1wvggbr4xv8idh1hzd8caj4xfp4pln78a7w1wqzd4zgzwmnzxr2f")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) - ("guile" ,guile-2.0))) + ("guile" ,guile-2.2))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments '(#:configure-flags (list "--with-ncursesw" ; Unicode support @@ -498,7 +498,7 @@ many readers as needed).") (files (find-files dir ".scm"))) (substitute* files (("\"libguile-ncurses\"") - (format #f "\"~a/lib/guile/2.0/libguile-ncurses\"" + (format #f "\"~a/lib/guile/2.2/libguile-ncurses\"" out))) #t))))))) (home-page "https://www.gnu.org/software/guile-ncurses/") -- cgit v1.2.3 From f252d6df8b630fc93c700d51a03be417ee734128 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 14 Apr 2017 10:27:43 +0200 Subject: gnu: Add guile-syntax-highlight. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile.scm (guile-syntax-highlight): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/guile.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d2e832aae5..ff7cf40811 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2016 Amirouche ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Andy Wingo +;;; Copyright © 2017 David Thompson ;;; ;;; This file is part of GNU Guix. ;;; @@ -1732,4 +1733,39 @@ is not available for Guile 2.0.") manipulate repositories of the Git version control system.") (license license:gpl3+)))) +(define-public guile-syntax-highlight + (let ((commit "a047675e66861b647426372aa2ba7820f749616d") + (revision "0")) + (package + (name "guile-syntax-highlight") + (version (string-append "0.0." revision "." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://dthompson.us/guile-syntax-highlight.git") + (commit commit))) + (sha256 + (base32 + "1zjr6sg3n7xbdsliy45i39dqanxvcms58ayx36wxrz72zpq58vq3")))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ + (zero? (system* "sh" "bootstrap"))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-2.2))) + (synopsis "General-purpose syntax highlighter for GNU Guile") + (description "Guile-syntax-highlight is a general-purpose syntax +highlighting library for GNU Guile. It can parse code written in various +programming languages into a simple s-expression that can be converted to +HTML (via SXML) or any other format for rendering.") + (home-page "http://dthompson.us/software/guile-syntax-highlight") + (license license:lgpl3+)))) + ;;; guile.scm ends here -- cgit v1.2.3 From 5245399f47426a05f244c1281673fbd63054f999 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sun, 16 Apr 2017 11:33:18 +0300 Subject: gnu: guile-daemon: Update to 0.1.2. * gnu/packages/guile.scm (guile-daemon): Update to 0.1.2. --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index ff7cf40811..d45e60afc2 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016 Erik Edrosa ;;; Copyright © 2016 Eraim Flashner -;;; Copyright © 2016 Alex Kost +;;; Copyright © 2016, 2017 Alex Kost ;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira ;;; Copyright © 2016 Amirouche ;;; Copyright © 2016 Jan Nieuwenhuizen @@ -1375,7 +1375,7 @@ library}.") (define-public guile-daemon (package (name "guile-daemon") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/alezost/" name @@ -1383,7 +1383,7 @@ library}.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "0wsq9l6a4sijq4i1r3kcddfaznsak2jc5k59gzkhs5il5d2kn5yi")))) + "0hh6gq6b6phpxm0b1dkxyzj3f4sxdf7dji63609lzypa5v1ad2gv")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From c6726a5f88b17df0eae13c3d2e2187c4fc2a064f Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sun, 16 Apr 2017 11:37:40 +0300 Subject: gnu: guile-xosd, guile-daemon: Switch to Guile 2.2. * gnu/packages/guile.scm (guile-xosd)[inputs]: Replace GUILE-2.0 with GUILE-2.2. (guile-daemon)[inputs]: Likewise. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d45e60afc2..207daa54e6 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1359,7 +1359,7 @@ SQL databases. This package implements the interface for SQLite.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.0) + `(("guile" ,guile-2.2) ("libx11" ,libx11) ("libxext" ,libxext) ("libxinerama" ,libxinerama) @@ -1388,7 +1388,7 @@ library}.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.0))) + `(("guile" ,guile-2.2))) (home-page "https://github.com/alezost/guile-daemon") (synopsis "Evaluate code in a running Guile process") (description -- cgit v1.2.3 From 87e32101782a9bb0acc59a78f1c513d35d259f2a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 19 Apr 2017 23:43:19 +0200 Subject: gnu: guile: Update to 2.2.1. * gnu/packages/guile.scm (guile-2.2): Update to 2.2.1. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 207daa54e6..d486c32435 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -221,7 +221,7 @@ without requiring the source code to be rewritten.") (define-public guile-2.2 (package (inherit guile-2.0) (name "guile") - (version "2.2.0") + (version "2.2.1") (replacement #f) (source (origin (method url-fetch) @@ -229,7 +229,7 @@ without requiring the source code to be rewritten.") ".tar.lz")) (sha256 (base32 - "083vp6754dp4d5pvcy4bqvxq60cayf92v5slf5cgij8bnvixgyvr")) + "0dlwkpqs0b17mmjbf53891acs16ppxxmfwhx2vl5x2946pzrm3c7")) (modules '((guix build utils))) ;; Remove the pre-built object files. Instead, build everything -- cgit v1.2.3 From 031e6087c4c30b00f31824d269cfbf67a7c54f31 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 21 Apr 2017 16:56:45 +0200 Subject: gnu: guile: Update to 2.2.2. * gnu/packages/guile.scm (guile-2.2): Update to 2.2.2. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d486c32435..6d9f58c4ed 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -221,7 +221,7 @@ without requiring the source code to be rewritten.") (define-public guile-2.2 (package (inherit guile-2.0) (name "guile") - (version "2.2.1") + (version "2.2.2") (replacement #f) (source (origin (method url-fetch) @@ -229,7 +229,7 @@ without requiring the source code to be rewritten.") ".tar.lz")) (sha256 (base32 - "0dlwkpqs0b17mmjbf53891acs16ppxxmfwhx2vl5x2946pzrm3c7")) + "1dnh75h4rkx1zflpsngznkwcd6afn6zrc5x3xq7n946pm5bnx5bq")) (modules '((guix build utils))) ;; Remove the pre-built object files. Instead, build everything -- cgit v1.2.3 From 946742e3e57ee3c71e3ccc714dbf6827860dcb50 Mon Sep 17 00:00:00 2001 From: Amirouche Date: Sat, 22 Apr 2017 13:54:12 +0200 Subject: gnu: guile-bytestructures: Update to 91d042e MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile.scm (guile-bytestructures): Update to 91d042e. Signed-off-by: Ludovic Courtès --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 6d9f58c4ed..9dd524e4b2 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1441,16 +1441,16 @@ is no support for parsing block and inline level HTML.") (define-public guile-bytestructures (package (name "guile-bytestructures") - (version "20160726.53127f6") + (version "20170402.91d042e") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/TaylanUB/scheme-bytestructures") - (commit "53127f608caf64b34fa41c389b2743b546fbe9da"))) + (commit "91d042e3427e1d7740b604b6296c616cf2eec13d"))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0l4nx1vp9fkrgrgwjiycj7nx6wfjfd39rqamv4pmq7issi8mrywq")))) + "04lgh0nk6ddnwgh20hnz4pyhczaik0xbd50kikjsxcwcl46shavb")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From d26ae96c3da6d968cd38348197f3581e456e56cc Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 25 Apr 2017 00:18:29 -0500 Subject: gnu: Add guile-sjson. * gnu/packages/guile.scm (guile-sjson): Add guile-sjson. --- gnu/packages/guile.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 9dd524e4b2..26606f9d36 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1768,4 +1768,33 @@ HTML (via SXML) or any other format for rendering.") (home-page "http://dthompson.us/software/guile-syntax-highlight") (license license:lgpl3+)))) +(define-public guile-sjson + (package + (name "guile-sjson") + (version "0.2") + (source (origin + (method url-fetch) + (uri (string-append "https://dustycloud.org/misc/sjson-" version + ".tar.gz")) + (sha256 + (base32 + "09hnh2brc7ihh8dv4g5hdmdj8rs8p9l3pmlgafkx145grdg7wprx")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ (zero? (system* "sh" "bootstrap.sh"))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-2.2))) + (home-page "https://gitlab.com/dustyweb/guile-sjson") + (synopsis "S-expression based json reader/writer for Guile") + (description "guile-sjson is a json reader/writer for Guile. +It has a nice, simple s-expression based syntax.") + (license license:lgpl3+))) + ;;; guile.scm ends here -- cgit v1.2.3 From b3542d77febda2d0dd56a3e847a939f22e338d5c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 28 Apr 2017 13:45:13 +0200 Subject: gnu: guile-git: Update to revision 2. * gnu/packages/guile.scm (guile-git): Update to revision 2. [arguments]: remove "ccache -> site-ccache" substitution because it has been ported upstream. Signed-off-by: Kei Kebreau --- gnu/packages/guile.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 26606f9d36..32d67794e8 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017 David Thompson +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -1694,8 +1695,8 @@ is not available for Guile 2.0.") (license license:lgpl3+))) (define-public guile-git - (let ((revision "1") - (commit "96dfb3bdba39a37cf6aefb18e335118a6115f963")) + (let ((revision "2") + (commit "06f9fc3d9ac95798d4a51e6310f7b594ce5597e0")) (package (name "guile-git") (version (string-append "0.0-" revision "." (string-take commit 7))) @@ -1705,18 +1706,13 @@ is not available for Guile 2.0.") (uri (git-reference (url home-page) (commit commit))) (sha256 (base32 - "0v73251kmh1vs7gp3jh4pk4rikl4d8illwi0gnhwa55ij1mn9apl")) + "0rcq0f8dhl89ia7336bq8y279q5ada0b1kabcqw9zl3125k3cp4v")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (add-after 'unpack 'bootstrap (lambda _ - ;; Install .go files to "site-ccache", not "ccache". - (substitute* "Makefile.am" - (("/ccache") - "/site-ccache")) - (zero? (system* "autoreconf" "-vfi"))))))) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From e8e1ace0394dd979a1ad5459ebb5b9247f7ff1d7 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 3 May 2017 17:10:22 +0200 Subject: gnu: guile-bytestructures: Install sld files. * gnu/packages/guile.scm (guile-bytestructures): Build and install sld files in r7 repository. It fixes this kind of errors while using guile-bytestructures: ice-9/psyntax.scm:3245:33: ice-9/psyntax.scm:3245:33: Syntax error: /gnu/store/ny9mp091yw51ylv1q59z25z5vdw8bi56-profile/share/guile/site/2.2/bytestructures/guile/base.scm:8:19: include-from-path: file not found in path in subform "bytestructures/r7/base.exports.sld" of (include-from-path "bytestructures/r7/base.exports.sld") --- gnu/packages/guile.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 32d67794e8..c2f31fc8a1 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1471,6 +1471,8 @@ is no support for parsing block and inline level HTML.") effective)) (source (assoc-ref %build-inputs "source")) (doc (string-append out "/share/doc/scheme-bytestructures")) + (sld-files (with-directory-excursion source + (find-files "bytestructures/r7" "\\.exports.sld$"))) (scm-files (filter (lambda (path) (not (string-prefix? "bytestructures/r7" path))) (with-directory-excursion source @@ -1502,7 +1504,7 @@ is no support for parsing block and inline level HTML.") file)) (error (format #f "Failed to compile ~s to ~s!" file go-file))))) - scm-files) + (append sld-files scm-files)) ;; Also copy over the README. (install-file "README.md" doc) -- cgit v1.2.3 From 28a1041fa5b6896e16c6f7c1c2b77763c540de7a Mon Sep 17 00:00:00 2001 From: Catonano Date: Wed, 10 May 2017 08:36:40 +0200 Subject: gnu: Add guile-miniadapton. * gnu/packages/guile.scm (guile-miniadapton): New variable. --- gnu/packages/guile.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c2f31fc8a1..c7f3b8241a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -32,6 +32,7 @@ (define-module (gnu packages guile) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages admin) ;;for tree #:use-module (gnu packages aspell) #:use-module (gnu packages bash) #:use-module (gnu packages bdw-gc) @@ -794,6 +795,74 @@ See http://minikanren.org/ for more on miniKanren generally.") (define-public guile2.2-minikanren (package-for-guile-2.2 guile-minikanren)) +(define-public guile-miniadapton + (let ((commit "1b5749422304567c96ac5367f2221dda9eff5880") + (revision "1")) + (package + (name "guile-miniadapton") + (version (string-append "0-" revision "." (string-take commit 9))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fisherdj/miniAdapton.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "09q51zkw2fypad5xixskfzw2cjhjgs5cswdp3i7cpp651rb3zndh")))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build utils) + (ice-9 popen) + (ice-9 rdelim) + (srfi srfi-1) + (guix build gnu-build-system)) + #:tests? #f ; there is no test target + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((cwd (getcwd)) + (scm-files (find-files "." "\\.scm$")) + (effective (read-line + (open-pipe* OPEN_READ + "guile" "-c" + "(display (effective-version))"))) + (module-dir (string-append (assoc-ref outputs "out") + "/share/guile/site/" + effective))) + + ;; Make installation directories. + (mkdir-p module-dir) + + (setenv "GUILE_AUTO_COMPILE" "0") + + ;; Compile .scm files and install. + (every (lambda (file) + (let ((go-file (string-append module-dir "/" + (basename file ".scm") ".go"))) + ;; Install source module. + (install-file file module-dir) + ;; Compile and install module. + (zero? (system* "guild" "compile" "-L" cwd + "-o" go-file file)))) + scm-files))))))) + (inputs + `(("guile" ,guile-2.2))) + (home-page "https://github.com/fisherdj/miniAdapton") + (synopsis "Minimal implementation of incremental computation in Guile +Scheme") + (description "This package provides a complete Scheme implementation of +miniAdapton, which implements the core functionality of the Adapton system for +incremental computation (also known as self-adjusting computation). Like +Adapton, miniAdapton allows programmers to safely combine mutation and +memoization. miniAdapton is built on top of an even simpler system, +microAdapton. Both miniAdapton and microAdapton are designed to be easy to +understand, extend, and port to host languages other than Scheme.") + (license license:expat)))) + (define-public guile-irregex (package (name "guile-irregex") -- cgit v1.2.3 From a62a16a4d38bc702da4fb9725fe7e1715ada2c4c Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 10 May 2017 09:29:31 -0500 Subject: gnu: guile-sjson: Update to 0.2.1. * gnu/packages/guile.scm (guile-sjson): Update to 0.2.1. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c7f3b8241a..8766e33081 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1838,14 +1838,14 @@ HTML (via SXML) or any other format for rendering.") (define-public guile-sjson (package (name "guile-sjson") - (version "0.2") + (version "0.2.1") (source (origin (method url-fetch) (uri (string-append "https://dustycloud.org/misc/sjson-" version ".tar.gz")) (sha256 (base32 - "09hnh2brc7ihh8dv4g5hdmdj8rs8p9l3pmlgafkx145grdg7wprx")))) + "1mzmapln79vv10qxaggz9qwcdbag3jnrj19xx8bgkmxss8h03sv3")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 99bde93b8392e5761f06a5b68b78dd433cacf096 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 10 May 2017 15:58:22 +0200 Subject: gnu: guile-sqlite3: Switch to Guile 2.2. * gnu/packages/guile.scm (guile-sqlite3)[version]: Set revision to 1. [inputs]: Use GUILE-2.2 instead of GUILE-2.0. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8766e33081..286aa42e7d 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1034,7 +1034,7 @@ Guile's foreign function interface.") (let ((commit "607721fe1174a299e45d457acacf94eefb964071")) (package (name "guile-sqlite3") - (version (string-append "0.0-0." (string-take commit 7))) + (version (string-append "0.0-1." (string-take commit 7))) ;; XXX: This used to be available read-only at ;; but it @@ -1062,7 +1062,7 @@ Guile's foreign function interface.") ("automake" ,automake) ("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.0) + `(("guile" ,guile-2.2) ("sqlite" ,sqlite))) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 2252f087d4bd450ab41a71379320467887edfc0f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 13 May 2017 21:49:01 +0200 Subject: gnu: guile-json: Rename "guile2.2-json" to "guile-json". * gnu/packages/guile.scm (guile-json)[native-inputs]: Change GUILE-2.0 to GUILE-2.2. (guile2.2-json): Define using 'deprecated-package'. (guile2.0-json): New variable. * gnu/packages/bioinformatics.scm (rcas-web)[inputs]: Update accordingly. * gnu/packages/ci.scm (cuirass)[inputs]: Likewise. * gnu/packages/package-management.scm (guix)[inputs]: Likewise. --- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/ci.scm | 2 +- gnu/packages/guile.scm | 7 +++++-- gnu/packages/package-management.scm | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6ef8690e48..9f5d8141d8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7891,7 +7891,7 @@ library implementing most of the pipeline's features.") `(("r-minimal" ,r-minimal) ("r-rcas" ,r-rcas) ("guile-next" ,guile-2.2) - ("guile-json" ,guile2.2-json) + ("guile-json" ,guile-json) ("guile-redis" ,guile2.2-redis))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 06a06dc65c..c26d02f175 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -247,7 +247,7 @@ their dependencies.") #t)))))) (inputs `(("guile" ,guile-2.2) - ("guile-json" ,guile2.2-json) + ("guile-json" ,guile-json) ("guile-sqlite3" ,guile-sqlite3) ("guix" ,guix) ("git" ,git))) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 286aa42e7d..5b85a61c12 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -691,7 +691,7 @@ for Guile\".") (("moddir =.*/share/guile/site" all) (string-append all "/@GUILE_EFFECTIVE_VERSION@"))))))) (build-system gnu-build-system) - (native-inputs `(("guile" ,guile-2.0))) + (native-inputs `(("guile" ,guile-2.2))) (home-page "http://savannah.nongnu.org/projects/guile-json/") (synopsis "JSON module for Guile") (description @@ -707,7 +707,10 @@ specification. These are the main features: (license license:lgpl3+))) (define-public guile2.2-json - (package-for-guile-2.2 guile-json)) + (deprecated-package "guile2.2-json" guile-json)) + +(define-public guile2.0-json + (package-for-guile-2.0 guile-json)) (define-public guile-minikanren (package diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 627501e9b1..3e0449a853 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -248,7 +248,7 @@ "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r")))))) (propagated-inputs `(("gnutls" ,gnutls/guile-2.2) ;for 'guix download' & co. - ("guile-json" ,guile2.2-json) + ("guile-json" ,guile-json) ("guile-ssh" ,guile2.2-ssh))) (home-page "https://www.gnu.org/software/guix/") -- cgit v1.2.3