diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
commit | 4aad2947f8d680f18e5b01e115cf8cff22186998 (patch) | |
tree | a7a3d020efc6ec7be822bc06e08eca3ac311c9e2 /pkgs/tools/text | |
parent | 2c5835b09a1d4966756212902d36b1b8ab242da6 (diff) | |
parent | 1d8a3973f46a2d1360f855eaa0f3a19859771793 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/miller/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/shab/default.nix | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 9de7efa3a816..d271490ca1c1 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "miller"; - version = "5.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; - rev = "${version}"; - sha256 = "0158by642frh9x6rrgqxwmk4766wb36kp0rrjg5swdbs9w3is3xg"; + rev = "v${version}"; + sha256 = "1zkh87vq0gqcx6z6yzf1rq30jmdgdpp0rx5f0vvl0zcn0hc2smpz"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/tools/text/shab/default.nix index 73323c784fd7..02d2d545122a 100644 --- a/pkgs/tools/text/shab/default.nix +++ b/pkgs/tools/text/shab/default.nix @@ -19,7 +19,6 @@ let done ''; - doBuild = false; doCheck = true; doInstallCheck = true; |