diff options
author | Christopher Baines <mail@cbaines.net> | 2021-03-05 22:56:40 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2021-03-06 00:18:30 +0000 |
commit | a8448da0f4a090818104e64dd79f90b0e50d5e77 (patch) | |
tree | 494c58b4724f12cd9de0db9b0a7096de2b922c0f /gnu/packages/haskell-xyz.scm | |
parent | 4f4b749e75b38b8c08b4f67ef51c2c8740999e28 (diff) | |
parent | a714af38d5d1046081524d859cde4cd8fd12a923 (diff) | |
download | guix-patches-a8448da0f4a090818104e64dd79f90b0e50d5e77.tar guix-patches-a8448da0f4a090818104e64dd79f90b0e50d5e77.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/haskell-xyz.scm')
-rw-r--r-- | gnu/packages/haskell-xyz.scm | 44 |
1 files changed, 42 insertions, 2 deletions
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d6c50ade71..1fa7310fab 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2020 JoJo <jo@jo.zone> -;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@member.fsf.org> ;;; Copyright © 2020 Carlo Holl <carloholl@gmail.com> ;;; Copyright © 2020 Christopher Lemmer Webber <cwebber@dustycloud.org> @@ -6432,7 +6432,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit))) - (home-page "http://patch-tag.com/r/salazar/indents") + (home-page "https://github.com/jaspervdj/indents") (synopsis "Indentation sensitive parser-combinators for parsec") (description "This library provides functions for use in parsing indentation sensitive @@ -10559,6 +10559,22 @@ the ideal templating system.") replace the standard one provided by GHC.") (license license:expat))) +(define-public ghc-protolude-0.3 + (package + (inherit ghc-protolude) + (name "ghc-protolude") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/protolude/protolude-" + version + ".tar.gz")) + (sha256 + (base32 + "1b6wprbwfdjyvds2bm6na0fbqgzdkj5ikkk33whbkyh3krd3i0s0")))))) + (define-public ghc-psqueue (package (name "ghc-psqueue") @@ -15168,6 +15184,30 @@ modernized interface.") (description "Word8 library to be used with @code{Data.ByteString}.") (license license:bsd-3))) +(define-public ghc-wordexp + (package + (name "ghc-wordexp") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/wordexp/wordexp-" + version + ".tar.gz")) + (sha256 + (base32 + "1mbcrq89jz0dcibw66w0jdy4f4bfpx4zwjfs98rm3jjgdikwdzb4")))) + (build-system haskell-build-system) + (native-inputs `(("ghc-c2hs" ,ghc-c2hs))) + (inputs + `(("ghc-semigroups" ,ghc-semigroups))) + (home-page "https://hackage.haskell.org/package/wordexp") + (synopsis "Library wrapping @code{wordexp} for Haskell") + (description "@code{wordexp(3)} wrapper library for Haskell to perform +word expansion like a posix-shell.") + (license license:bsd-3))) + (define-public ghc-x11 (package (name "ghc-x11") |