diff --git a/flake.lock b/flake.lock index 6b28e6b4a04..9654caf8e9e 100644 --- a/flake.lock +++ b/flake.lock @@ -817,63 +817,63 @@ "type": "github" } }, - "ghc98X": { + "ghc910X": { "flake": false, "locked": { - "lastModified": 1696643148, - "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", - "ref": "ghc-9.8", - "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", - "revCount": 61642, + "lastModified": 1714520650, + "narHash": "sha256-4uz6RA1hRr0RheGNDM49a/B3jszqNNU8iHIow4mSyso=", + "ref": "ghc-9.10", + "rev": "2c6375b9a804ac7fca1e82eb6fcfc8594c67c5f5", + "revCount": 62663, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" }, "original": { - "ref": "ghc-9.8", + "ref": "ghc-9.10", "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" } }, - "ghc98X_2": { + "ghc911": { "flake": false, "locked": { - "lastModified": 1696643148, - "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", - "ref": "ghc-9.8", - "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", - "revCount": 61642, + "lastModified": 1714817013, + "narHash": "sha256-m2je4UvWfkgepMeUIiXHMwE6W+iVfUY38VDGkMzjCcc=", + "ref": "refs/heads/master", + "rev": "fc24c5cf6c62ca9e3c8d236656e139676df65034", + "revCount": 62816, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" }, "original": { - "ref": "ghc-9.8", "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" } }, - "ghc99": { + "ghc98X": { "flake": false, "locked": { - "lastModified": 1701580282, - "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", - "ref": "refs/heads/master", - "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", - "revCount": 62197, + "lastModified": 1696643148, + "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", + "ref": "ghc-9.8", + "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", + "revCount": 61642, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" }, "original": { + "ref": "ghc-9.8", "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" } }, - "ghc99_2": { + "ghc99": { "flake": false, "locked": { "lastModified": 1701580282, @@ -913,11 +913,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1710807758, - "narHash": "sha256-lQY4KSZQlMyKizC+Xbsl29hxNPHV52pRTDZac+vPaeU=", + "lastModified": 1716942849, + "narHash": "sha256-SKpk0CRrow36NbD7fi/Qk6DCbu3SuCpnCykY+mC5LSA=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "dc3cafd9dbaeebe37c96613a9d145e162cadcf79", + "rev": "121a502c0755275746f5fae4214ca3bca17b05e6", "type": "github" }, "original": { @@ -1006,8 +1006,8 @@ "cardano-shell": "cardano-shell_2", "flake-compat": "flake-compat_6", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", - "ghc98X": "ghc98X_2", - "ghc99": "ghc99_2", + "ghc910X": "ghc910X", + "ghc911": "ghc911", "hackage": [ "hackage" ], @@ -1018,6 +1018,8 @@ "hls-2.4": "hls-2.4_2", "hls-2.5": "hls-2.5_2", "hls-2.6": "hls-2.6_2", + "hls-2.7": "hls-2.7", + "hls-2.8": "hls-2.8", "hpc-coveralls": "hpc-coveralls_2", "hydra": "hydra_2", "iserv-proxy": "iserv-proxy_2", @@ -1036,11 +1038,11 @@ "stackage": "stackage_2" }, "locked": { - "lastModified": 1706143809, - "narHash": "sha256-lYjy5qAdLvm+0PWjRLHEe1Gl+PwoYRm5SpgXGLBaLKk=", + "lastModified": 1716943838, + "narHash": "sha256-r3Ho90C0ZePq9TRSF7VXLQuYfNnoXh/59aUa92AXyK0=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "5559d7bc4ad00bada614d1c4473d5cf38eb905f2", + "rev": "48b3a84d33b4bef9eea2b615ef5d710b0f72bc92", "type": "github" }, "original": { @@ -1068,23 +1070,6 @@ "type": "github" } }, - "hls": { - "flake": false, - "locked": { - "lastModified": 1707224159, - "narHash": "sha256-1quJwNdQGL/pSk0tYZ/p8ye50HN4ClWlrFf2FWnt0wA=", - "owner": "cardano-scaling", - "repo": "haskell-language-server", - "rev": "1170a7c3134fe7591c3e890e23521fe838ac2abe", - "type": "github" - }, - "original": { - "owner": "cardano-scaling", - "ref": "2.6-patched", - "repo": "haskell-language-server", - "type": "github" - } - }, "hls-1.10": { "flake": false, "locked": { @@ -1323,6 +1308,40 @@ "type": "github" } }, + "hls-2.7": { + "flake": false, + "locked": { + "lastModified": 1708965829, + "narHash": "sha256-LfJ+TBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu+Jf+M=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "50322b0a4aefb27adc5ec42f5055aaa8f8e38001", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.7.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.8": { + "flake": false, + "locked": { + "lastModified": 1715153580, + "narHash": "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "dd1be1beb16700de59e0d6801957290bcf956a0a", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.8.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -1516,18 +1535,18 @@ "iserv-proxy_2": { "flake": false, "locked": { - "lastModified": 1691634696, - "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", - "ref": "hkm/remote-iserv", - "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", - "revCount": 14, - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + "lastModified": 1710581758, + "narHash": "sha256-UNUXGiKLGUv1TuQumV70rfjCJERP4w8KZEDxsMG0RHc=", + "owner": "stable-haskell", + "repo": "iserv-proxy", + "rev": "50ea210590ab0519149bfd163d5ba199be925fb6", + "type": "github" }, "original": { - "ref": "hkm/remote-iserv", - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + "owner": "stable-haskell", + "ref": "iserv-syms", + "repo": "iserv-proxy", + "type": "github" } }, "lowdown-src": { @@ -2542,7 +2561,6 @@ "flake-utils": "flake-utils_7", "hackage": "hackage", "haskellNix": "haskellNix_2", - "hls": "hls", "hostNixpkgs": [ "nixpkgs" ], @@ -2689,11 +2707,11 @@ "stackage_2": { "flake": false, "locked": { - "lastModified": 1706054996, - "narHash": "sha256-URZYIAVp0Zt0lMr05+1VlDWUZe6C2D+FLBfFfn7Sti4=", + "lastModified": 1716942040, + "narHash": "sha256-YxHXqVGGHTy0PkVExdK9z6zHAJbGEd/9rwZdV+RaAU4=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "2d34cb4a94ed34c0ae200515172fe2bc9cb39ab6", + "rev": "686ed0e27db02a273ed04aa41788cc787052b706", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c5cbd829016..772d0bd3fca 100644 --- a/flake.nix +++ b/flake.nix @@ -143,14 +143,11 @@ }; customConfig.url = "github:input-output-hk/empty-flake"; cardano-node-runtime.url = "github:IntersectMBO/cardano-node?ref=8.9.2"; - hls = { - url = "github:cardano-scaling/haskell-language-server?ref=2.6-patched"; - flake = false; - }; + }; outputs = { self, nixpkgs, nixpkgs-unstable, hostNixpkgs, flake-utils, - haskellNix, iohkNix, CHaP, customConfig, cardano-node-runtime, hls, + haskellNix, iohkNix, CHaP, customConfig, cardano-node-runtime, ... }: let # Import libraries @@ -212,7 +209,6 @@ nodeProject = cardano-node-runtime.project.${system}; walletProject = (import ./nix/haskell.nix - hls CHaP pkgs.haskell-nix nixpkgs-unstable.legacyPackages.${system} diff --git a/nix/haskell.nix b/nix/haskell.nix index 2d60a77e6ae..a1c504a453b 100644 --- a/nix/haskell.nix +++ b/nix/haskell.nix @@ -1,7 +1,7 @@ ############################################################################ # Builds Haskell packages with Haskell.nix ############################################################################ -hls: CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [ +CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [ ({ lib, pkgs, buildProject, ... }: { options = { gitrev = lib.mkOption { @@ -96,7 +96,7 @@ hls: CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [ filter = lib.cleanSourceFilter; }; - indexState = "2024-03-15T17:07:52Z"; + indexState = "2024-05-15T17:07:52Z"; localClusterConfigs = config.src + /lib/local-cluster/test/data/cluster-configs; @@ -116,10 +116,10 @@ hls: CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [ tools = { cabal = { index-state = indexState; }; cabal-fmt = { index-state = indexState; }; - # haskell-language-server = { - # index-state = indexState; - # version = "latest"; - # }; + haskell-language-server = { + index-state = indexState; + version = "latest"; + }; hoogle = { index-state = indexState; version = "5.0.18.3"; @@ -151,10 +151,6 @@ hls: CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [ haskellPackages.weeder haskellPackages.stylish-haskell - (haskell-nix.tool "ghc964" "haskell-language-server" ({pkgs, ...}: rec { - # Use the github source of HLS that is tested with haskell.nix CI - src = hls; - })) ]); shellHook = "export LOCAL_CLUSTER_CONFIGS=${localClusterConfigs}"; };