colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stylish-cabal compiles again. Yay!

Browse Source 
Thank you, @pikajude.
This commit is contained in:
Peter Simons 2019-02-15 15:03:05 +01:00
parent cdc4398b71
commit acaa5c1f1a
6 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View File

@ -95,7 +95,4 @@ self: super: {
# GHC 8.2 doesn't have semigroups included by default
ListLike = addBuildDepend super.ListLike self.semigroups;
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
}

5
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -71,11 +71,6 @@ self: super: {
yaml = self.yaml_0_11_0_0;
};
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = generateOptparseApplicativeCompletion "stylish-cabal" (super.stylish-cabal.overrideScope (self: super: {
haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
}));
# cabal2nix doesn't list this because of a conditional on the GHC version.
aeson = addBuildDepend super.aeson self.contravariant;

3
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View File

@ -69,7 +69,4 @@ self: super: {
# Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
stack = doJailbreak super.stack;
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
}

3
pkgs/development/haskell-modules/configuration-ghc-head.nix
View File

@ -78,7 +78,4 @@ self: super: {
# Fix build with ghc 8.6.x.
git-annex = appendPatch super.git-annex ./patches/git-annex-fix-ghc-8.6.x-build.patch;
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
}

5
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -2362,7 +2362,6 @@ extra-packages:
- haddock-api == 2.17.* # required on GHC 8.0.x
- haddock-library == 1.2.* # required for haddock-api-2.16.x
- haddock-library == 1.4.3 # required for haddock-api-2.17.x
- haddock-library == 1.5.* # required for stylish-cabal-0.4.0.1
- happy <1.19.6 # newer versions break Agda
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
- haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
@ -2404,9 +2403,9 @@ extra-packages:
package-maintainers:
peti:
- cabal-install
- cabal2nix
- cabal2spec
- cabal-install
- distribution-nixpkgs
- funcmp
- git-annex
@ -2431,6 +2430,7 @@ package-maintainers:
- stack
- streamproc
- structured-haskell-mode
- stylish-cabal
- titlecase
- xmonad
- xmonad-contrib
@ -9144,7 +9144,6 @@ dont-distribute-packages:
stt: [ i686-linux, x86_64-linux, x86_64-darwin ]
stunts: [ i686-linux, x86_64-linux, x86_64-darwin ]
stutter: [ i686-linux, x86_64-linux, x86_64-darwin ]
stylish-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
stylized: [ i686-linux, x86_64-linux, x86_64-darwin ]
sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ]
subhask: [ i686-linux, x86_64-linux, x86_64-darwin ]

2
pkgs/top-level/all-packages.nix
View File

@ -7024,7 +7024,7 @@ in
stack = haskell.lib.justStaticExecutables haskellPackages.stack;
hlint = haskell.lib.justStaticExecutables haskellPackages.hlint;
stylish-cabal = haskell.lib.justStaticExecutables haskell.packages.ghc844.stylish-cabal;
stylish-cabal = haskell.lib.justStaticExecutables haskellPackages.stylish-cabal;
all-cabal-hashes = callPackage ../data/misc/hackage { };