diff --git a/flake.lock b/flake.lock index 48b9b0765..bae49d232 100644 --- a/flake.lock +++ b/flake.lock @@ -277,11 +277,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1712545072, - "narHash": "sha256-vb/6GtGmp/7wM74vEi7z1VmD9Tb0NWqVMIETf2bDoX8=", + "lastModified": 1713474460, + "narHash": "sha256-L3k9NUR9imLfm9EKytXJ9Lsx1AIjjAUgvdYCM0VX/4o=", "ref": "refs/heads/master", - "rev": "48ecacd922638487f65981c0018044b55dc7feb9", - "revCount": 160, + "rev": "fe968d0d39f49cae165da757e48d1365c607a38b", + "revCount": 167, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc-wasm-meta" }, @@ -389,11 +389,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1712967738, - "narHash": "sha256-jKx8KJxGHfdmFB2spyj58Na31cknm2RQWvo19vslF6U=", + "lastModified": 1713572844, + "narHash": "sha256-/XWI1qyfIaR2+Zfp9sFSkCS0tSLQ2kT8rZ8YO6TEC+w=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "c3ab2f880ee6c8af1f51e5e5202e96a29144a953", + "rev": "5fbda11a1e6c32f1deee000160bb67dfa9e06855", "type": "github" }, "original": { @@ -416,11 +416,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1712612784, - "narHash": "sha256-HPbFvSudO7iBwdn2VK9Gy1AV7klzgq7BmYJnH7yrMqU=", + "lastModified": 1713006438, + "narHash": "sha256-VLSOFnOXptUh2jAFQ4ZpHzfwiXGDbS/wZKrpikEXrfE=", "owner": "hackworthltd", "repo": "hacknix", - "rev": "eb217ef5356c58424848dac21249f543882e8b49", + "rev": "37ac3cb477dc52f906313b838c7c84d60af6b42e", "type": "github" }, "original": { @@ -448,6 +448,7 @@ "hls-2.4": "hls-2.4", "hls-2.5": "hls-2.5", "hls-2.6": "hls-2.6", + "hls-2.7": "hls-2.7", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -467,11 +468,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1712969356, - "narHash": "sha256-d0syrqLiyhwuOA8dAWHZ0N8NNI51JvhtXySQYt2XvAQ=", + "lastModified": 1713574219, + "narHash": "sha256-QLCxxfmht4POO73ld1EH0w/GTb3XLgKLXcCitkMkLrs=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "7400a707f2363fcb0dd9f3066672bbbad6976bb9", + "rev": "e43654102de69c2a4ddfdcb067d42f203f0ecf51", "type": "github" }, "original": { @@ -729,11 +730,11 @@ }, "nixlib": { "locked": { - "lastModified": 1711846064, - "narHash": "sha256-cqfX0QJNEnge3a77VnytM0Q6QZZ0DziFXt6tSCV8ZSc=", + "lastModified": 1712450863, + "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "90b1a963ff84dc532db92f678296ff2499a60a87", + "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", "type": "github" }, "original": { @@ -751,11 +752,11 @@ ] }, "locked": { - "lastModified": 1712191720, - "narHash": "sha256-xXtSSnVHURHsxLQO30dzCKW5NJVGV/umdQPmFjPFMVA=", + "lastModified": 1712537332, + "narHash": "sha256-yYlxv1sg/TNl6hghjAe0ct+/p5PwXiT1mpuaExjhR88=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0c15e76bed5432d7775a22e8d22059511f59d23a", + "rev": "d942db8df8ee860556a38754f15b8d03bf7e6933", "type": "github" }, "original": { @@ -766,11 +767,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1713248628, + "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "type": "github" }, "original": { @@ -1050,11 +1051,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1712055707, - "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=", + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", "type": "github" }, "original": { @@ -1095,7 +1096,6 @@ "ghc-wasm": "ghc-wasm", "hacknix": "hacknix", "haskell-nix": "haskell-nix", - "hls-2.7": "hls-2.7", "nixpkgs": [ "haskell-nix", "nixpkgs-unstable" @@ -1106,11 +1106,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1712966994, - "narHash": "sha256-0MMsCMyHDO1jv/DZC+g3rcNTNk/zfE9oeHTlM/rU4MU=", + "lastModified": 1713572055, + "narHash": "sha256-gyxWqQhTvI7MvSWj9tNBWvUIUw9I1RkoCkKYmT6nMQ8=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "5964d4ef5062c2530502330605200796801a1052", + "rev": "0b92a647a8e834c8c13c346149501d50e85d7380", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4a1aacef9..98f5f0390 100644 --- a/flake.nix +++ b/flake.nix @@ -4,9 +4,6 @@ inputs = { haskell-nix.url = "github:input-output-hk/haskell.nix"; - # Until `haskell.nix` catches up. - "hls-2.7" = { url = "github:haskell/haskell-language-server/2.7.0.0"; flake = false; }; - # We use this for some convenience functions only. hacknix.url = "github:hackworthltd/hacknix"; @@ -468,9 +465,7 @@ tools = { ghcid = "latest"; - # Workaround for HLS in haskell.nix. Ref: - # https://github.com/input-output-hk/haskell.nix/issues/1981#issuecomment-1594278049 - haskell-language-server.src = inputs."hls-2.7"; + haskell-language-server.src = pkgs.haskell-nix.sources."hls-2.7"; implicit-hie = "latest";