From e5758aeb0e2716193a4b8b8233e54dafcfd1d8c8 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 27 Jul 2020 15:02:33 +0200 Subject: gnu: Move guile-zlib and guile-lzlib packages. * gnu/packages/guile-xyz.scm (guile-zlib, guile-lzlib): Move to ... * gnu/packages/guile.scm: ... here. --- gnu/packages/guile.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 6430633694..b2670eca7d 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -777,5 +777,70 @@ manipulate repositories of the Git version control system.") (define-deprecated-guile3.0-package guile3.0-git) -;;; guile.scm ends here +(define-public guile-zlib + (package + (name "guile-zlib") + (version "0.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/guile-zlib/guile-zlib.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "139ixlg0663azwpcj24sw27kmzxr5am0j6hn62ffjchi9w1qb3k0")) + (modules '((guix build utils))))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-3.0) + ("zlib" ,zlib))) + (synopsis "Guile bindings to zlib") + (description + "This package provides Guile bindings for zlib, a lossless +data-compression library. The bindings are written in pure Scheme by using +Guile's foreign function interface.") + (home-page "https://notabug.org/guile-zlib/guile-zlib") + (license license:gpl3+))) +(define-public guile-lzlib + (package + (name "guile-lzlib") + (version "0.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/guile-lzlib/guile-lzlib.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ny4pbig5x1lv83b63c2613gwv98myk3rm44l88ic7lrff6cd2hr")) + (modules '((guix build utils))))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-3.0) + ("lzlib" ,lzlib))) + (synopsis "Guile bindings to lzlib") + (description + "This package provides Guile bindings for lzlib, a C library for +in-memory LZMA compression and decompression. The bindings are written in +pure Scheme by using Guile's foreign function interface.") + (home-page "https://notabug.org/guile-lzlib/guile-lzlib") + (license license:gpl3+))) + +;;; guile.scm ends here -- cgit v1.2.3 From 442413912b645b7f54168d253873f0982bd39acf Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 27 Jul 2020 15:44:51 +0200 Subject: gnu: zlib: Use url-fetch instead of git-fetch. * gnu/packages/guile.scm (guile-zlib)[source]: Use url-fetch instead of git-fetch. --- gnu/packages/guile.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index b2670eca7d..4babff2723 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -781,16 +781,15 @@ manipulate repositories of the Git version control system.") (package (name "guile-zlib") (version "0.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://notabug.org/guile-zlib/guile-zlib.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "139ixlg0663azwpcj24sw27kmzxr5am0j6hn62ffjchi9w1qb3k0")) - (modules '((guix build utils))))) + (source + (origin + (method url-fetch) + (uri + (string-append "https://notabug.org/guile-zlib/guile-zlib/archive/" + version ".tar.gz")) + (sha256 + (base32 + "1caz6cbl6sg5567nk68z88rshp0m26zmb0a9ry1jkc1ivpk0n47i")))) (build-system gnu-build-system) (arguments '(#:make-flags -- cgit v1.2.3 From 69361e8881a79897e370322aedde9e6f459e26be Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 27 Jul 2020 15:48:28 +0200 Subject: gnu: lzlib: Use url-fetch instead of git-fetch. * gnu/packages/guile.scm (guile-lzlib)[source]: Use url-fetch instead of git-fetch. --- gnu/packages/guile.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 4babff2723..4b7577f2a2 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -813,16 +813,15 @@ Guile's foreign function interface.") (package (name "guile-lzlib") (version "0.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://notabug.org/guile-lzlib/guile-lzlib.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ny4pbig5x1lv83b63c2613gwv98myk3rm44l88ic7lrff6cd2hr")) - (modules '((guix build utils))))) + (source + (origin + (method url-fetch) + (uri + (string-append "https://notabug.org/guile-lzlib/guile-lzlib/archive/" + version ".tar.gz")) + (sha256 + (base32 + "0rdmszn1qix085ci2mddwq5cypipc004fk7arrrkgn9bv39hazza")))) (build-system gnu-build-system) (arguments '(#:make-flags -- cgit v1.2.3 From 4aa7dfe47fd282e045ba803b4ede9b2fcbad5005 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 27 Jul 2020 18:28:51 +0200 Subject: gnu: zlib: Document why "git-fetch" cannot be used. * gnu/packages/guile.scm (guile-zlib): Explain that using "git-fetch" would create and endless inclusion loop here. --- gnu/packages/guile.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 4b7577f2a2..4c6ae1007c 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -783,6 +783,9 @@ manipulate repositories of the Git version control system.") (version "0.0.1") (source (origin + ;; XXX: Do not use "git-fetch" method here that would create and + ;; endless inclusion loop, because this package is used as an extension + ;; in the same method. (method url-fetch) (uri (string-append "https://notabug.org/guile-zlib/guile-zlib/archive/" -- cgit v1.2.3 From a220ed075808126ceb94b0f8cc681b323d31192d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Aug 2020 10:00:41 +0300 Subject: gnu: guile-json: Update to 4.3.2. * gnu/packages/guile.scm (guile-json): Update to 4.3.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 4c6ae1007c..ccfa753f37 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -574,14 +574,14 @@ specification. These are the main features: (package (inherit guile-json-3) (name "guile-json") - (version "4.0.1") + (version "4.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/guile-json/guile-json-" version ".tar.gz")) (sha256 (base32 - "0f25qak4i57c3x0q9hlrll911l57bb8nz57rjkd02mn2fc2h3730")))))) + "0255c7f053z4p9mqzhpxwbfx3y47j9nfvlgnm8xasdclyzmjl9y2")))))) (define-public guile2.2-json (package-for-guile-2.2 guile-json-4)) -- cgit v1.2.3 From 327ebd55ca595aa3fac41139c906fbe05b5b6e0b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Aug 2020 10:03:33 +0300 Subject: gnu:guile-json-1: Update to 1.3.2. * gnu/packages/guile.scm (guile-json-1): Update to 1.3.2. [arguments]: Add make-flag to supress guild warnings. --- gnu/packages/guile.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index ccfa753f37..03c1dd0872 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -513,7 +513,7 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its (define-public guile-json-1 (package (name "guile-json") - (version "1.2.0") + (version "1.3.2") (home-page "https://github.com/aconchillo/guile-json") (source (origin (method url-fetch) @@ -521,8 +521,10 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its version ".tar.gz")) (sha256 (base32 - "15gnb84d7hpazqhskkf3g9z4r6knw54wfj4ch5270kakz1lp70c9")))) + "0m6yzb169r6iz56k3nkncjaiijwi4p0x9ijn1p5ax3s77jklxy9k")))) (build-system gnu-build-system) + (arguments + `(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings (native-inputs `(("pkg-config" ,pkg-config) ("guile" ,guile-2.2))) (inputs `(("guile" ,guile-2.2))) -- cgit v1.2.3 From 90748666a1796fe2ba40e7b750af6ac14d658267 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Aug 2020 16:24:39 +0300 Subject: gnu: guile-lzlib: Declare a source file-name. * gnu/packages/guile.scm (guile-lzlib)[source]: Add file-name field. --- gnu/packages/guile.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 03c1dd0872..f27523a867 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -824,6 +824,7 @@ Guile's foreign function interface.") (uri (string-append "https://notabug.org/guile-lzlib/guile-lzlib/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0rdmszn1qix085ci2mddwq5cypipc004fk7arrrkgn9bv39hazza")))) -- cgit v1.2.3 From b4d6e378ba5a23c7ddef7c1b992a4765761db08b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Aug 2020 16:25:19 +0300 Subject: gnu: guile-zlib: Declare a source file-name. * gnu/packages/guile.scm (guile-zlib)[source]: Add file-name field. --- gnu/packages/guile.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f27523a867..71d8a7bfde 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -792,6 +792,7 @@ manipulate repositories of the Git version control system.") (uri (string-append "https://notabug.org/guile-zlib/guile-zlib/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1caz6cbl6sg5567nk68z88rshp0m26zmb0a9ry1jkc1ivpk0n47i")))) -- cgit v1.2.3 From 65777dce0fd1e971d574f5423d416c136d720727 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 24 Aug 2020 15:01:38 +0200 Subject: gnu: guile-zlib: Fix cross-compilation. * gnu/packages/guile.scm (guile-zlib)[native-inputs]: Add "guile" when cross-compiling. --- gnu/packages/guile.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 71d8a7bfde..99c5a2dc9d 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -803,7 +803,10 @@ manipulate repositories of the Git version control system.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ,@(if (%current-target-system) + `(("guile" ,guile-3.0)) ;for 'guild compile' and 'guile-3.0.pc' + '()))) (inputs `(("guile" ,guile-3.0) ("zlib" ,zlib))) -- cgit v1.2.3 From 0c50d7231b124e7389d4cb0ab117a3d7dce1b817 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 24 Aug 2020 15:02:29 +0200 Subject: gnu: guile-lzlib: Fix cross-compilation. * gnu/packages/guile.scm (guile-lzlib)[native-inputs]: Add "guile" when cross-compiling. --- gnu/packages/guile.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 99c5a2dc9d..c59daeebe2 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -839,7 +839,10 @@ Guile's foreign function interface.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ,@(if (%current-target-system) + `(("guile" ,guile-3.0)) ;for 'guild compile' and 'guile-3.0.pc' + '()))) (inputs `(("guile" ,guile-3.0) ("lzlib" ,lzlib))) -- cgit v1.2.3