From cd319e4a921699366677b0d47daab3f4bc6823a2 Mon Sep 17 00:00:00 2001 From: cydparser Date: Sat, 6 Aug 2022 19:53:55 -0700 Subject: [PATCH] Bump Nix flake GHC 9.2.3 to 9.2.4 --- configuration-ghc-90.nix | 2 +- flake.lock | 6 +++--- flake.nix | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configuration-ghc-90.nix b/configuration-ghc-90.nix index 7c16281847..a31673afed 100644 --- a/configuration-ghc-90.nix +++ b/configuration-ghc-90.nix @@ -19,7 +19,7 @@ let ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { }; ghc-lib = hself.ghc-lib_9_2_2_20220307; - ghc-lib-parser = hself.ghc-lib-parser_9_2_3_20220709; + ghc-lib-parser = hself.ghc-lib-parser_9_2_4_20220729; ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_0_4; Cabal = hself.Cabal_3_6_3_0; diff --git a/flake.lock b/flake.lock index de1c8b39ca..3823849eba 100644 --- a/flake.lock +++ b/flake.lock @@ -249,11 +249,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1657849727, - "narHash": "sha256-68J4eSwzr98r7VCzgrX/WWaQzkY7gdKqH2uSyQheYj0=", + "lastModified": 1659782844, + "narHash": "sha256-tM/qhHFE61puBxh9ebP3BIG1fkRAT4rHqD3jCM0HXGY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b683abff06fe55755ea992ba47f2e787081a30f", + "rev": "c85e56bb060291eac3fb3c75d4e0e64f6836fcfe", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c14a40bb49..df92770614 100644 --- a/flake.nix +++ b/flake.nix @@ -213,7 +213,7 @@ }; ghc902Config = (import ./configuration-ghc-90.nix) { inherit pkgs inputs; }; - ghc923Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; }; + ghc924Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; }; # GHC versions # While HLS still works fine with 8.10 GHCs, we only support the versions that are cached @@ -222,12 +222,12 @@ ghcVersion = "ghc" + (pkgs.lib.replaceStrings ["."] [""] pkgs.haskellPackages.ghc.version); cases = { ghc902 = ghc902Config.tweakHpkgs (pkgs.hlsHpkgs "ghc902"); - ghc923 = ghc923Config.tweakHpkgs (pkgs.hlsHpkgs "ghc923"); + ghc924 = ghc924Config.tweakHpkgs (pkgs.hlsHpkgs "ghc924"); }; in { default = cases."${ghcVersion}"; } // cases; ghc902 = supportedGHCs.ghc902; - ghc923 = supportedGHCs.ghc923; + ghc924 = supportedGHCs.ghc924; ghcDefault = supportedGHCs.default; # For markdown support @@ -359,20 +359,20 @@ simpleDevShells = { haskell-language-server-dev = mkDevShell ghcDefault "cabal.project"; haskell-language-server-902-dev = mkDevShell ghc902 "cabal.project"; - haskell-language-server-923-dev = mkDevShell ghc923 "cabal.project"; + haskell-language-server-924-dev = mkDevShell ghc924 "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-923-dev-nix = mkDevShellWithNixDeps ghc923 "cabal.project"; + haskell-language-server-924-dev-nix = mkDevShellWithNixDeps ghc924 "cabal.project"; }; allPackages = { haskell-language-server = mkExe ghcDefault; haskell-language-server-902 = mkExe ghc902; - haskell-language-server-923 = mkExe ghc923; + haskell-language-server-924 = mkExe ghc924; }; devShells = simpleDevShells // nixDevShells // {