Fix for new nixpkgsHoogle

input-output-hk · Feb 14, 2022 · c34f029 · c34f029
1 parent 4b27c6b
commit c34f029
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/builder/default.nix b/builder/default.nix
@@ -46,17 +46,23 @@ let
   hoogleLocal = let
     nixpkgsHoogle = import (pkgs.path + /pkgs/development/haskell-modules/hoogle.nix);
   in { packages ? [], hoogle ? pkgs.buildPackages.haskell-nix.tool "ghc8107" "hoogle" {
-        version = "5.0.18.2";
+        version = "5.0.18.3";
         index-state = pkgs.haskell-nix.internalHackageIndexState;
       }
     }:
-    haskellLib.weakCallPackage pkgs nixpkgsHoogle {
-      # For musl we can use haddock from the buildGHC
-      ghc = if stdenv.hostPlatform.isLinux && stdenv.targetPlatform.isMusl && !haskellLib.isNativeMusl
-        then ghc.buildGHC
-        else ghc;
-      inherit packages hoogle;
-    };
+    let
+      haskellPackages = {
+        # For musl we can use haddock from the buildGHC
+        ghc = if stdenv.hostPlatform.isLinux && stdenv.targetPlatform.isMusl && !haskellLib.isNativeMusl
+          then ghc.buildGHC
+          else ghc;
+        inherit packages hoogle;
+      };
+    in if lib.versionAtLeast lib.trivial.release "22.05"
+      then haskellLib.weakCallPackage pkgs nixpkgsHoogle {
+          inherit haskellPackages;
+        } (p: p.packages)
+      else haskellLib.weakCallPackage pkgs nixpkgsHoogle haskellPackages;
 
   # Same as haskellPackages.shellFor in nixpkgs.
   shellFor = haskellLib.weakCallPackage pkgs ./shell-for.nix {