Skip to content

Commit cbcb640

Browse files
hamishmackhamishmack
committed
Merge remote-tracking branch 'origin/master' into hkm/embed-file
2 parents 7449816 + cbd75e3 commit cbcb640

File tree

157 files changed

+4794
-717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+4794
-717
lines changed

‎build.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ in rec {
6262
inherit evalPackages;
6363
src = pkgs.haskell-nix.sources."hls-2.2";
6464
};
65-
} // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.9") {
66-
"hls-28" = tool compiler-nix-name "haskell-language-server" {
65+
} // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.11") {
66+
"hls-29" = tool compiler-nix-name "haskell-language-server" {
6767
inherit evalPackages;
68-
src = pkgs.haskell-nix.sources."hls-2.8";
68+
src = pkgs.haskell-nix.sources."hls-2.9";
6969
};
7070
})
7171
);

‎builder/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# tl;dr: the builder must not re-introduce any reference to the build plan.
1515

16-
{ pkgs, buildPackages, evalPackages, stdenv, lib, haskellLib, ghc, compiler-nix-name, fetchurl, nonReinstallablePkgs, hsPkgs, compiler }:
16+
{ pkgs, buildPackages, pkgsBuildBuild, evalPackages, stdenv, lib, haskellLib, ghc, compiler-nix-name, fetchurl, nonReinstallablePkgs, hsPkgs, compiler }:
1717

1818
let
1919
# Builds a single component of a package.
@@ -85,7 +85,7 @@ let
8585

8686
# Same as haskellPackages.shellFor in nixpkgs.
8787
shellFor = haskellLib.weakCallPackage pkgs ./shell-for.nix {
88-
inherit hsPkgs ghcForComponent makeConfigFiles hoogleLocal haskellLib buildPackages evalPackages compiler;
88+
inherit hsPkgs ghcForComponent makeConfigFiles hoogleLocal haskellLib pkgsBuildBuild evalPackages compiler;
8989
inherit (buildPackages) glibcLocales;
9090
};
9191

‎builder/shell-for.nix

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ lib, stdenv, mkShell, glibcLocales, pkgconfig, ghcForComponent, makeConfigFiles, hsPkgs, hoogleLocal, haskellLib, buildPackages, evalPackages, compiler }:
1+
{ lib, stdenv, mkShell, glibcLocales, pkgconfig, ghcForComponent, makeConfigFiles, hsPkgs, hoogleLocal, haskellLib, pkgsBuildBuild, evalPackages, compiler }:
22

