X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/be672e2dc6357c00f179a37c1db71b48dfa4fa24..655c4bb25cfb1fa02ad1378e9d0dc2cfb2b3a03c:/gnu/packages/haskell-apps.scm diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index c70f1736d7..32e1c50852 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2019, 2020 Kyle Meyer ;;; Copyright © 2015 John Soo ;;; Copyright © 2019, 2020 Efraim Flashner -;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Brian Leung ;;; @@ -307,15 +307,14 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. (define-public ghcid (package (name "ghcid") - (version "0.8.4") + (version "0.8.7") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/ghcid/" "ghcid-" version ".tar.gz")) (sha256 - (base32 - "0wpm4ikrm1krz1ckzwk0srng091yh2skjal4fh95iz1hq3dw6qlw")))) + (base32 "0yqc1pkfajnr56gnh43sbj50r7c3r41b2jfz07ivgl6phi4frjbq")))) (build-system haskell-build-system) (inputs `(("ghc-extra" ,ghc-extra) @@ -326,8 +325,7 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit))) - (home-page - "https://github.com/ndmitchell/ghcid#readme") + (home-page "https://github.com/ndmitchell/ghcid#readme") (synopsis "GHCi based bare bones IDE") (description "Either \"GHCi as a daemon\" or \"GHC + a bit of an IDE\". A very simple Haskell @@ -341,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 @@ -427,7 +425,17 @@ to @code{cabal repl}).") (string-append bin "/git-annex-shell")) (symlink (string-append bin "/git-annex") (string-append bin "/git-remote-tor-annex")) - #t)))))) + #t))) + (add-after 'install 'touch-static-output + (lambda* (#:key outputs #:allow-other-keys) + ;; The Haskell build system adds a "static" output by + ;; default, and there is no way to override this until + ;; is fixed. Without + ;; this phase, the daemon complains because we do not + ;; create the "static" output. + (with-output-to-file (assoc-ref outputs "static") + (lambda () + (display "static output not used\n")))))))) (inputs `(("curl" ,curl) ("ghc-aeson" ,ghc-aeson) @@ -440,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) @@ -619,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) @@ -628,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 @@ -653,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) @@ -662,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))) @@ -730,6 +741,20 @@ is programmed in Haskell.") (base32 "0apzrvf99rskj4dbmn57jjxrsf19j436s8a09m950df5aws3a0wj")))) (build-system haskell-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'touch-static-output + (lambda* (#:key outputs #:allow-other-keys) + ;; The Haskell build system adds a "static" output by + ;; default, and there is no way to override this until + ;; is fixed. Without + ;; this phase, the daemon complains because we do not + ;; create the "static" output. + (with-output-to-file (assoc-ref outputs "static") + (lambda () + (display "static output not used\n"))) + #t))))) (inputs `(("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-data-default" ,ghc-data-default)