142/328: gnu: ghc-network: Update to 2.8.0.1.

[guix-commits]

samplet pushed a commit to branch wip-haskell-updates
in repository guix.

commit 18a67b0999389bfd5ee18d54363a957e642a7254
Author: Timothy Sample <address@hidden>
Date:   Thu Oct 31 12:55:03 2019 -0400

    gnu: ghc-network: Update to 2.8.0.1.
    
    * gnu/packages/haskell-xyz.scm (ghc-network): Update to 2.8.0.1.
    (ghc-network-2.8): Remove variable.
    * gnu/packages/idris.scm (idris)[inputs]: Replace 'ghc-network-2.8' with
    'ghc-network'.
---
 gnu/packages/haskell-xyz.scm | 22 ++--------------------
 gnu/packages/idris.scm       |  2 +-
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 9c08b96..4b628f3 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -6850,7 +6850,7 @@ ncurses.")
 (define-public ghc-network
   (package
     (name "ghc-network")
-    (version "2.6.3.6")
+    (version "2.8.0.1")
     (outputs '("out" "doc"))
     (source
      (origin
@@ -6861,7 +6861,7 @@ ncurses.")
              ".tar.gz"))
        (sha256
         (base32
-         "198mam7ahny48p9fajznbqq16a8ya2gw0xm3gnm1si1rmc4hdplv"))))
+         "0im8k51rw3ahmr23ny10pshwbz09jfg0fdpam0hzf2hgxnzmvxb1"))))
     (build-system haskell-build-system)
     ;; The regression tests depend on an unpublished module.
     (arguments `(#:tests? #f))
@@ -6876,24 +6876,6 @@ ncurses.")
      "This package provides a low-level networking interface.")
     (license license:bsd-3)))
 
-;;; Until we update our default GHC to >=8.6 we cannot update our ghc-network
-;;; package, since the 'cabal-install' package that supports the current
-;;; 'Cabal' module requires 'network==2.6.*'.  Here we provide an updated
-;;; version to be used for our idris package.
-(define-public ghc-network-2.8
-  (hidden-package
-   (package
-     (inherit ghc-network)
-     (version "2.8.0.1")
-     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://hackage.haskell.org/package/network/";
-                            "network-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0im8k51rw3ahmr23ny10pshwbz09jfg0fdpam0hzf2hgxnzmvxb1")))))))
-
 (define-public ghc-network-info
   (package
     (name "ghc-network-info")
diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index 7e6ee30..cd68283 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -71,7 +71,7 @@
        ("ghc-ieee754" ,ghc-ieee754)
        ("ghc-libffi" ,ghc-libffi)
        ("ghc-megaparsec" ,ghc-megaparsec-7)
-       ("ghc-network" ,ghc-network-2.8)
+       ("ghc-network" ,ghc-network)
        ("ghc-optparse-applicative" ,ghc-optparse-applicative)
        ("ghc-regex-tdfa" ,ghc-regex-tdfa)
        ("ghc-safe" ,ghc-safe)