01/01: gnu: datamash: Update to 1.4.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit b83ddd03d961ea0a0cf75eb6649ecec4fbd4fb94
Author: Efraim Flashner <address@hidden>
Date:   Sun Dec 23 16:37:20 2018 +0200

    gnu: datamash: Update to 1.4.
    
    * gnu/packages/datamash.scm (datamash): Update to 1.4.
    [source]: Remove patch.
    * gnu/packages/patches/datamash-arm-tests.patch: Remove file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/datamash.scm                     |  7 ++-
 gnu/packages/patches/datamash-arm-tests.patch | 71 ---------------------------
 3 files changed, 3 insertions(+), 76 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index e2cac7f..0af948c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -651,7 +651,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/cursynth-wave-rand.patch                        \
   %D%/packages/patches/cvs-2017-12836.patch                    \
   %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch          \
-  %D%/packages/patches/datamash-arm-tests.patch                        \
   %D%/packages/patches/dbus-helper-search-path.patch           \
   %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
   %D%/packages/patches/dfu-programmer-fix-libusb.patch         \
diff --git a/gnu/packages/datamash.scm b/gnu/packages/datamash.scm
index 182d281..81b0069 100644
--- a/gnu/packages/datamash.scm
+++ b/gnu/packages/datamash.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2018 Eric Bavier <address@hidden>
-;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
+;;; Copyright © 2016, 2017, 2018 Efraim Flashner <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -29,7 +29,7 @@
 (define-public datamash
   (package
     (name "datamash")
-    (version "1.3")
+    (version "1.4")
     (source
      (origin
       (method url-fetch)
@@ -37,8 +37,7 @@
                           version ".tar.gz"))
       (sha256
        (base32
-        "19jpcv4ryvbz0476d6dgpxpbjkpmih4q84wj06nslls338bm5fzf"))
-      (patches (search-patches "datamash-arm-tests.patch"))))
+        "0aj7wvv14s2fsf2rl49mqhxdagy8cbz6rz4xyi7bkg2nahnxsi7s"))))
     (native-inputs
      `(("which" ,which)                 ;for tests
        ("perl" ,perl)))                 ;for help2man
diff --git a/gnu/packages/patches/datamash-arm-tests.patch 
b/gnu/packages/patches/datamash-arm-tests.patch
deleted file mode 100644
index a24c532..0000000
--- a/gnu/packages/patches/datamash-arm-tests.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-See https://lists.gnu.org/archive/html/bug-datamash/2018-03/msg00003.html and
-https://lists.gnu.org/archive/html/bug-datamash/2018-03/txt4DmvR7p6J9.txt
-
-From d446dba317aa067440d6312d955d523129949327 Mon Sep 17 00:00:00 2001
-From: Assaf Gordon <address@hidden>
-Date: Thu, 22 Mar 2018 11:00:34 -0600
-Subject: [PATCH 1/2] tests: fix --format='%4000f' expected output
-
-Can be 1.000009... or 1.000008999, depending on representation.
-
-* tests/datamash-output-format.pl: Check only the first 5 digits.
----
- tests/datamash-output-format.pl | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/tests/datamash-output-format.pl b/tests/datamash-output-format.pl
-index 52c68a2..ca99bb0 100755
---- a/tests/datamash-output-format.pl
-+++ b/tests/datamash-output-format.pl
-@@ -98,12 +98,13 @@ my @Tests =
-    {OUT => "0" x 3999 . "1\n"}],
- 
-   # due to binary floating representation, some decimal point digits won't be
--  # zero (e.g. 1.0000090000000000000000000000000523453254320000000...).
--  # The OUT_SUBST replaces exactly 3994 digits (as expected from the format)
-+  # zero (e.g. 1.0000090000000000000000000000000523453254320000000... or
-+  # 1.000008999999...).
-+  # The OUT_SUBST replaces exactly 3995 digits (as expected from the format)
-   # with an "X".
-   ['m2', '--format "%.4000f"   sum 1',  {IN_PIPE=>$in1},
--   {OUT => "1.000009X\n"},
--   {OUT_SUBST => 's/^(1\.000009)([0-9]{3994})$/\1X/'}],
-+   {OUT => "1.00000X\n"},
-+   {OUT_SUBST => 's/^(1\.00000)([0-9]{3995})$/\1X/'}],
- 
- );
- 
--- 
-2.7.4
-
-
-From f4871963974a96d6e69cb80b9c2fac7ff0c1d472 Mon Sep 17 00:00:00 2001
-From: Assaf Gordon <address@hidden>
-Date: Thu, 22 Mar 2018 11:18:13 -0600
-Subject: [PATCH 2/2] tests: disable --format="%a" test
-
-Valid output can differ (e.g. 0x8.000p-3 vs 0x1.000p+0).
-
-* tests/datamash-output-format.pl: Disable 'a1' test.
----
- tests/datamash-output-format.pl | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/datamash-output-format.pl b/tests/datamash-output-format.pl
-index ca99bb0..5e90ae0 100755
---- a/tests/datamash-output-format.pl
-+++ b/tests/datamash-output-format.pl
-@@ -90,7 +90,9 @@ my @Tests =
-   ['e2', '--format "%.3e"  sum 1', {IN_PIPE=>$in1}, {OUT=>"1.000e+00\n"}],
- 
-   # Test Custom formats: %a
--  ['a1', '--format "%0.3a" sum 1', {IN_PIPE=>$in1}, {OUT=>"0x8.000p-3\n"}],
-+  # Disable the test for now. Valid output can differ (e.g. 0x8.000p-3 and
-+  # 0x1.000p0 ).
-+  # ['a1', '--format "%0.3a" sum 1', {IN_PIPE=>$in1}, {OUT=>"0x8.000p-3\n"}],
- 
- 
-   # Custom formats can use lots of memory
--- 
-2.7.4
-