Skip to content

Commit 3ce6d7f

Browse files
committed
fix musl
1 parent ec2c9e4 commit 3ce6d7f

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

Diff for: .envrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
use flake . --impure
1+
use nix

Diff for: default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
let
22
# Read in the Niv sources
33
sources = {
4-
haskellNix = builtins.fetchTarball "https://github.com/input-output-hk/haskell.nix/archive/refs/tags/0.0.58.tar.gz";
4+
haskellNix = builtins.fetchTarball "https://github.com/input-output-hk/haskell.nix/archive/refs/tags/0.0.66.tar.gz";
55
};
66

77
# If ./nix/sources.nix file is not found run:
@@ -18,7 +18,7 @@ let
1818
# haskell.nix provides access to the nixpkgs pins which are used by our CI,
1919
# hence you will be more likely to get cache hits when using these.
2020
# But you can also just use your own, e.g. '<nixpkgs>'.
21-
haskellNix.sources.nixpkgs-2205
21+
haskellNix.sources.nixpkgs-unstable
2222
# These arguments passed to nixpkgs, include some patches and also
2323
# the haskell.nix functionality itself as an overlay.
2424
haskellNix.nixpkgsArgs;

Diff for: shell.nix

+6-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
1-
with (import ./nixpkgs.nix);
2-
3-
haskell.lib.buildStackProject {
4-
name = "dhall-secret-dev-env";
5-
src = ./.;
6-
shellHook = ''
7-
export AWS_REGION=ap-southeast-2
8-
export MY_AES_SECRET=super-secure-secret
9-
'';
10-
buildInputs = [
11-
stack
12-
zlib.dev
13-
age
14-
haskell.compiler.ghc8107
15-
];
1+
(import ./default.nix).shellFor {
2+
tools = {
3+
cabal = "latest";
4+
# hlint = "latest";
5+
haskell-language-server = "latest";
6+
};
167
}

0 commit comments

Comments
 (0)