diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ccf0bdaeda855..409a81c37353d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -60,6 +60,13 @@ self: super: { ghc-datasize = disableLibraryProfiling super.ghc-datasize; ghc-vis = disableLibraryProfiling super.ghc-vis; + # Patch providing GHC9 compat, can be removed once the following gets released: + # > https://github.com/adinapoli/snaplet-purescript/pull/25 + snaplet-purescript = appendPatch (fetchpatch { + url = "https://github.com/adinapoli/snaplet-purescript/commit/4c7457d9357558524d4d19ff7c7f13f85b442539.patch"; + sha256 = "sha256-wpNvCO6txEvSv8LjQaaEIbBBPJnFaMpFx5ER8BT9lXo="; + }) super.snaplet-purescript; + # The latest release on hackage has an upper bound on containers which # breaks the build, though it works with the version of containers present # and the upper bound doesn't exist in code anymore: @@ -99,7 +106,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 = "0dw89528kzbisbilyx6ggrh25vslivyylr8xk4dc4cikhd6dkm7p"; + sha256 = "09ksaaf5kxpskq2hmi1ad35k15cnhn86j795iw6nk86gbvx5hrap"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -247,7 +254,7 @@ self: super: { # 2020-06-05: HACK: does not pass own build suite - `dontCheck` # 2022-06-17: Use hnix-store 0.5 until hnix 0.17 - hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck ( + hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] (dontCheck ( super.hnix.overrideScope (hself: hsuper: { hnix-store-core = hself.hnix-store-core_0_5_0_0; hnix-store-remote = hself.hnix-store-remote_0_5_0_0; @@ -719,7 +726,7 @@ self: super: { # updated dependencies (haskeline and megaparsec) which can be # removed when the next idris release (1.3.4 probably) comes # around. - idris = generateOptparseApplicativeCompletion "idris" + idris = self.generateOptparseApplicativeCompletions [ "idris" ] (doJailbreak (dontCheck super.idris)); # https://github.com/pontarius/pontarius-xmpp/issues/105 @@ -998,14 +1005,14 @@ self: super: { servant-auth-server = doJailbreak super.servant-auth-server; # Generate cli completions for dhall. - dhall = generateOptparseApplicativeCompletion "dhall" super.dhall; + dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall; # For reasons that are not quire clear 'dhall-json' won't compile without 'tasty 1.4' due to its tests # https://github.com/commercialhaskell/stackage/issues/5795 # This issue can be mitigated with 'dontCheck' which skips the tests and their compilation. - dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json); - dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix; - dhall-yaml = generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml; - dhall-nixpkgs = generateOptparseApplicativeCompletion "dhall-to-nixpkgs" super.dhall-nixpkgs; + dhall-json = self.generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json); + dhall-nix = self.generateOptparseApplicativeCompletions [ "dhall-to-nix" ] super.dhall-nix; + dhall-yaml = self.generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml; + dhall-nixpkgs = self.generateOptparseApplicativeCompletions [ "dhall-to-nixpkgs" ] super.dhall-nixpkgs; # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 netrc = doJailbreak super.netrc; @@ -1014,7 +1021,7 @@ self: super: { hgettext = doJailbreak super.hgettext; stack = - generateOptparseApplicativeCompletion "stack" + self.generateOptparseApplicativeCompletions [ "stack" ] # stack has a bunch of constraints in its .cabal file that don't seem to be necessary (doJailbreak (super.stack.overrideScope (self: super: { @@ -1067,7 +1074,7 @@ self: super: { hoopl = dontCheck super.hoopl; # Generate shell completion for spago - spago = generateOptparseApplicativeCompletion "spago" super.spago; + spago = self.generateOptparseApplicativeCompletions [ "spago" ] super.spago; # 2020-06-05: HACK: Package can not pass test suite, # Upstream Report: https://github.com/kcsongor/generic-lens/issues/83 @@ -1380,6 +1387,13 @@ self: super: { }) ] super.svgcairo; + # Espial is waiting for a hackage release to be compatible with GHC 9.X. + espial = appendPatch (fetchpatch { + url = "https://github.com/jonschoning/espial/commit/70177f9efb9666c3616e8a474681d3eb763d0e84.patch"; + sha256 = "sha256-aJtwZGp9DUpACBV0WYRL7k32m6qWf5vq6eKBFq/G23s="; + excludes = ["package.yaml" "stack.yaml" "stack.yaml.lock"]; + }) super.espial; + # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) # https://github.com/lehins/massiv/pull/104 massiv = dontCheck super.massiv; @@ -1505,7 +1519,7 @@ self: super: { # PATH. # - Patch can be removed on next package set bump update-nix-fetchgit = let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ]; - in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal + in self.generateOptparseApplicativeCompletions [ "update-nix-fetchgit" ] (overrideCabal (drv: { buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ]; postInstall = drv.postInstall or "" + '' @@ -1633,7 +1647,9 @@ self: super: { http-media = doJailbreak super.http-media; # 2022-03-19: strict upper bounds https://github.com/poscat0x04/hinit/issues/2 - hinit = doJailbreak (generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_2; })); + hinit = doJailbreak + (self.generateOptparseApplicativeCompletions [ "hi" ] + (super.hinit.override { haskeline = self.haskeline_0_8_2; })); # 2022-03-19: Keeping jailbreak because of tons of strict bounds: https://github.com/snapframework/snap/issues/220 snap = doJailbreak super.snap; @@ -1676,7 +1692,7 @@ self: super: { # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; - hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent; + hercules-ci-agent = self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ] super.hercules-ci-agent; # Test suite doesn't compile with aeson 2.0 # https://github.com/hercules-ci/hercules-ci-agent/pull/387 @@ -1687,7 +1703,7 @@ self: super: { (overrideCabal (drv: { hydraPlatforms = super.hercules-ci-cli.meta.platforms; })) # See hercules-ci-optparse-applicative in non-hackage-packages.nix. (addBuildDepend super.hercules-ci-optparse-applicative) - (generateOptparseApplicativeCompletion "hci") + (self.generateOptparseApplicativeCompletions [ "hci" ]) ]; pipes-aeson = appendPatches [ @@ -2599,7 +2615,7 @@ in { # likely be removed when purescript-0.14.6 is released. doJailbreak # Generate shell completions - (generateOptparseApplicativeCompletion "purs") + (self.generateOptparseApplicativeCompletions [ "purs" ]) ]; purescript-cst = purescriptStOverride super.purescript-cst; |