diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
| commit | 32787d652460871a79f99b63230f92759e2e0de2 (patch) | |
| tree | ce883cac0d602b10b7c005755d035a08197e73a9 /gnu/packages/haskell-apps.scm | |
| parent | 052939c2f6e36de00a5e756ea29a4cc96884a55d (diff) | |
| parent | c2396ceb6eb30ac87755eb8b39583403b35fbd12 (diff) | |
Merge branch 'master' into staging
Conflicts:
gnu/local.mk
gnu/packages/gdb.scm
gnu/packages/lisp-xyz.scm
gnu/packages/web-browsers.scm
Diffstat (limited to 'gnu/packages/haskell-apps.scm')
| -rw-r--r-- | gnu/packages/haskell-apps.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 1de8b040f1..da1bd2128c 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -350,7 +350,7 @@ to @code{cabal repl}).") (build-system haskell-build-system) (arguments `(#:configure-flags - '("--flags=-Android -Assistant -Pairing -Webapp") + '("--flags=-Android -Webapp") #:phases (modify-phases %standard-phases (add-before 'configure 'patch-shell-for-tests @@ -457,6 +457,7 @@ to @code{cabal repl}).") ("ghc-feed" ,ghc-feed) ("ghc-filepath-bytestring" ,ghc-filepath-bytestring) ("ghc-free" ,ghc-free) + ("ghc-hinotify" ,ghc-hinotify) ("ghc-hslogger" ,ghc-hslogger) ("ghc-http-client" ,ghc-http-client) ("ghc-http-conduit" ,ghc-http-conduit) @@ -466,7 +467,10 @@ to @code{cabal repl}).") ("ghc-memory" ,ghc-memory) ("ghc-monad-control" ,ghc-monad-control) ("ghc-monad-logger" ,ghc-monad-logger) + ("ghc-mountpoints" ,ghc-mountpoints) ("ghc-network" ,ghc-network) + ("ghc-network-info" ,ghc-network-info) + ("ghc-network-multicast" ,ghc-network-multicast) ("ghc-old-locale" ,ghc-old-locale) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-persistent" ,ghc-persistent) |