about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2024-06-20 14:44:49 +0200
committerGitHub <noreply@github.com>2024-06-20 14:44:49 +0200
commit3f30378a4e4f85095b994a31446056e672434f2a (patch)
treed23cda8f4f9052823048f1f754052869296bd01e /pkgs/top-level
parent1632abdb3ae088dc8710af1561a78608294317f5 (diff)
parente66e7c4d8e54ad4ba31e4ed5665096ff761a42e7 (diff)
Merge pull request #318363 from NixOS/haskell-updates
haskellPackages: another round of mass-rebuilds
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/haskell-packages.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 75f0e54d697cb..b924a29f26162 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -229,7 +229,7 @@ in {
       buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
       llvmPackages = pkgs.llvmPackages_12;
     };
-    ghc948 = callPackage ../development/compilers/ghc/9.4.8.fixme.nix {
+    ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix {
       bootPkgs =
         # Building with 9.2 is broken due to
         # https://gitlab.haskell.org/ghc/ghc/-/issues/21914
@@ -568,7 +568,7 @@ in {
       buildHaskellPackages = ghc.bootPkgs;
       ghc = bh.compiler.ghcjs810;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs-8.x.nix { };
     };
 
     # The integer-simple attribute set contains package sets for all the GHC compilers