diff --git a/configuration-ghc-90.nix b/configuration-ghc-90.nix index f82e03ce03..e1e5770d6e 100644 --- a/configuration-ghc-90.nix +++ b/configuration-ghc-90.nix @@ -18,13 +18,13 @@ let # https://github.com/nikita-volkov/ptr-poker/issues/11 ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { }; - ghc-lib = hself.ghc-lib_9_2_2_20220307; + ghc-lib = hself.ghc-lib_9_2_4_20220729; ghc-lib-parser = hself.ghc-lib-parser_9_2_4_20220729; - ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_0_4; + ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_1_1; Cabal = hself.Cabal_3_6_3_0; ormolu = hself.ormolu_0_5_0_1; - fourmolu = hself.fourmolu_0_6_0_0; + # Hlint is still broken hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint-34 { }); diff --git a/configuration-ghc-92.nix b/configuration-ghc-92.nix index 3790e182a7..b608af825d 100644 --- a/configuration-ghc-92.nix +++ b/configuration-ghc-92.nix @@ -24,8 +24,6 @@ let # https://github.com/nikita-volkov/ptr-poker/issues/11 ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { }; - ghc-exactprint = - hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-150 { }; # Hlint is still broken hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint { }); diff --git a/configuration-ghc-94.nix b/configuration-ghc-94.nix index 3568f65a51..7c6ca11a82 100644 --- a/configuration-ghc-94.nix +++ b/configuration-ghc-94.nix @@ -31,19 +31,6 @@ let stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib"; - cereal = hsuper.callHackage "cereal" "0.5.8.3" {}; - base-compat = hsuper.callHackage "base-compat" "0.12.2" {}; - base-compat-batteries = hsuper.callHackage "base-compat-batteries" "0.12.2" {}; - hashable = hsuper.callHackage "hashable" "1.4.1.0" {}; - primitive = hsuper.callHackage "primitive" "0.7.4.0" {}; - ghc-check = hsuper.callHackage "ghc-check" "0.5.0.8" {}; - lens = hsuper.callHackage "lens" "5.2" {}; - integer-logarithms = hsuper.callHackage "integer-logarithms" "1.0.3.1" {}; - hiedb = hsuper.callHackage "hiedb" "0.4.2.0" {}; - hie-bios = hsuper.callHackage "hie-bios" "0.11.0" {}; - lsp = hsuper.callCabal2nix "lsp" inputs.lsp {}; - lsp-types = hsuper.callCabal2nix "lsp-types" inputs.lsp-types {}; - # Re-generate HLS drv excluding some plugins haskell-language-server = hself.callCabal2nixWithOptions "haskell-language-server" ./. diff --git a/flake.lock b/flake.lock index 0f74f76d26..2ac39dc862 100644 --- a/flake.lock +++ b/flake.lock @@ -1,25 +1,13 @@ { "nodes": { - "aeson-1520": { - "flake": false, - "locked": { - "narHash": "sha256-btKp7CTOgC0wT33lROffARW9qr1jx9oKE5EWydaR52c=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/aeson-1.5.2.0/aeson-1.5.2.0.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/aeson-1.5.2.0/aeson-1.5.2.0.tar.gz" - } - }, "all-cabal-hashes-unpacked": { "flake": false, "locked": { - "lastModified": 1663164766, - "narHash": "sha256-7ypfdEzJwfaQMQx9HV8B+r9BV7bN6iIO0lWhDy+8+0k=", + "lastModified": 1668997806, + "narHash": "sha256-HRTQuIO/MxV5OcbCNsHSCeULa7KAjxIBQk5sAVFzrKk=", "owner": "commercialhaskell", "repo": "all-cabal-hashes", - "rev": "ed701f5e64ece3e57efa4227243f9fb64f935253", + "rev": "934c06ca91eb6ceca8a7c484dfc2862e955489f8", "type": "github" }, "original": { @@ -29,50 +17,14 @@ "type": "github" } }, - "brittany-01312": { - "flake": false, - "locked": { - "narHash": "sha256-4rDE2bu4C8cv1D6lkTtLxMwLRyDfIK70BnptSrygK60=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/brittany-0.13.1.2/brittany-0.13.1.2.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/brittany-0.13.1.2/brittany-0.13.1.2.tar.gz" - } - }, - "constraints-extras": { - "flake": false, - "locked": { - "narHash": "sha256-WGDSpT37RrHwpQtExGkL5eEmBk/s9b0rxtT9DYqSGg4=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/constraints-extras-0.3.2.1/constraints-extras-0.3.2.1.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/constraints-extras-0.3.2.1/constraints-extras-0.3.2.1.tar.gz" - } - }, - "entropy": { - "flake": false, - "locked": { - "narHash": "sha256-Oj0vftbS7Pau7OzdMrzRPghqwEiimwQbt0w59cMcH98=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/entropy-0.4.1.10/entropy-0.4.1.10.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/entropy-0.4.1.10/entropy-0.4.1.10.tar.gz" - } - }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { @@ -83,11 +35,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -99,37 +51,13 @@ "fourmolu": { "flake": false, "locked": { - "narHash": "sha256-uo5UE2SzrimnZl+JjJ30Hlg/nIw1OXJTPFIgkQopaI0=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/fourmolu-0.5.0.1/fourmolu-0.5.0.1.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/fourmolu-0.5.0.1/fourmolu-0.5.0.1.tar.gz" - } - }, - "fourmolu-0300": { - "flake": false, - "locked": { - "narHash": "sha256-SFBwhkXfDArITiBSxGSp2qf8gl+yBpWHglBB5aKeaBU=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/fourmolu-0.3.0.0/fourmolu-0.3.0.0.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/fourmolu-0.3.0.0/fourmolu-0.3.0.0.tar.gz" - } - }, - "ghc-check": { - "flake": false, - "locked": { - "narHash": "sha256-pmmQMrk6X00+zbsstV49w/Es9+V9gssrXzJoub2ReEs=", + "narHash": "sha256-vbqgYaAd/JUPFGv6O2+OosBXFceKah9OYrjTuEkEZ3E=", "type": "tarball", - "url": "https://hackage.haskell.org/package/ghc-check-0.5.0.8/ghc-check-0.5.0.8.tar.gz" + "url": "https://hackage.haskell.org/package/fourmolu-0.9.0.0/fourmolu-0.9.0.0.tar.gz" }, "original": { "type": "tarball", - "url": "https://hackage.haskell.org/package/ghc-check-0.5.0.8/ghc-check-0.5.0.8.tar.gz" + "url": "https://hackage.haskell.org/package/fourmolu-0.9.0.0/fourmolu-0.9.0.0.tar.gz" } }, "ghc-exactprint": { @@ -159,13 +87,13 @@ "ghc-exactprint-160": { "flake": false, "locked": { - "narHash": "sha256-6fW4KSmDo7hi5i2C1lbI/rEyFWrowSGTNyaC+f73JaE=", + "narHash": "sha256-TiFybKVP3JIuUfnyESrKXInW9o0C8FLnsMjO4PEJ3I0=", "type": "tarball", - "url": "https://hackage.haskell.org/package/ghc-exactprint-1.6.0/ghc-exactprint-1.6.0.tar.gz" + "url": "https://hackage.haskell.org/package/ghc-exactprint-1.6.1/ghc-exactprint-1.6.1.tar.gz" }, "original": { "type": "tarball", - "url": "https://hackage.haskell.org/package/ghc-exactprint-1.6.0/ghc-exactprint-1.6.0.tar.gz" + "url": "https://hackage.haskell.org/package/ghc-exactprint-1.6.1/ghc-exactprint-1.6.1.tar.gz" } }, "gitignore": { @@ -184,18 +112,6 @@ "type": "github" } }, - "hie-bios": { - "flake": false, - "locked": { - "narHash": "sha256-KLAg++tO9lCOn7R/cSN2wLbrhpeBOOmeTEh7auIbUNk=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/hie-bios-0.11.0/hie-bios-0.11.0.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/hie-bios-0.11.0/hie-bios-0.11.0.tar.gz" - } - }, "hiedb": { "flake": false, "locked": { @@ -232,73 +148,13 @@ "url": "https://hackage.haskell.org/package/hlint-3.4/hlint-3.4.tar.gz" } }, - "hw-prim": { - "flake": false, - "locked": { - "narHash": "sha256-++rg/bx4TjWUDyHSWKm/8ITwQLonPRLXHPLlnhJy8ik=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/hw-prim-0.6.3.2/hw-prim-0.6.3.2.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/hw-prim-0.6.3.2/hw-prim-0.6.3.2.tar.gz" - } - }, - "implicit-hie-cradle": { - "flake": false, - "locked": { - "narHash": "sha256-2NmucBBI7Qi1UGXWG27XFZRCeqeRiwVFWmJKZnp6R5U=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/implicit-hie-cradle-0.3.0.5/implicit-hie-cradle-0.3.0.5.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/implicit-hie-cradle-0.3.0.5/implicit-hie-cradle-0.3.0.5.tar.gz" - } - }, - "lsp": { - "flake": false, - "locked": { - "narHash": "sha256-g5R34SVz0kRD5zpODNsaaaIJOHty10cTS6ZDPi4s8pc=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-1.6.0.0/lsp-1.6.0.0.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-1.6.0.0/lsp-1.6.0.0.tar.gz" - } - }, - "lsp-test": { - "flake": false, - "locked": { - "narHash": "sha256-HhFAdNvmnnnCzsKfTWbqUyTFrCfq1n6pGKfk2R0fcUc=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-test-0.14.1.0/lsp-test-0.14.1.0.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-test-0.14.1.0/lsp-test-0.14.1.0.tar.gz" - } - }, - "lsp-types": { - "flake": false, - "locked": { - "narHash": "sha256-QSixsrCvsWlckG/LLF1z8LsHhqaXxVAxOPIA1NxjVT4=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-types-1.6.0.0/lsp-types-1.6.0.0.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/lsp-types-1.6.0.0/lsp-types-1.6.0.0.tar.gz" - } - }, "nixpkgs": { "locked": { - "lastModified": 1663112159, - "narHash": "sha256-31rjPhB6Hj1QoqLvFSULFf9Z/6z05vR0KrLGYvr9w0M=", + "lastModified": 1668650906, + "narHash": "sha256-JuiYfDO23O8oxUUOmhQflmOoJovyC5G4RjcYQMQjrRE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78bce1608960b994405f3696ba086ba1d63654e9", + "rev": "3a86856a13c88c8c64ea32082a851fefc79aa700", "type": "github" }, "original": { @@ -320,59 +176,21 @@ "url": "https://hackage.haskell.org/package/ptr-poker-0.1.2.8/ptr-poker-0.1.2.8.tar.gz" } }, - "retrie": { - "flake": false, - "locked": { - "narHash": "sha256-SrUyFea9Qr2SYeNVDJfWZfCguJV2rHK2mO/FO4xLFaY=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/retrie-1.2.0.1/retrie-1.2.0.1.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/retrie-1.2.0.1/retrie-1.2.0.1.tar.gz" - } - }, "root": { "inputs": { - "aeson-1520": "aeson-1520", "all-cabal-hashes-unpacked": "all-cabal-hashes-unpacked", - "brittany-01312": "brittany-01312", - "constraints-extras": "constraints-extras", - "entropy": "entropy", "flake-compat": "flake-compat", "flake-utils": "flake-utils", "fourmolu": "fourmolu", - "fourmolu-0300": "fourmolu-0300", - "ghc-check": "ghc-check", "ghc-exactprint": "ghc-exactprint", "ghc-exactprint-150": "ghc-exactprint-150", "ghc-exactprint-160": "ghc-exactprint-160", "gitignore": "gitignore", - "hie-bios": "hie-bios", "hiedb": "hiedb", "hlint": "hlint", "hlint-34": "hlint-34", - "hw-prim": "hw-prim", - "implicit-hie-cradle": "implicit-hie-cradle", - "lsp": "lsp", - "lsp-test": "lsp-test", - "lsp-types": "lsp-types", "nixpkgs": "nixpkgs", - "ptr-poker": "ptr-poker", - "retrie": "retrie", - "stylish-haskell": "stylish-haskell" - } - }, - "stylish-haskell": { - "flake": false, - "locked": { - "narHash": "sha256-oZSR5UQ+ieMFRq7MvL0sJqOblMk74awvcepuT+JHYtA=", - "type": "tarball", - "url": "https://hackage.haskell.org/package/stylish-haskell-0.14.2.0/stylish-haskell-0.14.2.0.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://hackage.haskell.org/package/stylish-haskell-0.14.2.0/stylish-haskell-0.14.2.0.tar.gz" + "ptr-poker": "ptr-poker" } } }, diff --git a/flake.nix b/flake.nix index b7f1cb6b06..c78cd3a843 100644 --- a/flake.nix +++ b/flake.nix @@ -27,20 +27,8 @@ }; # List of hackage dependencies - lsp = { - url = "https://hackage.haskell.org/package/lsp-1.6.0.0/lsp-1.6.0.0.tar.gz"; - flake = false; - }; - lsp-types = { - url = "https://hackage.haskell.org/package/lsp-types-1.6.0.0/lsp-types-1.6.0.0.tar.gz"; - flake = false; - }; - lsp-test = { - url = "https://hackage.haskell.org/package/lsp-test-0.14.1.0/lsp-test-0.14.1.0.tar.gz"; - flake = false; - }; ghc-exactprint-160 = { - url = "https://hackage.haskell.org/package/ghc-exactprint-1.6.0/ghc-exactprint-1.6.0.tar.gz"; + url = "https://hackage.haskell.org/package/ghc-exactprint-1.6.1/ghc-exactprint-1.6.1.tar.gz"; flake = false; }; ghc-exactprint-150 = { @@ -51,32 +39,8 @@ url = "https://hackage.haskell.org/package/ghc-exactprint-1.4.1/ghc-exactprint-1.4.1.tar.gz"; flake = false; }; - ghc-check = { - url = "https://hackage.haskell.org/package/ghc-check-0.5.0.8/ghc-check-0.5.0.8.tar.gz"; - flake = false; - }; - constraints-extras = { - url = "https://hackage.haskell.org/package/constraints-extras-0.3.2.1/constraints-extras-0.3.2.1.tar.gz"; - flake = false; - }; - retrie = { - url = "https://hackage.haskell.org/package/retrie-1.2.0.1/retrie-1.2.0.1.tar.gz"; - flake = false; - }; fourmolu = { - url = "https://hackage.haskell.org/package/fourmolu-0.5.0.1/fourmolu-0.5.0.1.tar.gz"; - flake = false; - }; - fourmolu-0300 = { - url = "https://hackage.haskell.org/package/fourmolu-0.3.0.0/fourmolu-0.3.0.0.tar.gz"; - flake = false; - }; - aeson-1520= { - url = "https://hackage.haskell.org/package/aeson-1.5.2.0/aeson-1.5.2.0.tar.gz"; - flake = false; - }; - brittany-01312 = { - url = "https://hackage.haskell.org/package/brittany-0.13.1.2/brittany-0.13.1.2.tar.gz"; + url = "https://hackage.haskell.org/package/fourmolu-0.9.0.0/fourmolu-0.9.0.0.tar.gz"; flake = false; }; hlint = { @@ -91,30 +55,10 @@ url = "https://hackage.haskell.org/package/ptr-poker-0.1.2.8/ptr-poker-0.1.2.8.tar.gz"; flake = false; }; - stylish-haskell = { - url = "https://hackage.haskell.org/package/stylish-haskell-0.14.2.0/stylish-haskell-0.14.2.0.tar.gz"; - flake = false; - }; - implicit-hie-cradle = { - url = "https://hackage.haskell.org/package/implicit-hie-cradle-0.3.0.5/implicit-hie-cradle-0.3.0.5.tar.gz"; - flake = false; - }; - hie-bios = { - url = "https://hackage.haskell.org/package/hie-bios-0.11.0/hie-bios-0.11.0.tar.gz"; - flake = false; - }; - entropy = { - url = "https://hackage.haskell.org/package/entropy-0.4.1.10/entropy-0.4.1.10.tar.gz"; - flake = false; - }; hiedb = { url = "https://hackage.haskell.org/package/hiedb-0.4.2.0/hiedb-0.4.2.0.tar.gz"; flake = false; }; - hw-prim = { - url = "https://hackage.haskell.org/package/hw-prim-0.6.3.2/hw-prim-0.6.3.2.tar.gz"; - flake = false; - }; }; outputs = inputs@{ self, nixpkgs, flake-compat, flake-utils, gitignore, all-cabal-hashes-unpacked, ... }: @@ -177,24 +121,15 @@ with haskell.lib; { # Patches don't apply github = overrideCabal hsuper.github (drv: { patches = []; }); - # GHCIDE requires hie-bios ^>=0.9.1 - hie-bios = hself.callCabal2nix "hie-bios" inputs.hie-bios {}; - - lsp = hsuper.callCabal2nix "lsp" inputs.lsp {}; - lsp-types = hsuper.callCabal2nix "lsp-types" inputs.lsp-types {}; - lsp-test = hsuper.callCabal2nix "lsp-test" inputs.lsp-test {}; - - entropy = hsuper.callCabal2nix "entropy" inputs.entropy {}; hiedb = hsuper.callCabal2nix "hiedb" inputs.hiedb {}; - hw-prim = hsuper.callCabal2nix "hw-prim" inputs.hw-prim {}; - implicit-hie-cradle = hself.callCabal2nix "implicit-hie-cradle" inputs.implicit-hie-cradle {}; - ghc-check = hself.callCabal2nix "ghc-check" inputs.ghc-check {}; # https://github.com/NixOS/nixpkgs/issues/140774 ormolu = if final.system == "aarch64-darwin" then overrideCabal hsuper.ormolu (_: { enableSeparateBinOutput = false; }) else hsuper.ormolu; + + fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu {}; }; hlsSources = @@ -257,8 +192,8 @@ }; ghc902Config = (import ./configuration-ghc-90.nix) { inherit pkgs inputs; }; - ghc924Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; }; - ghc942Config = (import ./configuration-ghc-94.nix) { inherit pkgs inputs; }; + ghc925Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; }; + ghc943Config = (import ./configuration-ghc-94.nix) { inherit pkgs inputs; }; # GHC versions # While HLS still works fine with 8.10 GHCs, we only support the versions that are cached @@ -267,14 +202,14 @@ ghcVersion = "ghc" + (pkgs.lib.replaceStrings ["."] [""] pkgs.haskellPackages.ghc.version); cases = { ghc902 = ghc902Config.tweakHpkgs (pkgs.hlsHpkgs "ghc902"); - ghc924 = ghc924Config.tweakHpkgs (pkgs.hlsHpkgs "ghc924"); - ghc942 = ghc942Config.tweakHpkgs (pkgs.hlsHpkgs "ghc942"); + ghc925 = ghc925Config.tweakHpkgs (pkgs.hlsHpkgs "ghc925"); + ghc943 = ghc943Config.tweakHpkgs (pkgs.hlsHpkgs "ghc943"); }; in { default = cases."${ghcVersion}"; } // cases; ghc902 = supportedGHCs.ghc902; - ghc924 = supportedGHCs.ghc924; - ghc942 = supportedGHCs.ghc942; + ghc925 = supportedGHCs.ghc925; + ghc943 = supportedGHCs.ghc943; ghcDefault = supportedGHCs.default; pythonWithPackages = pkgs.python3.withPackages (ps: [ps.sphinx ps.myst-parser ps.sphinx_rtd_theme ps.pip]); @@ -391,16 +326,16 @@ simpleDevShells = { haskell-language-server-dev = mkDevShell ghcDefault "cabal.project"; haskell-language-server-902-dev = mkDevShell ghc902 "cabal.project"; - haskell-language-server-924-dev = mkDevShell ghc924 "cabal.project"; - haskell-language-server-942-dev = mkDevShell ghc942 "cabal.project"; + haskell-language-server-925-dev = mkDevShell ghc925 "cabal.project"; + haskell-language-server-943-dev = mkDevShell ghc943 "cabal.project"; }; # Developement shell, haskell packages are also provided by nix nixDevShells = { haskell-language-server-dev-nix = mkDevShellWithNixDeps ghcDefault "cabal.project"; haskell-language-server-902-dev-nix = mkDevShellWithNixDeps ghc902 "cabal.project"; - haskell-language-server-924-dev-nix = mkDevShellWithNixDeps ghc924 "cabal.project"; - haskell-language-server-942-dev-nix = mkDevShellWithNixDeps ghc942 "cabal.project"; + haskell-language-server-925-dev-nix = mkDevShellWithNixDeps ghc925 "cabal.project"; + haskell-language-server-943-dev-nix = mkDevShellWithNixDeps ghc943 "cabal.project"; }; # The default shell provided by Nixpkgs for a Haskell package (i.e. the @@ -408,15 +343,15 @@ envShells = { haskell-language-server-dev-env = mkEnvShell ghcDefault; haskell-language-server-902-dev-env = mkEnvShell ghc902; - haskell-language-server-924-dev-env = mkEnvShell ghc924; - haskell-language-server-942-dev-env = mkEnvShell ghc942; + haskell-language-server-925-dev-env = mkEnvShell ghc925; + haskell-language-server-943-dev-env = mkEnvShell ghc943; }; allPackages = { haskell-language-server = mkExe ghcDefault; haskell-language-server-902 = mkExe ghc902; - haskell-language-server-924 = mkExe ghc924; - haskell-language-server-942 = mkExe ghc942; + haskell-language-server-925 = mkExe ghc925; + haskell-language-server-943 = mkExe ghc943; }; devShells = simpleDevShells // nixDevShells // envShells // {