33
{ # `packages` function selects packages that will be worked on in the shell itself.
44
# These packages will not be built by `shellFor`, but their
@@ -149,7 +149,7 @@ let
149149
# inherit (hsPkgs) hoogle;
150150
} // (
151151
lib.optionalAttrs (args ? tools && args.tools ? hoogle) {
152-
hoogle = buildPackages.haskell-nix.hackage-tool (
152+
hoogle = pkgsBuildBuild.haskell-nix.hackage-tool (
153153
haskellLib.versionOrModToMods args.tools.hoogle ++ [{
154154
name = "hoogle";
155155
compiler-nix-name = compiler.nix-name;
@@ -168,12 +168,12 @@ in
168168
nativeBuildInputs = [ ghcEnv.drv ]
169169
++ nativeBuildInputs
170170
++ mkDrvArgs.nativeBuildInputs or []
171-
++ lib.attrValues (buildPackages.haskell-nix.tools' evalPackages compiler.nix-name tools)
171+
++ lib.attrValues (pkgsBuildBuild.haskell-nix.tools' evalPackages compiler.nix-name tools)
172172
# If this shell is a cross compilation shell include
173173
# wrapper script for running cabal build with appropriate args.
174174
# Includes `--with-compiler` in case the `cabal.project` file has `with-compiler:` in it.
175175
++ lib.optional (ghcEnv.targetPrefix != "") (
176-
buildPackages.writeShellScriptBin "${ghcEnv.targetPrefix}cabal" ''
176+
pkgsBuildBuild.writeShellScriptBin "${ghcEnv.targetPrefix}cabal" ''
177177
exec cabal \
178178
--with-ghc=${ghcEnv.targetPrefix}ghc \
179179
--with-compiler=${ghcEnv.targetPrefix}ghc \

‎ci.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
inherit (lib.systems.examples) ghcjs;
8787
} // lib.optionalAttrs (
8888
(__match ".*llvm" compiler-nix-name == null)
89-
&& ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc884"])
89+
&& ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc884" "ghc91120240620"]) # Including GHC HEAD here because the patches for rts/RtsSymbols.c no longer apply and mingwW64 GHC build fails without them
9090
|| (system == "x86_64-darwin" && builtins.elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
9191
inherit (lib.systems.examples) mingwW64;
9292
} // lib.optionalAttrs (nixpkgsName == "unstable"

‎flake.lock

+24-45
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

+1-8
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@
1414
# And later it breaks in th-dll due to some change in the windows libs. We should probably
1515
# drop unsable.
1616
nixpkgs-unstable = { url = "github:NixOS/nixpkgs?rev=47585496bcb13fb72e4a90daeea2f434e2501998"; }; # nixpkgs-unstable };
17-
ghc910X = {
18-
flake = false;
19-
url = "git+https://gitlab.haskell.org/ghc/ghc?ref=ghc-9.10&submodules=1";
20-
};
21-
ghc911 = {
22-
flake = false;
23-
url = "git+https://gitlab.haskell.org/ghc/ghc?submodules=1";
24-
};
2517
flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
2618
"hls-1.10" = { url = "github:haskell/haskell-language-server/1.10.0.0"; flake = false; };
2719
"hls-2.0" = { url = "github:haskell/haskell-language-server/2.0.0.1"; flake = false; };
@@ -32,6 +24,7 @@
3224
"hls-2.6" = { url = "github:haskell/haskell-language-server/2.6.0.0"; flake = false; };
3325
"hls-2.7" = { url = "github:haskell/haskell-language-server/2.7.0.0"; flake = false; };
3426
"hls-2.8" = { url = "github:haskell/haskell-language-server/2.8.0.0"; flake = false; };
27+
"hls-2.9" = { url = "github:haskell/haskell-language-server/2.9.0.0"; flake = false; };
3528
hydra.url = "hydra";
3629
hackage = {
3730
url = "github:input-output-hk/hackage.nix";

‎lazy-inputs/default.nix

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
final: prev:
2+
let
3+
callFlake = import prev.haskell-nix.sources.flake-compat;
4+
in {
5+
haskell-nix = prev.haskell-nix // {
6+
sources = prev.haskell-nix.sources // {
7+
inherit ((callFlake { pkgs = final; src = ./ghc8107; }).defaultNix) ghc8107;
8+
inherit ((callFlake { pkgs = final; src = ./ghc901; }).defaultNix) ghc901;
9+
inherit ((callFlake { pkgs = final; src = ./ghc902; }).defaultNix) ghc902;
10+
inherit ((callFlake { pkgs = final; src = ./ghc921; }).defaultNix) ghc921;
11+
inherit ((callFlake { pkgs = final; src = ./ghc922; }).defaultNix) ghc922;
12+
inherit ((callFlake { pkgs = final; src = ./ghc923; }).defaultNix) ghc923;
13+
inherit ((callFlake { pkgs = final; src = ./ghc924; }).defaultNix) ghc924;
14+
inherit ((callFlake { pkgs = final; src = ./ghc925; }).defaultNix) ghc925;
15+
inherit ((callFlake { pkgs = final; src = ./ghc926; }).defaultNix) ghc926;
16+
inherit ((callFlake { pkgs = final; src = ./ghc927; }).defaultNix) ghc927;
17+
inherit ((callFlake { pkgs = final; src = ./ghc928; }).defaultNix) ghc928;
18+
inherit ((callFlake { pkgs = final; src = ./ghc941; }).defaultNix) ghc941;
19+
inherit ((callFlake { pkgs = final; src = ./ghc942; }).defaultNix) ghc942;
20+
inherit ((callFlake { pkgs = final; src = ./ghc943; }).defaultNix) ghc943;
21+
inherit ((callFlake { pkgs = final; src = ./ghc944; }).defaultNix) ghc944;
22+
inherit ((callFlake { pkgs = final; src = ./ghc945; }).defaultNix) ghc945;
23+
inherit ((callFlake { pkgs = final; src = ./ghc946; }).defaultNix) ghc946;
24+
inherit ((callFlake { pkgs = final; src = ./ghc947; }).defaultNix) ghc947;
25+
inherit ((callFlake { pkgs = final; src = ./ghc948; }).defaultNix) ghc948;
26+
inherit ((callFlake { pkgs = final; src = ./ghc961; }).defaultNix) ghc961;
27+
inherit ((callFlake { pkgs = final; src = ./ghc962; }).defaultNix) ghc962;
28+
inherit ((callFlake { pkgs = final; src = ./ghc963; }).defaultNix) ghc963;
29+
inherit ((callFlake { pkgs = final; src = ./ghc964; }).defaultNix) ghc964;
30+
inherit ((callFlake { pkgs = final; src = ./ghc965; }).defaultNix) ghc965;
31+
inherit ((callFlake { pkgs = final; src = ./ghc966; }).defaultNix) ghc966;
32+
inherit ((callFlake { pkgs = final; src = ./ghc981; }).defaultNix) ghc981;
33+
inherit ((callFlake { pkgs = final; src = ./ghc982; }).defaultNix) ghc982;
34+
inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
35+
};
36+
};
37+
}

‎lazy-inputs/ghc8107/flake.lock

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lazy-inputs/ghc8107/flake.nix

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
description = "Lazy Input for Haskell.nix";
3+
4+
inputs = {
5+
ghc8107 = {
6+
flake = false;
7+
url = "git+https://github.com/stable-haskell/ghc?ref=ghc-8.10.7-iog&submodules=1";
8+
};
9+
};
10+
11+
outputs = inputs: inputs;
12+
}

‎lazy-inputs/ghc901/flake.lock

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lazy-inputs/ghc901/flake.nix

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
description = "Lazy Input for Haskell.nix";
3+
4+
inputs = {
5+
ghc901 = {
6+
flake = false;
7+
url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.0.1-iog&submodules=1";
8+
};
9+
};
10+
11+
outputs = inputs: inputs;
12+
}

‎lazy-inputs/ghc902/flake.lock

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lazy-inputs/ghc902/flake.nix

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
description = "Lazy Input for Haskell.nix";
3+
4+
inputs = {
5+
ghc902 = {
6+
flake = false;
7+
url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.0.2-iog&submodules=1";
8+
};
9+
};
10+
11+
outputs = inputs: inputs;
12+
}

0 commit comments

Comments
 (0)