Skip to content

Commit 6833ba1

Browse files
authored
Use Stack 2.5.1 (#2237)
1 parent 8cdd037 commit 6833ba1

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

nix/sources.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@
4949
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
5050
},
5151
"nixpkgs": {
52-
"branch": "nixos-unstable",
53-
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
54-
"homepage": "https://github.com/NixOS/nixpkgs",
55-
"owner": "NixOS",
56-
"repo": "nixpkgs-channels",
57-
"rev": "5717d9d2f7ca0662291910c52f1d7b95b568fec2",
58-
"sha256": "17gxd2f622pyss3r6cjngdav6wzdbr31d7bqx9z2lawxg47mmk1l",
52+
"branch": "master",
53+
"description": "Nix Packages collection",
54+
"homepage": "",
55+
"owner": "nixos",
56+
"repo": "nixpkgs",
57+
"rev": "fc37cc679f168159a234f45a3861b1b7a414e304",
58+
"sha256": "0a57rmfn332dnwk6smlcarp3m7gvifq9y872cmcxj1800fjnjnns",
5959
"type": "tarball",
60-
"url": "https://github.com/NixOS/nixpkgs-channels/archive/5717d9d2f7ca0662291910c52f1d7b95b568fec2.tar.gz",
60+
"url": "https://github.com/nixos/nixpkgs/archive/fc37cc679f168159a234f45a3861b1b7a414e304.tar.gz",
6161
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
6262
},
6363
"stylish-haskell": {

scripts/install-stack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
22

3-
curl -sSL https://raw.githubusercontent.com/commercialhaskell/stack/v2.3.1/etc/scripts/get-stack.sh | sh
3+
curl -sSL https://raw.githubusercontent.com/commercialhaskell/stack/v2.5.1/etc/scripts/get-stack.sh | sh

shell.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ let
1111

1212
sources = import ./nix/sources.nix;
1313
pkgs = import sources."nixpkgs" {};
14-
inherit (pkgs) cabal-install stack;
14+
15+
inherit (pkgs) cabal-install ghcid stack;
16+
inherit (pkgs) gnumake yq z3;
1517

1618
ghcide-project = default.pkgs.haskell-nix.project {
1719
src = sources."ghcide";
@@ -38,7 +40,6 @@ in
3840

3941
shellFor {
4042
buildInputs =
41-
with pkgs;
4243
[
4344
gnumake yq z3
4445
ghcide hie-bios

0 commit comments

Comments
 (0)