diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-11-29 14:19:55 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-11-29 17:34:18 +0000 |
| commit | ff01206345e2306cc633db48e0b29eab9077091a (patch) | |
| tree | 25c7ee17005dadc9bf4fae3f0873e03a4704f782 /gnu/packages/guile.scm | |
| parent | ed2545f0fa0e2ad99d5a0c45f532c539b299b9fb (diff) | |
| parent | 7c2e67400ffaef8eb6f30ef7126c976ee3d7e36c (diff) | |
| download | guix-ff01206345e2306cc633db48e0b29eab9077091a.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/guile.scm')
| -rw-r--r-- | gnu/packages/guile.scm | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 912df146f1..442f49cbcb 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -677,17 +677,17 @@ Guile's foreign function interface.") (define-public guile-bytestructures (package (name "guile-bytestructures") - (version "1.0.7") + (version "1.0.9") (home-page "https://github.com/TaylanUB/scheme-bytestructures") (source (origin (method git-fetch) (uri (git-reference (url home-page) - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0q0habjiy3h9cigb7q1br9kz6z212dn2ab31f6dgd3rrmsfn5rvb")))) + "0r59sqrvwbsknw21bf44bppi6wdhd2rl2v5dw9i2vij3v8w7pgkm")))) (build-system gnu-build-system) (arguments `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings @@ -728,16 +728,16 @@ type system, elevating types to first-class status.") (define-public guile-git (package (name "guile-git") - (version "0.3.0") + (version "0.4.0") (home-page "https://gitlab.com/guile-git/guile-git.git") (source (origin (method url-fetch) (uri (string-append "https://gitlab.com/guile-git/guile-git/uploads/" - "4c563d8e7e1ff84396abe8ca7011bcaf/guile-git-" + "2600bb0dfdfb00bfbe46811dccad51d8/guile-git-" version ".tar.gz")) (sha256 (base32 - "0c5i3d16hp7gp9rd78vk9zc45js8bphf92m4lbb5gyi4l1yl7kkm")))) + "1kxyg9x2aa1pg69cl48wysq0pbxvwfahy1xpl5ab6p8babhf7kic")))) (build-system gnu-build-system) (arguments `(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings @@ -760,15 +760,7 @@ manipulate repositories of the Git version control system.") (package-for-guile-2.2 guile-git)) (define-public guile2.0-git - (let ((base (package-for-guile-2.0 guile-git))) - (package - (inherit base) - ;; Libgit2's Guile test driver requires (ice-9 textual-ports), which is - ;; not in Guile 2.0. Thus, keep LIBGIT2 as-is here (i.e., built against - ;; Guile 2.2). - (inputs `(("libgit2" ,libgit2) - ,@(srfi-1:alist-delete "libgit2" - (package-inputs base))))))) + (package-for-guile-2.0 guile-git)) (define-deprecated-guile3.0-package guile3.0-git) |