diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 62 |
1 files changed, 42 insertions, 20 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c9ac52c46ea9..9c68b8c35608 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -74,7 +74,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0gfb7r3pj2cdzbm2lbymlx27kgy2adnvlzpv4s3lmdfpyzgflf1y"; + sha256 = "1ahjddwl8wfkhc5sj2j2snh3cq0vg4apgv2maq3wdncin8bj7my6"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -288,6 +288,7 @@ self: super: { ghc-parmake = dontCheck super.ghc-parmake; ghcid = dontCheck super.ghcid; git-vogue = dontCheck super.git-vogue; + github-rest = dontCheck super.github-rest; # test suite needs the network gitlib-cmdline = dontCheck super.gitlib-cmdline; GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 hackport = dontCheck super.hackport; @@ -321,8 +322,8 @@ self: super: { influxdb = dontCheck super.influxdb; itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; - language-slice = dontCheck super.language-slice; language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275 + language-slice = dontCheck super.language-slice; ldap-client = dontCheck super.ldap-client; lensref = dontCheck super.lensref; lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25 @@ -368,6 +369,8 @@ self: super: { separated = dontCheck super.separated; shadowsocks = dontCheck super.shadowsocks; shake-language-c = dontCheck super.shake-language-c; + snap-core = dontCheck super.snap-core; + sourcemap = dontCheck super.sourcemap; static-resources = dontCheck super.static-resources; strive = dontCheck super.strive; # fails its own hlint test with tons of warnings svndump = dontCheck super.svndump; @@ -384,8 +387,6 @@ self: super: { webdriver = dontCheck super.webdriver; webdriver-angular = dontCheck super.webdriver-angular; xsd = dontCheck super.xsd; - snap-core = dontCheck super.snap-core; - sourcemap = dontCheck super.sourcemap; zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57 # These test suites run for ages, even on a fast machine. This is nuts. @@ -1114,8 +1115,23 @@ self: super: { # https://github.com/snapframework/xmlhtml/pull/37 xmlhtml = doJailbreak super.xmlhtml; - # Generate shell completions - purescript = generateOptparseApplicativeCompletion "purs" super.purescript; + purescript = + let + purescriptWithOverrides = super.purescript.override { + # PureScript requires an older version of happy. + happy = self.happy_1_19_9; + }; + + # PureScript is built against LTS-13, so we need to jailbreak it to + # accept more recent versions of the libraries it requires. + jailBrokenPurescript = doJailbreak purescriptWithOverrides; + + # Haddocks for PureScript can't be built. + # https://github.com/purescript/purescript/pull/3745 + dontHaddockPurescript = dontHaddock jailBrokenPurescript; + in + # Generate shell completions + generateOptparseApplicativeCompletion "purs" dontHaddockPurescript; # https://github.com/kcsongor/generic-lens/pull/65 generic-lens = dontCheck super.generic-lens; @@ -1233,8 +1249,9 @@ self: super: { ''; }); - # The LTS-14.x version of optparse-applicative is too old. + # The LTS-14.x version of their dependencies are too old. cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; }; + hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_22_0; }; # Version bounds for http-client are too strict: # https://github.com/bitnomial/prometheus/issues/34 @@ -1274,22 +1291,27 @@ self: super: { # polysemy-plugin requires polysemy >= 1.2.0.0 polysemy = self.polysemy_1_2_3_0; - - # The polysemy-plugin tests failed because it couldn't find - # the polysemy-plugin package in the doctests: - # https://github.com/NixOS/nixpkgs/issues/71164 - # I've addressed this with a PR upstream: - # https://github.com/polysemy-research/polysemy/pull/265 - # the patch of which is applied here. - polysemy-plugin = appendPatch (addSetupDepend super.polysemy-plugin self.cabal-doctest) (pkgs.fetchpatch { - url = "https://github.com/polysemy-research/polysemy/pull/265.patch"; - sha256 = "19237js70chq84w7vqgvj49n6bs9lp95k13ia3xzbr1r9yyrfkhq"; - stripLen = 1; - }); - polysemy-zoo = self.polysemy-zoo_0_6_0_1; # https://github.com/Happstack/web-routes-th/pull/3 web-routes-th = doJailbreak super.web-routes-th; + # Remove for hail > 0.2.0.0 + hail = overrideCabal super.hail (drv: { + patches = [ + (pkgs.fetchpatch { + # Relax dependency constraints, + # upstream PR: https://github.com/james-preston/hail/pull/13 + url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/13.patch"; + sha256 = "039p5mqgicbhld2z44cbvsmam3pz0py3ybaifwrjsn1y69ldsmkx"; + }) + (pkgs.fetchpatch { + # Relax dependency constraints, + # upstream PR: https://github.com/james-preston/hail/pull/15 + url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/15.patch"; + sha256 = "03kdvr8hxi6isb8yxp5rgcmz855n19m1yacn3d56a4i58j2mldjw"; + }) + ]; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super |