Skip to content

Commit

Permalink
Bump version to v1.4.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
andys8 committed Aug 12, 2020
1 parent 9954611 commit 814029d
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 39 deletions.
76 changes: 39 additions & 37 deletions default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ nixpkgs ? import <nixpkgs> {}, compiler ? "default", doBenchmark ? false }:
{ nixpkgs ? import <nixpkgs> { }, compiler ? "default", doBenchmark ? false }:
let
inherit (nixpkgs) pkgs;

Expand All @@ -15,45 +15,47 @@ let
, vector
, vty
}:
mkDerivation {
pname = "git-brunch";
version = "1.3.1.0";
src = ./.;
isLibrary = false;
isExecutable = true;
libraryToolDepends = [ hpack ];
executableHaskellDepends = [
base
brick
hspec
microlens
optparse-applicative
process
vector
vty
];
testHaskellDepends = [
base
brick
hspec
microlens
optparse-applicative
process
vector
vty
];
prePatch = "hpack";
homepage = "https://github.com/andys8/git-brunch#readme";
description = "git checkout command-line tool";
license = stdenv.lib.licenses.bsd3;
};
mkDerivation {
pname = "git-brunch";
version = "1.4.0.0";
src = ./.;
isLibrary = false;
isExecutable = true;
libraryToolDepends = [ hpack ];
executableHaskellDepends = [
base
brick
hspec
microlens
optparse-applicative
process
vector
vty
];
testHaskellDepends = [
base
brick
hspec
microlens
optparse-applicative
process
vector
vty
];
prePatch = "hpack";
homepage = "https://github.com/andys8/git-brunch#readme";
description = "git checkout command-line tool";
license = stdenv.lib.licenses.bsd3;
};

haskellPackages = if compiler == "default"
then pkgs.haskellPackages
else pkgs.haskell.packages.${compiler};
haskellPackages =
if compiler == "default"
then pkgs.haskellPackages
else pkgs.haskell.packages.${compiler};

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

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

in
if pkgs.lib.inNixShell then drv.env else drv
4 changes: 2 additions & 2 deletions package.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: git-brunch
version: 1.3.1.0
version: 1.4.0.0
github: "andys8/git-brunch"
license: BSD3
author: "andys8"
Expand All @@ -12,7 +12,7 @@ extra-source-files:
synopsis: git checkout command-line tool
category: Git

description: Please see the README on GitHub at <https://github.com/andys8/git-brunch#readme>
description: Please see the README on GitHub at <https://github.com/andys8/git-brunch>

dependencies:
- base >= 4.7 && < 5
Expand Down

0 comments on commit 814029d

Please sign in to comment.