diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
| commit | f03426420497cd9839f5fb3cb547dbecd8d6053b (patch) | |
| tree | 220cdbab5b58b27c63d2df3ee711ad4bfdda074b /gnu/packages/guile.scm | |
| parent | 3cf1afb7e7249992b2db2f4f00899fd22237e89a (diff) | |
| parent | 069399ee9dbf75b7c89583f03346a63b2cfe4ac6 (diff) | |
| download | guix-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu/local.mk gnu/packages/bioinformatics.scm gnu/packages/django.scm gnu/packages/gtk.scm gnu/packages/llvm.scm gnu/packages/python-web.scm gnu/packages/python.scm gnu/packages/tex.scm guix/build-system/asdf.scm guix/build/emacs-build-system.scm guix/profiles.scm
Diffstat (limited to 'gnu/packages/guile.scm')
| -rw-r--r-- | gnu/packages/guile.scm | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 5bef56a891..955bf2e88d 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -15,7 +15,7 @@ ;;; 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> +;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -343,6 +343,7 @@ without requiring the source code to be rewritten.") (uri (git-reference (url "https://git.savannah.gnu.org/git/guile.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "09i1c77h2shygylfk0av31jsc1my6zjl230b2cx6vyl58q8c0cqy")))) @@ -759,21 +760,25 @@ type system, elevating types to first-class status.") (define-public guile-git (package (name "guile-git") - (version "0.5.0") + (version "0.5.1") (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/" - "30be542d90619ca844dd3a3ed2e13808/guile-git-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1j39c1cq9cbwir90mpnbdijpbwh7wkxampgl2r177bv8bfw6y203")))) + "1x3wa6la4j1wcfxyhhjlmd7yp85wwpny0y6lrzpz803i9z5fwagc")))) (build-system gnu-build-system) (arguments `(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings (native-inputs `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo) ("guile" ,guile-3.0) ("guile-bytestructures" ,guile-bytestructures))) (inputs @@ -835,6 +840,9 @@ Guile's foreign function interface.") (home-page "https://notabug.org/guile-zlib/guile-zlib") (license license:gpl3+))) +(define-public guile2.2-zlib + (package-for-guile-2.2 guile-zlib)) + (define-public guile-lzlib (package (name "guile-lzlib") @@ -871,6 +879,9 @@ pure Scheme by using Guile's foreign function interface.") (home-page "https://notabug.org/guile-lzlib/guile-lzlib") (license license:gpl3+))) +(define-public guile2.2-lzlib + (package-for-guile-2.2 guile-lzlib)) + (define-public guile-zstd (package (name "guile-zstd") |