;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 Taylan Kammer <taylan.kammer@gmail.com>
+;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
(files '("lib/guile/3.0/site-ccache"
"share/guile/site/3.0")))))))
-(define-public guile-next guile-3.0)
+(define-public guile-3.0-latest
+ ;; TODO: Make this 'guile-3.0' on the next rebuild cycle.
+ (package
+ (inherit guile-3.0)
+ (version "3.0.4")
+ (source (origin
+ (inherit (package-source guile-3.0))
+ (uri (string-append "mirror://gnu/guile/guile-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0c8dkyvs6xbxp7rgnhkyakajzhakay7qn9kahj1mj49x5vf4fybb"))))))
+
+(define-public guile-next
+ (deprecated-package "guile-next" guile-3.0))
(define-public guile-3.0/libgc-7
;; Using libgc-7 avoid crashes that can occur, particularly when loading
;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40525
(hidden-package
(package
- (inherit guile-3.0)
+ (inherit guile-3.0-latest)
(propagated-inputs
`(("bdw-gc" ,libgc-7)
,@(srfi-1:alist-delete "bdw-gc" (package-propagated-inputs guile-3.0)))))))
(datum->syntax
#'name
(string->symbol
- (->guile (symbol->string (syntax->datum #'name)))))))
+ (->guile (symbol->string (syntax->datum
+ #'name))))))
+ (old-name
+ ;; XXX: This is the name generated by
+ ;; 'define-deprecated'.
+ (datum->syntax
+ #'name
+ (symbol-append '% (syntax->datum #'name)
+ '/deprecated))))
#'(begin
(define-deprecated name package
(deprecated-package package-name package))
- (export name))))))))
+ (export old-name))))))))
(define-deprecated-guile3.0-package guile3.0-readline)
(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)
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)))
("guile" ,guile-3.0)))
(inputs `(("guile" ,guile-3.0)))))
-(define-public guile2.2-json
- (package-for-guile-2.2 guile-json-3))
-
(define-public guile3.0-json
(deprecated-package "guile3.0-json" guile-json-3))
+(define-public guile-json-4
+ (package
+ (inherit guile-json-3)
+ (name "guile-json")
+ (version "4.3.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://savannah/guile-json/guile-json-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0255c7f053z4p9mqzhpxwbfx3y47j9nfvlgnm8xasdclyzmjl9y2"))))))
+
+(define-public guile2.2-json
+ (package-for-guile-2.2 guile-json-4))
+
;; There are two guile-gdbm packages, one using the FFI and one with
;; direct C bindings, hence the verbose name.
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ijp/guile-gdbm.git")
+ (url "https://github.com/ijp/guile-gdbm")
(commit "fa1d5b6231d0e4d096687b378c025f2148c5f246")))
(file-name (string-append name "-" version "-checkout"))
(patches (search-patches
(define-public guile-sqlite3
(package
(name "guile-sqlite3")
- (version "0.1.0")
+ (version "0.1.2")
(home-page "https://notabug.org/guile-sqlite3/guile-sqlite3.git")
(source (origin
(method git-fetch)
(commit (string-append "v" version))))
(sha256
(base32
- "1nv8j7wk6b5n4p22szyi8lv8fs31rrzxhzz16gyj8r38c1fyp9qp"))
- (file-name (string-append name "-" version "-checkout"))
- (patches
- (search-patches "guile-sqlite3-fix-cross-compilation.patch"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Allow builds with Guile 3.0.
- (substitute* "configure.ac"
- (("^GUILE_PKG.*")
- "GUILE_PKG([3.0 2.2 2.0])\n"))
- #t))))
+ "1nryy9j3bk34i0alkmc9bmqsm0ayz92k1cdf752mvhyjjn8nr928"))
+ (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
(base32
"0c5i3d16hp7gp9rd78vk9zc45js8bphf92m4lbb5gyi4l1yl7kkm"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings
(native-inputs
`(("pkg-config" ,pkg-config)
("guile" ,guile-3.0)
(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
+ ;; 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/"
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1caz6cbl6sg5567nk68z88rshp0m26zmb0a9ry1jkc1ivpk0n47i"))))
+ (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)
+ ,@(if (%current-target-system)
+ `(("guile" ,guile-3.0)) ;for 'guild compile' and 'guile-3.0.pc'
+ '())))
+ (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 url-fetch)
+ (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"))))
+ (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)
+ ,@(if (%current-target-system)
+ `(("guile" ,guile-3.0)) ;for 'guild compile' and 'guile-3.0.pc'
+ '())))
+ (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
HCoop / jackhill / guix / guix.git / blobdiff