[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/14: gnu: ncurses: Update to 6.1-20190909.
From: |
guix-commits |
Subject: |
08/14: gnu: ncurses: Update to 6.1-20190909. |
Date: |
Thu, 20 Jun 2019 18:01:13 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 1bd364364dbbff2b51a7822b13bdbeecfd9f2d34
Author: Marius Bakke <address@hidden>
Date: Tue Jun 18 16:54:45 2019 +0200
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.
---
gnu/packages/ncurses.scm | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm
index a35ff9b..78e9ba1 100644
--- a/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2016 ng0 <address@hidden>
;;; Copyright © 2016 Efraim Flashner <address@hidden>
;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
-;;; Copyright © 2017 Marius Bakke <address@hidden>
+;;; Copyright © 2017, 2019 Marius Bakke <address@hidden>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -40,7 +40,7 @@
(define-public ncurses
(package
(name "ncurses")
- (version "6.1")
+ (version "6.1-20190609")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/ncurses/ncurses-"
@@ -84,8 +84,7 @@
(copy-file (assoc-ref (or native-inputs inputs) "rollup-patch")
(string-append (getcwd) "/rollup-patch.sh.bz2"))
(invoke "bzip2" "-d" "rollup-patch.sh.bz2")
- (invoke "sh" "rollup-patch.sh")
- #t))
+ (invoke "sh" "rollup-patch.sh")))
(remove-shebang-phase
'(lambda _
;; To avoid retaining a reference to the bootstrap Bash via the
@@ -189,17 +188,31 @@
,@(if (target-mingw?) '("--enable-term-driver") '()))))
#:tests? #f ; no "check" target
#:phases (modify-phases %standard-phases
+ (add-after 'unpack 'apply-rollup-patch
+ ,apply-rollup-patch-phase)
(replace 'configure ,configure-phase)
(add-after 'install 'post-install
,post-install-phase)
(add-before 'configure 'patch-makefile-SHELL
,patch-makefile-phase)
- (add-after 'unpack 'remove-unneeded-shebang
+ (add-before 'patch-source-shebangs 'remove-unneeded-shebang
,remove-shebang-phase)))))
(native-inputs
`(,@(if (%current-target-system)
`(("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)))
(native-search-paths
(list (search-path-specification
- branch core-updates updated (6cb1ef9 -> e7041c8), guix-commits, 2019/06/20
- 13/14: gnu: expat: Update to 2.2.7., guix-commits, 2019/06/20
- 14/14: gnu: python: Allow building on low-memory systems., guix-commits, 2019/06/20
- 09/14: gnu: isl: Fix fallback URL., guix-commits, 2019/06/20
- 04/14: gnu: libx11: Update to 1.6.8., guix-commits, 2019/06/20
- 11/14: gnu: libxi: Update to 1.7.10., guix-commits, 2019/06/20
- 10/14: gnu: isl: Update to 0.21., guix-commits, 2019/06/20
- 05/14: gnu: util-linux: Update to 2.34., guix-commits, 2019/06/20
- 06/14: gnu: meson: Update to 0.51.0., guix-commits, 2019/06/20
- 12/14: gnu: xorgproto: Update to 2019.1., guix-commits, 2019/06/20
- 08/14: gnu: ncurses: Update to 6.1-20190909.,
guix-commits <=
- 07/14: gnu: commencement: Return #t from all phases., guix-commits, 2019/06/20
- 01/14: gnu: dbus: Update to 1.12.16., guix-commits, 2019/06/20
- 02/14: packages: Retain version in file name when repacking source checkouts., guix-commits, 2019/06/20
- 03/14: gnu: Replace uses of 'cmake' with 'cmake-minimal'., guix-commits, 2019/06/20