Fix ghc-lib-parser-8.10.7.20220219

Author: hamishmack

flake.lock

@@ -22,7 +22,7 @@
     "hls-2.6" = { url = "github:haskell/haskell-language-server/2.6.0.0"; flake = false; };
     "hls-2.7" = { url = "github:haskell/haskell-language-server/2.7.0.0"; flake = false; };
     "hls-2.8" = { url = "github:haskell/haskell-language-server/2.8.0.0"; flake = false; };
-    "hls-2.9" = { url = "github:haskell/haskell-language-server/2.9.0.0"; flake = false; };
+    "hls-2.9" = { url = "github:haskell/haskell-language-server/2.9.0.1"; flake = false; };
     hydra.url = "hydra";
     hackage = {
       url = "github:input-output-hk/hackage.nix";

flake.nix

@@ -77,6 +77,7 @@ in addPackageKeys {
     (fromUntil "9.2.0.0" "9.3" ../overlays/patches/ghc-lib-parser-9.2-global-unique-counters-in-rts.patch)
     (fromUntil "9.4.0.0" "9.7" ../overlays/patches/ghc-lib-parser-9.4-global-unique-counters-in-rts.patch)
   ];
+  packages."ghc-lib-parser-8.10.7.20220219".components.library.pre-existing = ["ghc-boot-th"];
 
   # See https://github.com/haskell-nix/hnix/pull/1053
   packages.hnix.patches = [

modules/configuration-nix.nix

@@ -790,11 +790,15 @@ final: prev: {
                     })
                     ({config, options, ...}: {
                       use-package-keys = true;
-                      package-keys = map (p: p.pkg-name) plan-json.install-plan ++ map (p: to-key p) plan-json.install-plan;
+                      package-keys = map (p: p.pkg-name) plan-json.install-plan ++ map (p: to-key p) plan-json.install-plan ++ map (p: p.pkg-name + "-" + p.pkg-version) plan-json.install-plan;
                       packages = final.lib.listToAttrs (map (p: {
-                        name = to-key p;
-                        value = final.lib.modules.mkAliasDefinitions (options.packages.${p.pkg-name});
-                      }) (final.lib.filter (p: to-key p != p.pkg-name) plan-json.install-plan));
+                          name = to-key p;
+                          value = final.lib.modules.mkAliasDefinitions (options.packages.${p.pkg-name});
+                        }) (final.lib.filter (p: to-key p != p.pkg-name) plan-json.install-plan))
+                        // final.lib.listToAttrs (map (p: {
+                          name = to-key p;
+                          value = final.lib.modules.mkAliasDefinitions (options.packages.${p.pkg-name + "-" + p.pkg-version});
+                        }) (final.lib.filter (p: to-key p != p.pkg-name) plan-json.install-plan));
                     })
                     ({lib, ...}: {
                       packages = final.lib.listToAttrs (map (p:

overlays/haskell.nix

@@ -5,7 +5,7 @@ if impl(ghc>=9.10.1)
   -- otherwise we risk running into broken build-plans down the line.
   allow-newer: *:base, *:template-haskell, *:bytestring, *:text, *:ghc-prim, *:deepseq, *:Cabal
 if impl(ghc > 9.11)
-  allow-newer: *:containers
+  allow-newer: *:containers, time-compat:time
   constraints: base-compat >=0.14.0, aeson >=2.2.1.0
 
 -- This prevents hsc2hs from causing old versions of packages from being added to plan.json
@@ -22,7 +22,7 @@ repository head.hackage.ghc.haskell.org
      f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
      26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
      7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-  --sha256: sha256-j+maRnTnoCe341pX+uWMPUVqRbGDOA6w1WlnqfaO9Qc=
+  --sha256: sha256-yyYXGnFwUr6MaUEXz6odRv+IJMCmAZioN5dz3LbY1n4=
 
 repository ghcjs-overlay
   url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/d37efd733666d090bf1c83bf7d5f9cb71b1dacc1