From 03d7679392a2017afedb044212cae82a440143a5 Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Mon, 2 Sep 2019 21:56:17 +0200 Subject: [PATCH 1/2] miller: 5.4.0 -> 5.5.0 --- pkgs/tools/text/miller/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 9de7efa3a816..cd40b76b4518 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -1,15 +1,13 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }: +{ stdenv, fetchurl, autoreconfHook, flex, libtool }: stdenv.mkDerivation rec { pname = "miller"; - version = "5.4.0"; + version = "5.5.0"; - src = fetchFromGitHub { - owner = "johnkerl"; - repo = "miller"; - rev = "${version}"; - sha256 = "0158by642frh9x6rrgqxwmk4766wb36kp0rrjg5swdbs9w3is3xg"; + src = fetchurl { + url = "https://github.com/johnkerl/miller/releases/download/v${version}/mlr-${version}.tar.gz"; + sha256 = "06pkmqfv325igpcyjcq6sqr1r6gab7a7qdfw6kw6a6kwksgk5f8d"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; From 36c72f3632e23e8cd155e16639660f33d4502c9f Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Tue, 3 Sep 2019 00:42:25 +0200 Subject: [PATCH 2/2] miller: back to fetchFromGitHub --- pkgs/tools/text/miller/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index cd40b76b4518..d271490ca1c1 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, autoreconfHook, flex, libtool }: +{ stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }: stdenv.mkDerivation rec { pname = "miller"; version = "5.5.0"; - src = fetchurl { - url = "https://github.com/johnkerl/miller/releases/download/v${version}/mlr-${version}.tar.gz"; - sha256 = "06pkmqfv325igpcyjcq6sqr1r6gab7a7qdfw6kw6a6kwksgk5f8d"; + src = fetchFromGitHub { + owner = "johnkerl"; + repo = "miller"; + rev = "v${version}"; + sha256 = "1zkh87vq0gqcx6z6yzf1rq30jmdgdpp0rx5f0vvl0zcn0hc2smpz"; }; nativeBuildInputs = [ autoreconfHook flex libtool ];