amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Marius Bakke 2020-05-02 17:31:28 +02:00
commit 50e6c1bf2e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
43 changed files with 1274 additions and 742 deletions
Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/guile-xyz.scm
View file

@ -23,7 +23,7 @@
;;; Copyright © 2019 swedebugia <swedebugia@riseup.net>
;;; Copyright © 2019, 2020 Amar Singh <nly@disroot.org>
;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Evan Straw <evan.straw99@gmail.com>
;;;
;;; This file is part of GNU Guix.
@ -1861,7 +1861,13 @@ many readers as needed).")
("guile" ,guile-2.2)))
(native-inputs `(("pkg-config" ,pkg-config)))
(arguments
'(#:configure-flags (list "--with-ncursesw" ; Unicode support
`(#:modules ((guix build gnu-build-system)
((guix build guile-build-system)
#:select (target-guile-effective-version))
(guix build utils))
#:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules)
#:configure-flags (list "--with-ncursesw" ; Unicode support
"--with-gnu-filesystem-hierarchy")
#:phases
(modify-phases %standard-phases
@ -1876,8 +1882,8 @@ many readers as needed).")
(files (find-files dir ".scm")))
(substitute* files
(("\"libguile-ncurses\"")
(format #f "\"~a/lib/guile/2.2/libguile-ncurses\""
out)))
(format #f "\"~a/lib/guile/~a/libguile-ncurses\""
out (target-guile-effective-version))))
#t))))))
(home-page "https://www.gnu.org/software/guile-ncurses/")
(synopsis "Guile bindings to ncurses")
@ -1886,6 +1892,14 @@ many readers as needed).")
library.")
(license license:lgpl3+)))
(define-public guile3.0-ncurses
(package
(inherit guile-ncurses)
(name "guile3.0-ncurses")
(version "3.0")
(inputs `(("ncurses" ,ncurses)
("guile" ,guile-3.0)))))
(define-public guile-ncurses/gpm
(package
(inherit guile-ncurses)
@ -1893,6 +1907,13 @@ library.")
(inputs `(("ncurses" ,ncurses/gpm)
("guile" ,guile-2.2)))))
(define-public guile3.0-ncurses/gpm
(package
(inherit guile3.0-ncurses)
(name "guile3.0-ncurses-with-gpm")
(inputs `(("ncurses" ,ncurses/gpm)
("guile" ,guile-3.0)))))
(define-public guile-lib
(package
(name "guile-lib")