Skip to content

Commit

Permalink
Try #1371:
Browse files Browse the repository at this point in the history
  • Loading branch information
iohk-bors[bot] authored Feb 14, 2022
2 parents f3b66b1 + c34f029 commit 6bff98a
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 30 deletions.
22 changes: 14 additions & 8 deletions builder/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
42 changes: 21 additions & 21 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"; };
Expand Down

0 comments on commit 6bff98a

Please sign in to comment.