diff options
| author | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-23 14:53:44 +0200 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-23 14:53:44 +0200 |
| commit | 1828958db52d0019a7f3d763b07e64f78afa2cbf (patch) | |
| tree | 8bdff27c5b3dc088d923e91a14a38f6a6b9fa661 /gnu/packages/haskell-apps.scm | |
| parent | 7e463dd16b7e273011f0beafa57a89fa2d525f8b (diff) | |
| parent | 23744435613aa040beacc61a0825cc72280da80a (diff) | |
| download | guix-1828958db52d0019a7f3d763b07e64f78afa2cbf.tar.gz | |
Merge branch 'wip-lisp' into staging
Diffstat (limited to 'gnu/packages/haskell-apps.scm')
| -rw-r--r-- | gnu/packages/haskell-apps.scm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 2a63712083..32e1c50852 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2019, 2020 Kyle Meyer <kyle@kyleam.com> ;;; Copyright © 2015 John Soo <jsoo1@asu.edu> ;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> +;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@member.fsf.org> ;;; Copyright © 2020 Brian Leung <bkleung89@gmail.com> ;;; @@ -339,18 +339,18 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "8.20200810") + (version "8.20200908") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "1wy6ckcf5f6m94gakg1504h1zryail3mmj85sglq03s45vawjcg6")))) + (base32 "1113inl10f4m0699ba2zglaqlfqvwhqjkqg6r6m1d5rqv5brswb1")))) (build-system haskell-build-system) (arguments `(#:configure-flags - '("--flags=-Android -Assistant -Pairing -Webapp -WebDAV") + '("--flags=-Android -Assistant -Pairing -Webapp") #:phases (modify-phases %standard-phases (add-before 'configure 'patch-shell-for-tests @@ -448,6 +448,7 @@ to @code{cabal repl}).") ("ghc-crypto-api" ,ghc-crypto-api) ("ghc-cryptonite" ,ghc-cryptonite) ("ghc-data-default" ,ghc-data-default) + ("ghc-dav" ,ghc-dav) ("ghc-disk-free-space" ,ghc-disk-free-space) ("ghc-dlist" ,ghc-dlist) ("ghc-edit-distance" ,ghc-edit-distance) @@ -627,7 +628,7 @@ and mIRC chat codes.") (define-public kmonad (package (name "kmonad") - (version "0.3.0") + (version "0.4.0") (source (origin (method git-fetch) @@ -636,7 +637,7 @@ and mIRC chat codes.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1g40nkpldih6h1rlxjx5yf9iavr3qs1f2b6j0gd8135p5hkg8d8n")))) + (base32 "064gnzzcm6fnxfiildbjmgbdxkhqvp61zrl6qhkl1pgbn27j1mll")))) (build-system haskell-build-system) (arguments `(#:phases @@ -661,7 +662,7 @@ and mIRC chat codes.") (doc (string-append out "/share/doc/kmonad-" ,version))) (install-file "README.md" doc) (copy-recursively "doc" doc) - (copy-recursively "example" (string-append doc "/example")) + (copy-recursively "keymap" (string-append doc "/keymap")) #t)))))) (inputs `(("ghc-cereal" ,ghc-cereal) @@ -670,6 +671,8 @@ and mIRC chat codes.") ("ghc-lens" ,ghc-lens) ("ghc-megaparsec" ,ghc-megaparsec) ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-rio" ,ghc-rio) ("ghc-unagi-chan" ,ghc-unagi-chan) ("ghc-unliftio" ,ghc-unliftio) ("ghc-unordered-containers" ,ghc-unordered-containers))) |