Simpler fix for ghc-lib-parser

Author: hamishmack

modules/configuration-nix.nix

@@ -77,7 +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"];
+  packages.ghc-lib-parser.components.library.pre-existing = ["ghc-boot-th"];
 
   # See https://github.com/haskell-nix/hnix/pull/1053
   packages.hnix.patches = [

overlays/haskell.nix

@@ -790,14 +790,10 @@ 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 ++ map (p: p.pkg-name + "-" + p.pkg-version) plan-json.install-plan;
+                      package-keys = map (p: p.pkg-name) plan-json.install-plan ++ map (p: to-key p) 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))
-                        // 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, ...}: {