mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: guile-hall: Update to 0.6.0.
* gnu/packages/guile-xyz.scm (guile-hall): Update to 0.6.0. Change-Id: I04c8ea18285ee11b9e12bb7badc8ae0fcf8093a3 Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop> Co-authored-by: Maxim Cournoyer <maxim@guixotic.coop>
This commit is contained in:
Alex Sassmannshausen
Maxim Cournoyer
parent
29b443230c
commit
c47f2c89a2
1 changed files with 63 additions and 67 deletions
|
|
@ -2,7 +2,7 @@
|
||||||
;;; Copyright © 2012-2025 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2012-2025 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2015, 2017, 2022 Christine Lemmer-Webber <cwebber@dustycloud.org>
|
;;; Copyright © 2015, 2017, 2022 Christine Lemmer-Webber <cwebber@dustycloud.org>
|
||||||
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
|
;;; Copyright © 2016, 2025 Alex Sassmannshausen <alex@pompo.co>
|
||||||
;;; Copyright © 2016-2023 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2016-2023 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com>
|
;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com>
|
||||||
;;; Copyright © 2016, 2019-2021, 2023 Eraim Flashner <efraim@flashner.co.il>
|
;;; Copyright © 2016, 2019-2021, 2023 Eraim Flashner <efraim@flashner.co.il>
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
|
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
|
||||||
;;; Copyright © 2017 Nikita <nikita@n0.is>
|
;;; Copyright © 2017 Nikita <nikita@n0.is>
|
||||||
;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2018, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim@guixotic.coop>
|
;;; Copyright © 2018, 2021-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||||
;;; Copyright © 2018–2025 Arun Isaac <arunisaac@systemreboot.net>
|
;;; Copyright © 2018–2025 Arun Isaac <arunisaac@systemreboot.net>
|
||||||
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
|
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
|
||||||
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
|
||||||
|
|
@ -2698,74 +2698,70 @@ above command-line parameters.")
|
||||||
(replace "guile" guile-2.2)))))
|
(replace "guile" guile-2.2)))))
|
||||||
|
|
||||||
(define-public guile-hall
|
(define-public guile-hall
|
||||||
;; There are many unreleased bug fixes; use the latest commit for now.
|
(package
|
||||||
(let ((commit "7558ba906d4281a5b825e3c1c87f2810312414b6")
|
(name "guile-hall")
|
||||||
(revision "1"))
|
(version "0.6.0")
|
||||||
(package
|
(source
|
||||||
(name "guile-hall")
|
(origin
|
||||||
(version (git-version "0.4.1" revision commit))
|
(method git-fetch)
|
||||||
(source
|
(uri (git-reference
|
||||||
(origin
|
(url "https://gitlab.com/a-sassmannshausen/guile-hall")
|
||||||
(method git-fetch)
|
(commit version)))
|
||||||
(uri (git-reference
|
(file-name (git-file-name name version))
|
||||||
(url "https://gitlab.com/a-sassmannshausen/guile-hall")
|
(sha256
|
||||||
(commit commit)))
|
(base32 "11v7gmldz4i59q64xhz5l958dw57gn7y24ccivw2qv5sf0djad54"))))
|
||||||
(file-name (git-file-name name version))
|
(build-system gnu-build-system)
|
||||||
(sha256
|
(arguments
|
||||||
(base32 "0sqm6nyzc37p0xgjj21m9dar2iqik9gfwlcacp2v6y10lh2f1yps"))))
|
(list
|
||||||
(build-system gnu-build-system)
|
#:modules `(((guix build guile-build-system)
|
||||||
(arguments
|
#:select
|
||||||
(list
|
(target-guile-effective-version))
|
||||||
#:modules `(((guix build guile-build-system)
|
,@%default-gnu-modules)
|
||||||
#:select
|
#:phases
|
||||||
(target-guile-effective-version))
|
(with-imported-modules `((guix build guile-build-system)
|
||||||
,@%default-gnu-modules)
|
,@%default-gnu-imported-modules)
|
||||||
#:phases
|
#~(modify-phases %standard-phases
|
||||||
(with-imported-modules `((guix build guile-build-system)
|
(add-after 'install 'hall-wrap-binaries
|
||||||
,@%default-gnu-imported-modules)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
#~(modify-phases %standard-phases
|
(let* ((version (target-guile-effective-version))
|
||||||
(add-after 'install 'hall-wrap-binaries
|
(site-ccache (string-append "/lib/guile/"
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
version "/site-ccache"))
|
||||||
(let* ((version (target-guile-effective-version))
|
(site (string-append "/share/guile/site/" version))
|
||||||
(site-ccache (string-append "/lib/guile/"
|
(dep-path
|
||||||
version "/site-ccache"))
|
(lambda (env path)
|
||||||
(site (string-append "/share/guile/site/" version))
|
(list env ":" 'prefix
|
||||||
(dep-path
|
(cons (string-append #$output path)
|
||||||
(lambda (env path)
|
(map (lambda (input)
|
||||||
(list env ":" 'prefix
|
(string-append
|
||||||
(cons (string-append #$output path)
|
(assoc-ref inputs input)
|
||||||
(map (lambda (input)
|
path))
|
||||||
(string-append
|
(list "guile-config"
|
||||||
(assoc-ref inputs input)
|
"guile-lib"))))))
|
||||||
path))
|
(bin (string-append (ungexp output) "/bin/")))
|
||||||
(list "guile-config"
|
(wrap-program (string-append bin "hall")
|
||||||
"guile-lib"))))))
|
(dep-path "GUILE_LOAD_PATH" site)
|
||||||
(bin (string-append (ungexp output) "/bin/")))
|
(dep-path "GUILE_LOAD_COMPILED_PATH" site-ccache)))))))))
|
||||||
(wrap-program (string-append bin "hall")
|
(native-inputs
|
||||||
(dep-path "GUILE_LOAD_PATH" site)
|
(list autoconf
|
||||||
(dep-path "GUILE_LOAD_COMPILED_PATH" site-ccache)))))))))
|
automake
|
||||||
(native-inputs
|
gettext-minimal
|
||||||
(list autoconf
|
guile-3.0
|
||||||
automake
|
pkg-config
|
||||||
gettext-minimal
|
texinfo))
|
||||||
guile-3.0
|
(inputs
|
||||||
pkg-config
|
(list bash-minimal
|
||||||
texinfo))
|
guile-3.0
|
||||||
(inputs
|
guile-config
|
||||||
(list bash-minimal
|
guile-lib
|
||||||
guile-3.0
|
guix))
|
||||||
guile-config
|
(synopsis "Guile project tooling")
|
||||||
guile-lib))
|
(description
|
||||||
(propagated-inputs
|
"Hall is a command-line application and a set of Guile libraries that
|
||||||
(list guile-config))
|
|
||||||
(synopsis "Guile project tooling")
|
|
||||||
(description
|
|
||||||
"Hall is a command-line application and a set of Guile libraries that
|
|
||||||
allow you to quickly create and publish Guile projects. It allows you to
|
allow you to quickly create and publish Guile projects. It allows you to
|
||||||
transparently support the GNU build system, manage a project hierarchy &
|
transparently support the GNU build system, manage a project hierarchy &
|
||||||
provides tight coupling to Guix.")
|
provides tight coupling to Guix.")
|
||||||
(home-page "https://gitlab.com/a-sassmannshausen/guile-hall")
|
(home-page "https://gitlab.com/a-sassmannshausen/guile-hall")
|
||||||
(license license:gpl3+))))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public guile-ics
|
(define-public guile-ics
|
||||||
(package
|
(package
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue