Skip to content

Commit f67d0a1

Browse files
committed
Update nixpkgs to latest master
1 parent 3d49955 commit f67d0a1

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.buildkite/pipeline.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ steps:
4242
4343
# Different GHC versions
4444

45-
- label: 8.6.5 -A working
45+
- label: 8.8.1 -A working
4646
command: |
4747
NIX_PATH=nixpkgs=nixpkgs nix-build --no-link survey/default.nix \
48-
--argstr compiler ghc865 -A working
48+
--argstr compiler ghc881 -A working
4949
50-
- label: 8.6.5 -A workingStackageExecutables
50+
- label: 8.8.1 -A workingStackageExecutables
5151
command: |
5252
NIX_PATH=nixpkgs=nixpkgs nix-build --no-link survey/default.nix \
53-
--argstr compiler ghc865 -A workingStackageExecutables
53+
--argstr compiler ghc881 -A workingStackageExecutables
5454
5555
# Stack via stack2nix
5656

nixpkgs

Submodule nixpkgs updated 10139 files

survey/default.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,16 @@ in
3232
])."${approach}",
3333

3434
# When changing this, also change the default version of Cabal declared below
35-
compiler ? "ghc864",
35+
compiler ? "ghc865",
3636

3737
defaultCabalPackageVersionComingWithGhc ?
3838
({
3939
ghc822 = "Cabal_2_2_0_1"; # TODO this is technically incorrect for ghc 8.2.2, should be 2.0.1.0, but nixpkgs doesn't have that
4040
ghc844 = "Cabal_2_2_0_1";
4141
ghc863 = throw "static-haskell-nix: ghc863 is no longer supported, please upgrade";
42-
ghc864 = "Cabal_2_4_1_0"; # TODO this is technically incorrect for ghc 8.6.4, should be 2.4.0.1, but nixpkgs doesn't have that
42+
ghc864 = throw "static-haskell-nix: ghc863 is no longer supported, please upgrade";
4343
ghc865 = "Cabal_2_4_1_0"; # TODO this is technically incorrect for ghc 8.6.5, should be 2.4.0.1, but nixpkgs doesn't have that
44+
ghc881 = "Cabal_3_0_0_0";
4445
}."${compiler}"),
4546

4647
# Use `integer-simple` instead of `integer-gmp` to avoid linking in

0 commit comments

Comments
 (0)