Skip to content

Commit 3507e24

Browse files
committed
Upgrade stack from LTS 17.2 to 18.18
This required bumping nixpkgs. No code changes were required. We now include stack in the nix environment, so that we don't have to depend on stack being installed externally.
1 parent 9dd62b8 commit 3507e24

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

client-haskell/default.nix

+1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ let
1111
in
1212
{
1313
icepeak-client = icepeak-client;
14+
stack = pkgs.haskellPackages.stack;
1415
}

client-haskell/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-17.2
1+
resolver: lts-18.8
22

33
# Note: This section will be ignored by stack, on non-NixOS systems.
44
# It can be explicitly enabled on non-NixOS systems by passing --nix.

nix/nixpkgs.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
let
2-
rev = "bed08131cd29a85f19716d9351940bdc34834492";
2+
rev = "d6a4500f88725c24b82f6f86fb3129ed0561800c";
33
extractedTarball = fetchTarball {
44
url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
5-
sha256 = "sha256:19gxrzk9y4g2f09x2a4g5699ccw35h5frznn9n0pbsyv45n9vxix";
5+
sha256 = "sha256:1xvgir3jr0mff9zk3ca2m0mzk6blyhjwmd5flyp3jp83bphr7301";
66
};
77
in
88
# extractedTarball will be a directory here, and 'import' will automatically append /default.nix here

server/default.nix

+1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ let
1111
in
1212
{
1313
icepeak-server = icepeak-server;
14+
stack = pkgs.haskellPackages.stack;
1415
}

server/package.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ dependencies:
2626
- monad-logger >= 0.3.31 && < 0.4
2727
- mtl >= 2.2.2 && < 2.3
2828
- network >= 2.8.0 && < 3.2
29-
- optparse-applicative >= 0.14.0 && < 0.16
29+
- optparse-applicative >= 0.15.0 && < 0.17
3030
- prometheus-client >= 1.0.0 && < 1.1
3131
- prometheus-metrics-ghc >= 1.0.0 && < 1.1
32-
- random >= 1.1 && < 1.2
32+
- random >= 1.1 && < 1.3
3333
- raven-haskell >= 0.1.2 && < 0.2
3434
- scotty >= 0.11.5 && < 0.13
3535
- securemem >= 0.1.10 && < 0.2

0 commit comments

Comments
 (0)