Skip to content

Commit 1f262ed

Browse files
committed
v1.6.0
1 parent 2d3cf73 commit 1f262ed

File tree

3 files changed

+33
-67
lines changed

3 files changed

+33
-67
lines changed

default.nix

Lines changed: 31 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,42 @@
1-
{ nixpkgs ? import <nixpkgs> { }, compiler ? "default", doBenchmark ? false }:
1+
{ nixpkgs ? import <nixpkgs> {}, compiler ? "default", doBenchmark ? false }:
22

33
let
44

55
inherit (nixpkgs) pkgs;
66

7-
f =
8-
{ mkDerivation
9-
, base
10-
, brick
11-
, extra
12-
, hpack
13-
, hspec
14-
, lib
15-
, microlens
16-
, microlens-mtl
17-
, mtl
18-
, optparse-applicative
19-
, process
20-
, text
21-
, vector
22-
, vty
23-
}:
24-
mkDerivation {
25-
pname = "git-brunch";
26-
version = "1.5.1.0";
27-
src = ./.;
28-
isLibrary = false;
29-
isExecutable = true;
30-
libraryToolDepends = [ hpack ];
31-
executableHaskellDepends = [
32-
base
33-
brick
34-
extra
35-
hspec
36-
microlens
37-
microlens-mtl
38-
mtl
39-
optparse-applicative
40-
process
41-
text
42-
vector
43-
vty
44-
];
45-
testHaskellDepends = [
46-
base
47-
brick
48-
extra
49-
hspec
50-
microlens
51-
microlens-mtl
52-
mtl
53-
optparse-applicative
54-
process
55-
text
56-
vector
57-
vty
58-
];
59-
prePatch = "hpack";
60-
homepage = "https://github.com/andys8/git-brunch#readme";
61-
description = "git checkout command-line tool";
62-
license = lib.licenses.bsd3;
63-
};
64-
65-
haskellPackages =
66-
if compiler == "default"
67-
then pkgs.haskellPackages
68-
else pkgs.haskell.packages.${compiler};
7+
f = { mkDerivation, base, brick, extra, hpack, hspec, lib
8+
, microlens, microlens-mtl, mtl, optparse-applicative, process
9+
, text, vector, vty
10+
}:
11+
mkDerivation {
12+
pname = "git-brunch";
13+
version = "1.6.0.0";
14+
src = ./.;
15+
isLibrary = false;
16+
isExecutable = true;
17+
libraryToolDepends = [ hpack ];
18+
executableHaskellDepends = [
19+
base brick extra hspec microlens microlens-mtl mtl
20+
optparse-applicative process text vector vty
21+
];
22+
testHaskellDepends = [
23+
base brick extra hspec microlens microlens-mtl mtl
24+
optparse-applicative process text vector vty
25+
];
26+
prePatch = "hpack";
27+
homepage = "https://github.com/andys8/git-brunch#readme";
28+
description = "git checkout command-line tool";
29+
license = lib.licenses.bsd3;
30+
};
31+
32+
haskellPackages = if compiler == "default"
33+
then pkgs.haskellPackages
34+
else pkgs.haskell.packages.${compiler};
6935

7036
variant = if doBenchmark then pkgs.haskell.lib.doBenchmark else pkgs.lib.id;
7137

72-
drv = variant (haskellPackages.callPackage f { });
38+
drv = variant (haskellPackages.callPackage f {});
7339

7440
in
7541

76-
if pkgs.lib.inNixShell then drv.env else drv
42+
if pkgs.lib.inNixShell then drv.env else drv

git-brunch.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cabal-version: 1.12
55
-- see: https://github.com/sol/hpack
66

77
name: git-brunch
8-
version: 1.5.1.0
8+
version: 1.6.0.0
99
synopsis: git checkout command-line tool
1010
description: Please see the README on GitHub at <https://github.com/andys8/git-brunch>
1111
category: Git

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: git-brunch
2-
version: 1.5.1.0
2+
version: 1.6.0.0
33
github: "andys8/git-brunch"
44
license: BSD3
55
author: "andys8"

0 commit comments

Comments
 (0)