diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 189 |
1 files changed, 41 insertions, 148 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index d216e8a41a0..b39efcbde77 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -42,35 +42,22 @@ self: super: { unix = null; xhtml = null; - # https://github.com/bitemyapp/esqueleto/issues/77 - esqueleto = markBrokenVersion "2.5.3" super.esqueleto; - - # https://github.com/haskell-pkg-janitors/haskell-src/issues/5 - haskell-src = markBrokenVersion "1.0.2.0" super.haskell-src; ## Shadowed: ## Needs bump to a versioned attribute - ## Setup: Encountered missing dependencies: - ## base >=3 && <4.11 - boxes = super.boxes_0_1_5; - - ## Needs bump to a versioned attribute ## • No instance for (GHC.Base.Semigroup BV) ## arising from the superclasses of an instance declaration ## • In the instance declaration for ‘Monoid BV’ bv = super.bv_0_5; ## Needs bump to a versioned attribute - constraints = super.constraints_0_10; - - ## Needs bump to a versioned attribute ## Setup: Encountered missing dependencies: ## template-haskell >=2.5 && <2.13 deriving-compat = super.deriving-compat_0_4_1; ## Needs bump to a versioned attribute ## Issue: https://github.com/sol/doctest/issues/189 - doctest = overrideCabal super.doctest_0_14_1 (drv: { + doctest = overrideCabal super.doctest_0_15_0 (drv: { ## Setup: Encountered missing dependencies: ## ghc >=7.0 && <8.4 ## @@ -85,18 +72,6 @@ self: super: { either = super.either_5; ## Needs bump to a versioned attribute - ## • Could not deduce (Semigroup (IterT m a)) - ## arising from the superclasses of an instance declaration - ## from the context: (Monad m, Monoid a) - free = super.free_5_0_1; - - ## Needs bump to a versioned attribute - ## Setup: Encountered missing dependencies: - ## base >=3 && <4.11 - ## Needed for (<>) in prelude - funcmp = super.funcmp_1_9; - - ## Needs bump to a versioned attribute ## Setup: Encountered missing dependencies: ## Cabal <2.2 ## Older versions don't compile. @@ -118,13 +93,7 @@ self: super: { }); ## Needs bump to a versioned attribute - ## • Could not deduce (Semigroup (ParseResult m)) - ## arising from the superclasses of an instance declaration - ## from the context: Monoid m - haskell-src-exts = super.haskell-src-exts_1_20_2; - - ## Needs bump to a versioned attribute - hspec = overrideCabal super.hspec_2_4_8 (drv: { + hspec = overrideCabal super.hspec_2_5_0 (drv: { ## Setup: Encountered missing dependencies: ## hspec-core ==2.4.4, hspec-discover ==2.4.4 ## @@ -136,7 +105,7 @@ self: super: { }); ## Needs bump to a versioned attribute - hspec-core = overrideCabal super.hspec-core_2_4_8 (drv: { + hspec-core = overrideCabal super.hspec-core_2_5_0 (drv: { ## • No instance for (Semigroup Summary) ## arising from the superclasses of an instance declaration ## • In the instance declaration for ‘Monoid Summary’ @@ -153,84 +122,10 @@ self: super: { ## Needs bump to a versioned attribute ## Setup: Encountered missing dependencies: ## hspec-discover ==2.4.8 - hspec-discover = super.hspec-discover_2_4_8; - - ## Needs bump to a versioned attribute - ## Setup: Encountered missing dependencies: - ## free ==4.*, template-haskell >=2.4 && <2.13 - lens = super.lens_4_16; - - ## Needs bump to a versioned attribute - regex-tdfa = overrideCabal super.regex-tdfa_1_2_3 (drv: { - ## • No instance for (Semigroup (CharMap a)) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid (CharMap a)’ - ## - ## error: while evaluating ‘overrideCabal’ at nixpkgs://pkgs/development/haskell-modules/lib.nix:37:24, called from /home/deepfire/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix:188:16: - editedCabalFile = null; - }); - - ## Needs bump to a versioned attribute - ## Setup: Encountered missing dependencies: - ## doctest >=0.11.1 && <0.14 - semigroupoids = super.semigroupoids_5_2_2; - - ## Needs bump to a versioned attribute - ## Issue: https://github.com/haskell/test-framework/issues/35 - test-framework = overrideCabal super.test-framework_0_8_2_0 (drv: { - ## • No instance for (Semigroup (TestOptions' Maybe)) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid (TestOptions' Maybe)’ - ## - ## Setup: Encountered missing dependencies: - ## QuickCheck >=2.3 && <2.10 - doCheck = false; - }); - - ## Needs bump to a versioned attribute - ## Setup: Encountered missing dependencies: - ## doctest >=0.7 && <0.14 - turtle = super.turtle_1_5_4; - - ## Needs bump to a versioned attribute - ## Setup: Encountered missing dependencies: - ## base >=4 && <4.11 - unordered-containers = super.unordered-containers_0_2_9_0; - + hspec-discover = super.hspec-discover_2_5_0; ## On Hackage: - ## On Hackage, awaiting for import - tasty = overrideCabal super.tasty (drv: { - ## • No instance for (Semigroup OptionSet) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid OptionSet’ - version = "1.0.0.1"; - sha256 = "0ggqffw9kbb6nlq1pplk131qzxndqqzqyf4s2p7576nljx11a7qf"; - }); - - - - ## Upstreamed - - ## Upstreamed, awaiting a Hackage release - cabal2nix = (overrideCabal super.cabal2nix (drv: { - ## Ambiguous occurrence ‘<>’ - ## It could refer to either ‘Prelude.<>’, - ## imported from ‘Prelude’ at src/Distribution/Nixpkgs/Haskell/Derivation.hs:6:8-46 - src = pkgs.fetchFromGitHub { - owner = "nixos"; - repo = "cabal2nix"; - rev = "32974fcc3d9b485bd35167d9ae90941a5b3d06df"; - sha256 = "1racp49z5922rvrc62clslzdkxh4axj2i0k83w5y6w5chl83abyd"; - }; - })).override { - ## • No instance for (Semigroup (List a)) - ## arising from the 'deriving' clause of a data type declaration - ## Possible fix: - hpack = self.hpack; - }; - ## Upstreamed, awaiting a Hackage release cabal-install = overrideCabal super.cabal-install (drv: { ## Setup: Encountered missing dependencies: @@ -403,23 +298,6 @@ self: super: { ## Unmerged - ## Unmerged. PR: https://github.com/lpsmith/blaze-builder/pull/10 - ## Issue: https://github.com/lpsmith/blaze-builder/issues/12 - blaze-builder = overrideCabal super.blaze-builder (drv: { - ## • No instance for (Semigroup Poke) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid Poke’ - src = pkgs.fetchFromGitHub { - owner = "bgamari"; - repo = "blaze-builder"; - rev = "b7195f160795a081adbb9013810d843f1ba5e062"; - sha256 = "1g351fdpsvn2lbqiy9bg2s0wwrdccb8q1zh7gvpsx5nnj24b1c00"; - }; - ## Setup: Encountered missing dependencies: - ## base >=4 && <4.11 - jailbreak = true; - }); - ## Unmerged. PR: https://github.com/wrengr/bytestring-trie/pull/3 bytestring-trie = overrideCabal super.bytestring-trie (drv: { ## • Could not deduce (Semigroup (Trie a)) @@ -601,32 +479,12 @@ self: super: { jailbreak = true; }); - ## Issue: https://github.com/jgm/doctemplates/issues/2 - doctemplates = overrideCabal super.doctemplates (drv: { - patches = (drv.patches or []) ++ [ - (pkgs.fetchpatch - { url = https://github.com/jgm/doctemplates/commit/3f8bb8feb19ed86b881bc09d963026db9d98df21.patch; - sha256 = "0xmjljh8c90qlzp6wn39iy23pj2j0d4m4r1hxs22zps6qdwk5s6d"; - }) - ]; - }); - exception-transformers = overrideCabal super.exception-transformers (drv: { ## Setup: Encountered missing dependencies: ## HUnit >=1.2 && <1.6 jailbreak = true; }); - GenericPretty = overrideCabal super.GenericPretty (drv: { - ## https://github.com/RazvanRanca/GenericPretty/issues/2 - patches = (drv.patches or []) ++ [ - (pkgs.fetchpatch - { url = https://github.com/RazvanRanca/GenericPretty/pull/3.patch; - sha256 = "1dpdqsjmy9j9b6md5r9jyhbxnxjd51nmfb5in01j10iqzhj9j51k"; - }) - ]; - }); - github = overrideCabal super.github (drv: { ## Setup: Encountered missing dependencies: ## base >=4.7 && <4.11 @@ -795,7 +653,42 @@ self: super: { stripLen = 1; }); - # Old versions don't compile. - vty = self.vty_5_20; + # Fix missing semigroup instance. + data-inttrie = appendPatch super.data-inttrie (pkgs.fetchpatch + { url = https://github.com/luqui/data-inttrie/pull/5.patch; + sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a"; + }); + + # https://github.com/jgm/pandoc-types/issues/37 + pandoc-types = self.pandoc-types_1_17_4_2; + + ## Need latest git version to support current haddock-library versions. + pandoc = overrideSrc super.pandoc { + version = "2.1.2-git"; + src = pkgs.fetchFromGitHub { + owner = "jgm"; + repo = "pandoc"; + rev = "fad8d0d67ff4736e1af554d2bfcf1688aa28c8ec"; + sha256 = "1sgfnyi2ma8vf91dw9ax9xbbjfcja1q5q9vcwa1rhh05jv8j036a"; + }; + }; + + # Fix missing semigroup instance. + json = appendPatch super.json (pkgs.fetchpatch + { url = https://github.com/GaloisInc/json/commit/9292150bbe02c2d126ad6a876242578b1a9d1bf2.patch; + sha256 = "1xw2gab0wzhszgcbjhg98kkzgnbfn9n3bx1qlk6g7ir6hhwppm9z"; + }); + + # Older versions don't compile. + brick = self.brick_0_35; + timezone-olson = self.timezone-olson_0_1_9; + matrix = self.matrix_0_3_6_1; + getopt-generics = self.getopt-generics_0_13_0_2; + + # https://github.com/xmonad/xmonad/issues/155 + xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch + { url = https://github.com/xmonad/xmonad/pull/153/commits/c96a59fa0de2f674e60befd0f57e67b93ea7dcf6.patch; + sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp"; + })) self.semigroups; } |