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

Upgrade stack from LTS 17.2 to 18.18 #79

Merged
merged 1 commit into from
Dec 6, 2021
Merged

Upgrade stack from LTS 17.2 to 18.18 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions client-haskell/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ let
in
{
icepeak-client = icepeak-client;
stack = pkgs.haskellPackages.stack;
}
2 changes: 1 addition & 1 deletion client-haskell/stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-17.2
resolver: lts-18.8

# Note: This section will be ignored by stack, on non-NixOS systems.
# It can be explicitly enabled on non-NixOS systems by passing --nix.
Expand Down
4 changes: 2 additions & 2 deletions nix/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
let
rev = "bed08131cd29a85f19716d9351940bdc34834492";
rev = "d6a4500f88725c24b82f6f86fb3129ed0561800c";
extractedTarball = fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
sha256 = "sha256:19gxrzk9y4g2f09x2a4g5699ccw35h5frznn9n0pbsyv45n9vxix";
sha256 = "sha256:1xvgir3jr0mff9zk3ca2m0mzk6blyhjwmd5flyp3jp83bphr7301";
};
in
# extractedTarball will be a directory here, and 'import' will automatically append /default.nix here
Expand Down
1 change: 1 addition & 0 deletions server/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ let
in
{
icepeak-server = icepeak-server;
stack = pkgs.haskellPackages.stack;
}
4 changes: 2 additions & 2 deletions server/package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ dependencies:
- monad-logger >= 0.3.31 && < 0.4
- mtl >= 2.2.2 && < 2.3
- network >= 2.8.0 && < 3.2
- optparse-applicative >= 0.14.0 && < 0.16
- optparse-applicative >= 0.15.0 && < 0.17
- prometheus-client >= 1.0.0 && < 1.1
- prometheus-metrics-ghc >= 1.0.0 && < 1.1
- random >= 1.1 && < 1.2
- random >= 1.1 && < 1.3
- raven-haskell >= 0.1.2 && < 0.2
- scotty >= 0.11.5 && < 0.13
- securemem >= 0.1.10 && < 0.2
Expand Down