update pins (#1371)

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 {

flake.nix

@@ -2,7 +2,7 @@
   description = "Alternative Haskell Infrastructure for Nixpkgs";
 
   inputs = {
-    nixpkgs.follows = "nixpkgs-2111";
+    nixpkgs.follows = "nixpkgs-unstable";
     nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; };
     nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; };
     nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; };

scripts/options-doc.nix

@@ -22,7 +22,7 @@ let
   singleMarkdown = name: value: ''
     ## ${name}
 
-    ${value.description}
+    ${lib.optionalString (value.description != null) value.description}
 
     **Type**: ${value.type}