diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-nix.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index cc5262f81f533..d045da36579ad 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -114,7 +114,6 @@ self: super: builtins.intersectAttrs super { })) super) hls-brittany-plugin - hls-stan-plugin hls-floskell-plugin hls-fourmolu-plugin hls-overloaded-record-dot-plugin @@ -123,6 +122,9 @@ self: super: builtins.intersectAttrs super { # PLUGINS WITH DISABLED TESTS # 2023-04-01: TODO: We should reenable all these tests to figure if they are still broken. inherit (pkgs.lib.mapAttrs (_: dontCheck) super) + # Tests require ghcide-test-utils which is broken + hls-semantic-tokens-plugin + # Tests have file permissions expections that don’t work with the nix store. hls-gadt-plugin @@ -173,6 +175,9 @@ self: super: builtins.intersectAttrs super { # 2023-04-03: https://github.com/haskell/haskell-language-server/issues/3549 hls-retrie-plugin + + # 2024-01-25: Golden files are missing + hls-stan-plugin ; ########################################### @@ -428,7 +433,6 @@ self: super: builtins.intersectAttrs super { hasql-interpolate = dontCheck super.hasql-interpolate; hasql-notifications = dontCheck super.hasql-notifications; hasql-pool = dontCheck super.hasql-pool; - hasql-pool_0_10_0_1 = doDistribute (dontCheck super.hasql-pool_0_10_0_1); hasql-transaction = dontCheck super.hasql-transaction; # Test suite requires a running postgresql server, @@ -652,6 +656,8 @@ self: super: builtins.intersectAttrs super { # tests require working stack installation with all-cabal-hashes cloned in $HOME stackage-curator = dontCheck super.stackage-curator; + stack = self.generateOptparseApplicativeCompletions [ "stack" ] super.stack; + # hardcodes /usr/bin/tr: https://github.com/snapframework/io-streams/pull/59 io-streams = enableCabalFlag "NoInteractiveTests" super.io-streams; @@ -791,6 +797,7 @@ self: super: builtins.intersectAttrs super { substituteInPlace Test.hs \ --replace ', testCase "crypto" test_crypto' "" '' + (drv.postPatch or ""); + # Ensure git-annex uses the exact same coreutils it saw at build-time. # This is especially important on Darwin but also in Linux environments # where non-GNU coreutils are used by default. @@ -801,6 +808,19 @@ self: super: builtins.intersectAttrs super { buildTools = [ pkgs.buildPackages.makeWrapper ] ++ (drv.buildTools or []); + + # Git annex provides a restricted login shell. Setting + # passthru.shellPath here allows a user's login shell to be set to + # `git-annex-shell` by making `shell = haskellPackages.git-annex`. + # https://git-annex.branchable.com/git-annex-shell/ + passthru.shellPath = "/bin/git-annex-shell"; + + # Install man pages which is no longer done by Setup.hs + # TODO(@sternenseemann): figure out why install-desktops wants to create /usr + # and run that, too. + postInstall = drv.postInstall or "" + '' + make install-mans "DESTDIR=$out" PREFIX= + ''; }) (super.git-annex.override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; @@ -1192,11 +1212,9 @@ self: super: builtins.intersectAttrs super { { fourmolu = fourmoluTestFix super.fourmolu; - fourmolu_0_14_0_0 = fourmoluTestFix super.fourmolu_0_14_0_0; fourmolu_0_14_1_0 = fourmoluTestFix super.fourmolu_0_14_1_0; }) fourmolu - fourmolu_0_14_0_0 fourmolu_0_14_1_0 ; |