532e714 · haskell.nix · git.iko.soy

.buildkite/pipeline.yml+4−4

compare with iko/ghcjs-patch-master

unifiedsplit

@@ -1,6 +1,6 @@

1steps:

2− - label: 'Run tests with ghc884'

2+ - label: 'Run tests with ghc8104'

3− command: "./test/tests.sh ghc884"

3+ command: "./test/tests.sh ghc8104"

4 agents:

5 system: x86_64-linux

6

@@ -14,9 +14,9 @@ steps:

14 agents:

15 system: x86_64-linux

16

17− - label: 'Check closure size with ghc884'

17+ - label: 'Check closure size with ghc8104'

18 command:

19− - nix-build build.nix -A maintainer-scripts.check-closure-size --argstr compiler-nix-name ghc884 -o check-closure-size.sh

19+ - nix-build build.nix -A maintainer-scripts.check-closure-size --argstr compiler-nix-name ghc8104 -o check-closure-size.sh

20 - echo "+++ Closure size (MB)"

21 - ./check-closure-size.sh

22 agents:

ci.nix+5−4

@@ -25,12 +25,13 @@

25 # Update supported-ghc-versions.md to reflect any changes made here.

26 {

27 ghc865 = true;

28− ghc884 = false; # Just included because the native version is needed at eval time

28+ ghc8104 = false; # Just included because the native version is needed at eval time

29 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {

30+ ghc865 = false;

30 ghc884 = true;

31 ghc884 = true;

31 ghc8104 = true;

32 ghc8104 = true;

32 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {

33 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {

33− ghc884 = false;

34+ ghc865 = false;

34 ghc8104 = true;

35 ghc8104 = true;

35 ghc901 = true;

36 ghc901 = true;

36 ghc810420210212 = false;

37 ghc810420210212 = false;

@@ -52,10 +53,10 @@

52 # Windows cross compilation is currently broken on macOS

53 # Windows cross compilation is currently broken on macOS

53 inherit (lib.systems.examples) mingwW64;

54 inherit (lib.systems.examples) mingwW64;

54 } // lib.optionalAttrs (system == "x86_64-linux"

55 } // lib.optionalAttrs (system == "x86_64-linux"

55− && !(nixpkgsName == "R2003" && compiler-nix-name == "ghc884")) {

56+ && !(nixpkgsName == "R2003" && compiler-nix-name == "ghc8104")) {

56 # Musl cross only works on linux

57 # Musl cross only works on linux

57 # aarch64 cross only works on linux

58 # aarch64 cross only works on linux

58− # We also skip these for the R2003 was build of ghc884 (we only need the

59+ # We also skip these for the R2003 was build of ghc8104 (we only need the

59 # native so ifdLevel 1 includes compiler needed in ifdLevel2 eval)

60 # native so ifdLevel 1 includes compiler needed in ifdLevel2 eval)

60 inherit (lib.systems.examples) musl64 aarch64-multiplatform;

61 inherit (lib.systems.examples) musl64 aarch64-multiplatform;

61 };

62 };

overlays/bootstrap.nix+2−2

@@ -756,8 +756,8 @@ in {

756 # there should be no difference in the behaviour of these tools.

757 # (stack projects on macOS may see a significant change in the

758 # closure size of their build dependencies due to dynamic linking).

759− internal-cabal-install = final.haskell-nix.cabal-install.ghc884;

759+ internal-cabal-install = final.haskell-nix.cabal-install.ghc8104;

760− internal-nix-tools = final.haskell-nix.nix-tools.ghc884;

760+ internal-nix-tools = final.haskell-nix.nix-tools.ghc8104;

761

762 # WARN: The `import ../. {}` will prevent

763 # any cross to work, as we will loose

test/call-stack-to-nix/stack.yaml+1−1

@@ -17,7 +17,7 @@

17#

18# resolver: ./custom-snapshot.yaml

19# resolver: https://example.com/snapshots/2018-01-01.yaml

20−resolver: lts-13.19

20+resolver: lts-14.13

21

22# User packages to be built.

23# Various formats can be used as shown in the example below.