Skip to content

Commit 15fab0c

Browse files
committed
default.nix: Fixed with cabal2nix
1 parent eb0999d commit 15fab0c

File tree

1 file changed

+32
-12
lines changed

1 file changed

+32
-12
lines changed

default.nix

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,56 @@ let
55

66
inherit (nixpkgs) pkgs;
77

8-
f = { mkDerivation, base, brick, hpack, microlens, process
9-
, stdenv, vector, vty
10-
}:
8+
f =
9+
{ mkDerivation
10+
, base
11+
, brick
12+
, hpack
13+
, hspec
14+
, microlens
15+
, process
16+
, stdenv
17+
, vector
18+
, vty
19+
}:
1120
mkDerivation {
1221
pname = "git-brunch";
1322
version = "1.1.0.0";
1423
src = ./.;
15-
isLibrary = true;
24+
isLibrary = false;
1625
isExecutable = true;
17-
libraryHaskellDepends = [
18-
base brick microlens process vector vty
19-
];
2026
libraryToolDepends = [ hpack ];
2127
executableHaskellDepends = [
22-
base brick microlens process vector vty
28+
base
29+
brick
30+
microlens
31+
process
32+
vector
33+
vty
34+
];
35+
testHaskellDepends = [
36+
base
37+
brick
38+
hspec
39+
microlens
40+
process
41+
vector
42+
vty
2343
];
24-
testHaskellDepends = [ base brick microlens process vector vty ];
2544
prePatch = "hpack";
2645
homepage = "https://github.com/andys8/git-brunch#readme";
46+
description = "git checkout command-line tool";
2747
license = stdenv.lib.licenses.bsd3;
2848
};
2949

3050
haskellPackages = if compiler == "default"
31-
then pkgs.haskellPackages
32-
else pkgs.haskell.packages.${compiler};
51+
then pkgs.haskellPackages
52+
else pkgs.haskell.packages.${compiler};
3353

3454
variant = if doBenchmark then pkgs.haskell.lib.doBenchmark else pkgs.lib.id;
3555

3656
drv = variant (haskellPackages.callPackage f {});
3757

3858
in
3959

40-
if pkgs.lib.inNixShell then drv.env else drv
60+
if pkgs.lib.inNixShell then drv.env else drv

0 commit comments

Comments
 (0)