Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

haskellPackages: unbreak autodocodec, autdocodec-yaml, cabal2json #181242

Open
wants to merge 1 commit into
base: haskell-updates
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2586,6 +2586,10 @@ self: super: {
# https://github.com/klapaucius/vector-hashtables/issues/11
vector-hashtables = doJailbreak super.vector-hashtables;

autodocodec-yaml = super.autodocodec-yaml.override {
sternenseemann marked this conversation as resolved.
Show resolved Hide resolved
safe-coloured-text = super.safe-coloured-text_0_2_0_1;
};

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
# We need to build purescript with these dependencies and thus also its reverse
# dependencies to avoid version mismatches in their dependency closure.
Expand Down
7 changes: 7 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,11 @@ self: super: {
# Not possible to build in the main GHC 9.0 package set
# https://github.com/awakesecurity/spectacle/issues/49
spectacle = doDistribute (markUnbroken super.spectacle);

# missing test dependency, because cabal2nix interprets cabal file with ghc-9
autodocodec = addBuildDepends [ self.doctest ] super.autodocodec;

# Enabling the test suite triggers a dependency hell.
# This override will likely be obsolete starting with Stackage LTS 20
cabal2json = dontCheck super.cabal2json;
DavHau marked this conversation as resolved.
Show resolved Hide resolved
}
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@ broken-packages:
- authenticate-ldap
- authinfo-hs
- auto
- autodocodec-yaml
- autom
- autonix-deps
- autopack
Expand Down Expand Up @@ -523,7 +522,6 @@ broken-packages:
- cabal2doap
- cabal2ebuild
- cabal2ghci
- cabal2json
- cabal-audit
- cabal-auto-expose
- cabal-bundle-clib
Expand Down
4 changes: 0 additions & 4 deletions pkgs/development/haskell-modules/hackage-packages.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.