diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-06-05 19:46:16 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-05 19:46:16 +0200 |
commit | d4721ff1017b64e5242b09fd7b430665ec580524 (patch) | |
tree | 1bd9ce1a339f5b348e780e4bb7f53a4333bfce01 /gnu/packages/haskell.scm | |
parent | 30e12b9664d774aca3948b1fa2e0aee6af09ca40 (diff) | |
parent | c0f6eebb6d9f6ca9b62344f32ce5f82dab601d53 (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/haskell.scm')
-rw-r--r-- | gnu/packages/haskell.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 822b0499b6..06e255fdcf 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2018, 2019 Timothy Sample <samplet@ngyro.com> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018, 2019 Gabriel Hondet <gabrielhondet@gmail.com> +;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -6951,7 +6952,7 @@ upon it.") (define-public ghc-conduit-extra (package (name "ghc-conduit-extra") - (version "1.3.0") + (version "1.3.1.1") (source (origin (method url-fetch) @@ -6960,7 +6961,7 @@ upon it.") version ".tar.gz")) (sha256 (base32 - "1bi2b6kdzy5f9glq46jzsk02has95jkxqz0cchpbmnakzhjwjh9c")))) + "0jaj350vv6mbb26gdwcqz4gwzfzrjydv5pis2da49wz1npbakcfw")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) |