Skip to content

Commit 9085614

Browse files
committed
WIP
1 parent 4f407ed commit 9085614

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

test/with-nixpkgs-ghc/default.nix

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{ with-nixpkgs ? true }:
12
let
23

34
haskell-nix = import ../../default.nix { };
@@ -17,14 +18,12 @@ let
1718
);
1819

1920
pkgs = import nixpkgs {
20-
system = __currentSystem;
2121
inherit (haskell-nix) config;
2222
overlays = [
23-
# haskell-nix.overlays.haskell
24-
# haskell-nix.overlays.tools
2523
haskell-nix.overlay
26-
o2
27-
];
24+
]
25+
++
26+
(if with-nixpkgs then [ o2 ] else [ ]);
2827
};
2928

3029
prj = pkgs.haskell-nix.cabalProject {
@@ -35,4 +34,3 @@ let
3534
in
3635

3736
prj.plan-nix
38-

0 commit comments

Comments
 (0)