Try #1706:

input-output-hk · Sep 21, 2022 · 050cb21 · 050cb21
2 parents ecda0a9 + dd9b2d4
commit 050cb21
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/build.nix b/build.nix
@@ -32,7 +32,14 @@ in rec {
             "ghc882" = "3.3.6";
             "ghc883" = "3.3.6";
             "ghc884" = "3.3.6";
-          }.compiler-nix-name or "latest";
+            "ghc8101" = "3.4.1";
+            "ghc8102" = "3.4.1";
+            "ghc8103" = "3.4.1";
+            "ghc8104" = "3.4.1";
+            "ghc8105" = "3.4.1";
+            "ghc8106" = "3.4.1";
+            "ghc8107" = "3.4.1";
+          }.${compiler-nix-name} or "latest";
       };
       hls-latest = tool compiler-nix-name "haskell-language-server" { inherit evalPackages; };
     })

diff --git a/lib/pkgconf-nixpkgs-map.nix b/lib/pkgconf-nixpkgs-map.nix
@@ -51,7 +51,6 @@ pkgs:
     "idn"                                = [ "libidn" ];
     "Imlib2"                             = [ "imlib2" ];
     "iw"                                 = [ "wirelesstools" ];
-    "javascriptcoregtk-3.0"              = [ "webkitgtk24x-gtk3" ]; # These are the old APIs, of which 2.4 is the last provider, so map directly to that.
     "jpeg"                               = [ "libjpeg" ];
     "jvm"                                = [ "jdk" ];
     "liboath"                            = [ "liboauth" ];
@@ -83,7 +82,6 @@ pkgs:
     "systemd-journal"                    = [ "systemd" ];
     "tag_c"                              = [ "taglib" ];
     "webkit2gtk"                         = [ "webkitgtk" ];
-    "webkitgtk-3.0"                      = [ "webkitgtk24x-gtk3" ]; # These are the old APIs, of which 2.4 is the last provider, so map directly to that
     "xml2"                               = [ "libxml2" ];
     "yaml"                               = [ "libyaml" ];
     "z"                                  = [ "zlib" ];