From 5708e6aa25e3c33dd04a7485277fe08f86cc5b1f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 7 Jan 2022 10:47:47 -0300 Subject: [PATCH] spigot: 20200901 -> 20210527 --- pkgs/tools/misc/spigot/default.nix | 39 ++++++++++++++++++------------ 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/spigot/default.nix b/pkgs/tools/misc/spigot/default.nix index a088705036d0..fbbae937a8d9 100644 --- a/pkgs/tools/misc/spigot/default.nix +++ b/pkgs/tools/misc/spigot/default.nix @@ -1,36 +1,43 @@ { lib , stdenv -, buildPackages -, fetchgit -, autoreconfHook +, fetchurl +, cmake , gmp -, ncurses , halibut +, ncurses , perl }: stdenv.mkDerivation rec { pname = "spigot"; - version = "20200901"; - src = fetchgit { - url = "https://git.tartarus.org/simon/spigot.git"; - rev = "9910e5bdc203bae6b7bbe1ed4a93f13755c1cae"; - sha256 = "1az6v9gk0g2k197lr288nmr9jv20bvgc508vn9ic3v7mav7hf5bf"; + version = "20210527"; + srcVersion = "20210527.7dd3cfd"; + + src = fetchurl { + url = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/${pname}-${srcVersion}.tar.gz"; + hash = "sha256-EBS3lgfLtsyBQ8mzoJPyZhRBJNmkVSeF5XecGgcvqtw="; }; - nativeBuildInputs = [ autoreconfHook halibut perl ]; + nativeBuildInputs = [ + cmake + halibut + perl + ]; - configureFlags = [ "--with-gmp" ]; + buildInputs = [ + gmp + ncurses + ]; - buildInputs = [ gmp ncurses ]; + outputs = [ "out" "man" ]; strictDeps = true; meta = with lib; { - description = "A command-line exact real calculator"; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = with maintainers; [ mcbeth ]; + description = "A command-line exact real calculator"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres mcbeth ]; + platforms = platforms.unix; }; }