nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: ncurses: Update to 6.1-20190909. 

* gnu/packages/ncurses.scm (ncurses): Update to 6.1-20190609.
[arguments]: Reinstate 'apply-rollup-patch' phase.  Move
'remove-unneeded-shebang' phase later to prevent conflict with patch.
[native-inputs]: Add "rollup-patch" origin.
This commit is contained in:
Marius Bakke 2019-06-18 16:54:45 +02:00
parent 2b5e412b30
commit 1bd364364d
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/ncurses.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2016 ng0 <ng0@n0.is> ;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -40,7 +40,7 @@
(define-public ncurses (define-public ncurses
(package (package
(name "ncurses") (name "ncurses")
(version "6.1") (version "6.1-20190609")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/ncurses/ncurses-" (uri (string-append "mirror://gnu/ncurses/ncurses-"
@ -84,8 +84,7 @@
(copy-file (assoc-ref (or native-inputs inputs) "rollup-patch") (copy-file (assoc-ref (or native-inputs inputs) "rollup-patch")
(string-append (getcwd) "/rollup-patch.sh.bz2")) (string-append (getcwd) "/rollup-patch.sh.bz2"))
(invoke "bzip2" "-d" "rollup-patch.sh.bz2") (invoke "bzip2" "-d" "rollup-patch.sh.bz2")
(invoke "sh" "rollup-patch.sh") (invoke "sh" "rollup-patch.sh")))
#t))
(remove-shebang-phase (remove-shebang-phase
'(lambda _ '(lambda _
;; To avoid retaining a reference to the bootstrap Bash via the ;; To avoid retaining a reference to the bootstrap Bash via the
@ -189,17 +188,31 @@
,@(if (target-mingw?) '("--enable-term-driver") '())))) ,@(if (target-mingw?) '("--enable-term-driver") '()))))
#:tests? #f ; no "check" target #:tests? #f ; no "check" target
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'apply-rollup-patch
,apply-rollup-patch-phase)
(replace 'configure ,configure-phase) (replace 'configure ,configure-phase)
(add-after 'install 'post-install (add-after 'install 'post-install
,post-install-phase) ,post-install-phase)
(add-before 'configure 'patch-makefile-SHELL (add-before 'configure 'patch-makefile-SHELL
,patch-makefile-phase) ,patch-makefile-phase)
(add-after 'unpack 'remove-unneeded-shebang (add-before 'patch-source-shebangs 'remove-unneeded-shebang
,remove-shebang-phase))))) ,remove-shebang-phase)))))
(native-inputs (native-inputs
`(,@(if (%current-target-system) `(,@(if (%current-target-system)
`(("self" ,this-package)) ;for `tic' `(("self" ,this-package)) ;for `tic'
'()) '())
("rollup-patch"
,(origin
(method url-fetch)
(uri (string-append
"https://invisible-mirror.net/archives/ncurses/"
(car (string-split version #\-))
"/ncurses-" version "-patch.sh.bz2"))
(sha256
(base32
"0hqlqdqmh7lfs6dwj763qksb4j9nk0pv6crzx5gnp6n4caz3i46g"))))
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification