Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update pins #1371

Merged
merged 7 commits into from
Feb 14, 2022
Merged

update pins #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a998434
Merge 'mlabs-haskell/master' into hkm/update-pins
hamishmack Feb 12, 2022
df9dd93
Bump to latest versions again
hamishmack Feb 12, 2022
ca944ab
ifdLevel 1
hamishmack Feb 12, 2022
7184664
ifdLevel 2
hamishmack Feb 13, 2022
4b27c6b
ifdLevel 3
hamishmack Feb 14, 2022
c34f029
Fix for new nixpkgsHoogle
hamishmack Feb 14, 2022
1765ba4
Another fix for latest nixpkgs
hamishmack Feb 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions builder/default.nix
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion scripts/options-doc.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ let
singleMarkdown = name: value: ''
## ${name}

${value.description}
${lib.optionalString (value.description != null) value.description}

**Type**: ${value.type}

Expand Down