summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--gnu-system.am1
-rw-r--r--gnu/packages/guile.scm5
-rw-r--r--gnu/packages/patches/guile-ncurses-tests.patch15
3 files changed, 2 insertions, 19 deletions
diff --git a/gnu-system.am b/gnu-system.am
index 9cac7ec344..43ea9a22e4 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -349,7 +349,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/guile-1.8-cpp-4.5.patch			\
   gnu/packages/patches/guile-default-utf8.patch			\
   gnu/packages/patches/guile-linux-syscalls.patch		\
-  gnu/packages/patches/guile-ncurses-tests.patch		\
   gnu/packages/patches/guile-relocatable.patch			\
   gnu/packages/patches/guix-test-networking.patch		\
   gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index e928c311e4..1a5835fed3 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -232,15 +232,14 @@ many readers as needed).")
 (define-public guile-ncurses
   (package
     (name "guile-ncurses")
-    (version "1.4")
+    (version "1.5")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/guile-ncurses/guile-ncurses-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "070wl664lsm14hb6y9ch97x9q6cns4k6nxgdzbdzi5byixn74899"))
-             (patches (list (search-patch "guile-ncurses-tests.patch")))))
+               "0g51c72frk36wik4g8l8f5p274alr19aq500hgznl27r195rjx1r"))))
     (build-system gnu-build-system)
     (inputs `(("ncurses" ,ncurses)
               ("guile" ,guile-2.0)))
diff --git a/gnu/packages/patches/guile-ncurses-tests.patch b/gnu/packages/patches/guile-ncurses-tests.patch
deleted file mode 100644
index 483b05a4ef..0000000000
--- a/gnu/packages/patches/guile-ncurses-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-The wide test files are missing from the tarball, so ignore them.
-Reported at <https://lists.gnu.org/archive/html/bug-guile-ncurses/2014-06/msg00000.html>.
-
---- guile-ncurses-1.4/test/Makefile.in	2013-04-27 17:55:19.000000000 +0200
-+++ guile-ncurses-1.4/test/Makefile.in	2014-06-16 21:39:40.000000000 +0200
-@@ -258,8 +258,7 @@ m011_menu_options.test slk_001_init.test
- slk_003_init.test slk_004_init.test slk_005_demo.test			\
- slk_006_attributes.test
- 
--WIDETESTS = r037_border_set.test r038_get_wch.test r039_get_wstr.test	\
--r040_term_attrs.test
-+WIDETESTS =
- 
- TESTS = $(NOTERMTESTS) $(am__append_1) $(am__append_2)
- EXTRA_DIST = $(TESTLIB) $(TESTS)