diff options
Diffstat (limited to 'pkgs/development/tools/haskell')
-rw-r--r-- | pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix | 12 | ||||
-rw-r--r-- | pkgs/development/tools/haskell/vaultenv/default.nix | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index e7ba49fa68dc0..48a473be169b3 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,6 +1,6 @@ { lib , stdenv -, supportedGhcVersions ? [ "90" ] +, supportedGhcVersions ? [ "92" ] , dynamic ? true , haskellPackages , haskell @@ -40,23 +40,21 @@ let "ln -s ${ tunedHls (getPackages version) }/bin/haskell-language-server $out/bin/${x}") (targets version); - pkg = tunedHls haskellPackages; -in stdenv.mkDerivation { +in assert supportedGhcVersions != []; stdenv.mkDerivation { pname = "haskell-language-server"; version = haskellPackages.haskell-language-server.version; buildCommand = '' mkdir -p $out/bin - ln -s ${pkg}/bin/haskell-language-server $out/bin/haskell-language-server - ln -s ${pkg}/bin/haskell-language-server-wrapper $out/bin/haskell-language-server-wrapper + ln -s ${tunedHls (getPackages (builtins.head supportedGhcVersions))}/bin/haskell-language-server-wrapper $out/bin/haskell-language-server-wrapper ${concatMapStringsSep "\n" makeSymlinks supportedGhcVersions} ''; meta = haskellPackages.haskell-language-server.meta // { maintainers = [ lib.maintainers.maralorn ]; longDescription = '' - This package provides haskell-language-server, haskell-language-server-wrapper, ${ + This package provides the executables ${ concatMapStringsSep ", " (x: concatStringsSep ", " (targets x)) supportedGhcVersions - }. + } and haskell-language-server-wrapper. You can choose for which ghc versions to install hls with pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }. ''; }; diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 4f51c8238ce05..b0810d33b50aa 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -96,4 +96,8 @@ mkDerivation rec { description = "Runs processes with secrets from HashiCorp Vault"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lnl7 manveru ]; + + # Does not compile on ghc92 + hydraPlatforms = lib.platforms.none; + broken = true; } |