diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
| commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
| tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/packages/haskell-xyz.scm | |
| parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
| parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
Merge branch 'staging' into 'core-updates'.
Conflicts:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/guile.scm
gnu/packages/node.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/python-xyz.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/vpn.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/haskell-xyz.scm')
| -rw-r--r-- | gnu/packages/haskell-xyz.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 1655b88cb0..d6c50ade71 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7211,11 +7211,11 @@ compiler versions.") (build-system haskell-build-system) (arguments `(#:configure-flags `("--flags=system-libyaml") - #:extra-directories ("libyaml"))) + #:extra-directories ("libyaml+static"))) (inputs `(("ghc-conduit" ,ghc-conduit) ("ghc-resourcet" ,ghc-resourcet) - ("libyaml" ,libyaml))) + ("libyaml+static" ,libyaml+static))) (home-page "https://github.com/snoyberg/yaml#readme") (synopsis "Low-level, streaming YAML interface.") (description "This package provides a Haskell wrapper over the @@ -9581,6 +9581,7 @@ getDataFileName name = do ("pandoc" ,pandoc "lib") ,@all-static-inputs ,@direct-inputs))) + (outputs '("out" "lib" "static" "doc")) (synopsis "Pandoc filter for bibliographic references"))) (define-public ghc-pandoc-types |