git.iko.soy/typeable/nixpkgs
on master help sign in
stylish-cabal compiles again. Yay!

Thank you, @pikajude.

commitacaa5c1f1aecfea0bc70fc42bf9950145bd7bfa5 authorPeter Simons <simons@cryp.to> dateFri 15 Feb 2019, 15:03 (8 years ago) parentcdc4398
6 files changed+3−18
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix−3 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix−5 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix−3 pkgs/development/haskell-modules/configuration-ghc-head.nix−3 pkgs/development/haskell-modules/configuration-hackage2nix.yaml+2−3 pkgs/top-level/all-packages.nix+1−1
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix−3
@@ -95,7 +95,4 @@ self: super: {
9595 # GHC 8.2 doesn't have semigroups included by default
9696 ListLike = addBuildDepend super.ListLike self.semigroups;
9797
98− # https://github.com/pikajude/stylish-cabal/issues/11
99− stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
100−
10198}
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix−5
@@ -71,11 +71,6 @@ self: super: {
7171 yaml = self.yaml_0_11_0_0;
7272 };
7373
74− # https://github.com/pikajude/stylish-cabal/issues/11
75− stylish-cabal = generateOptparseApplicativeCompletion "stylish-cabal" (super.stylish-cabal.overrideScope (self: super: {
76− haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
77− }));
78−
7974 # cabal2nix doesn't list this because of a conditional on the GHC version.
8075 aeson = addBuildDepend super.aeson self.contravariant;
8176
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix−3
@@ -69,7 +69,4 @@ self: super: {
6969 # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
7070 stack = doJailbreak super.stack;
7171
72− # https://github.com/pikajude/stylish-cabal/issues/11
73− stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
74−
7572}
pkgs/development/haskell-modules/configuration-ghc-head.nix−3
@@ -78,7 +78,4 @@ self: super: {
7878 # Fix build with ghc 8.6.x.
7979 git-annex = appendPatch super.git-annex ./patches/git-annex-fix-ghc-8.6.x-build.patch;
8080
81− # https://github.com/pikajude/stylish-cabal/issues/11
82− stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
83−
8481}
pkgs/development/haskell-modules/configuration-hackage2nix.yaml+2−3
@@ -2362,7 +2362,6 @@ extra-packages:
23622362 - haddock-api == 2.17.* # required on GHC 8.0.x
23632363 - haddock-library == 1.2.* # required for haddock-api-2.16.x
23642364 - haddock-library == 1.4.3 # required for haddock-api-2.17.x
2365− - haddock-library == 1.5.* # required for stylish-cabal-0.4.0.1
23662365 - happy <1.19.6 # newer versions break Agda
23672366 - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
23682367 - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
@@ -2404,9 +2403,9 @@ extra-packages:
24042403
24052404package-maintainers:
24062405 peti:
2406+ - cabal-install
24072407 - cabal2nix
24082408 - cabal2spec
2409− - cabal-install
24102409 - distribution-nixpkgs
24112410 - funcmp
24122411 - git-annex
@@ -2431,6 +2430,7 @@ package-maintainers:
24312430 - stack
24322431 - streamproc
24332432 - structured-haskell-mode
2433+ - stylish-cabal
24342434 - titlecase
24352435 - xmonad
24362436 - xmonad-contrib
@@ -9144,7 +9144,6 @@ dont-distribute-packages:
91449144 stt: [ i686-linux, x86_64-linux, x86_64-darwin ]
91459145 stunts: [ i686-linux, x86_64-linux, x86_64-darwin ]
91469146 stutter: [ i686-linux, x86_64-linux, x86_64-darwin ]
9147− stylish-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
91489147 stylized: [ i686-linux, x86_64-linux, x86_64-darwin ]
91499148 sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ]
91509149 subhask: [ i686-linux, x86_64-linux, x86_64-darwin ]
pkgs/top-level/all-packages.nix+1−1
@@ -7024,7 +7024,7 @@ in
70247024
70257025 stack = haskell.lib.justStaticExecutables haskellPackages.stack;
70267026 hlint = haskell.lib.justStaticExecutables haskellPackages.hlint;
7027− stylish-cabal = haskell.lib.justStaticExecutables haskell.packages.ghc844.stylish-cabal;
7027+ stylish-cabal = haskell.lib.justStaticExecutables haskellPackages.stylish-cabal;
70287028
70297029 all-cabal-hashes = callPackage ../data/misc/hackage { };
70307030