From 6683a5a2c1d65d2be3ceb7efbd7bc07a76e3c825 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Tue, 17 Mar 2015 14:40:29 +0100 Subject: [PATCH] Update putty derivation - Use source code tarball instead of svn. - Add meta information on package. --- .../networking/remote/putty/default.nix | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index e35f8c739c54..fe89ce61604e 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchsvn, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut -, libtool }: - -let - rev = 9690; -in -stdenv.mkDerivation { - name = "putty-${toString rev}"; - # builder = ./builder.sh; +{ stdenv, fetchurl, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut, libtool }: + +stdenv.mkDerivation rec { + version = "0.64"; + name = "putty-${version}"; + + src = fetchurl { + url = "http://the.earth.li/~sgtatham/putty/latest/${name}.tar.gz"; + sha256 = "089qbzd7w51sc9grm2x3lcbj61jdqsnakb4j4gnf6i2131xcjiia"; + }; preConfigure = '' perl mkfiles.pl @@ -17,14 +18,17 @@ stdenv.mkDerivation { ./mkauto.sh cd unix ''; - - # The hash is going to change on new snapshot. - # I don't know of any better URL - src = fetchsvn { - url = svn://svn.tartarus.org/sgt/putty; - rev = rev; - sha256 = "e1fb49766e0724a12776ec3d6cd0bd420e03ebdc3383a01a12dbfd30983f81ef"; - }; buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut libtool ]; + + meta = with stdenv.lib; { + description = "A Free Telnet/SSH Client"; + longDescription = '' + PuTTY is a free implementation of Telnet and SSH for Windows and Unix + platforms, along with an xterm terminal emulator. + It is written and maintained primarily by Simon Tatham. + ''; + homepage = http://www.chiark.greenend.org.uk/~sgtatham/putty/; + license = licenses.mit; + }; }