libpsl: 0.7.1 -> 0.8.0

1 files changed, 37 insertions, 14 deletions

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index c304b9e6930f..a64d3b108c2f 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -1,16 +1,48 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, icu, libxslt, pkgconfig }:
+{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, icu, libxslt
+, pkgconfig }:
 
-let version = "0.7.1"; in
-stdenv.mkDerivation rec {
+let
+
+  version = "${libVersion}-list-${listVersion}";
+
+  listVersion = "2015-08-03";
+  listArchive = let
+    rev = "447962d71bf512fe41e828afc7fa66a1701c7c3c";
+  in fetchurl {
+    sha256 = "0gp0cb6p8yvyy5kvgdwg45ian9rb07bb0a9ibdj58g21l54mx3r2";
+    url = "https://codeload.github.com/publicsuffix/list/tar.gz/${rev}";
+  };
+
+  libVersion = "0.8.0";
+
+in stdenv.mkDerivation {
   name = "libpsl-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0hbsidbmwgpg0h48wh2pzsq59j8az7naz3s5q3yqn99yyjji2vgw";
-    rev = name;
+    sha256 = "0mjnj36igk6w3c0d4k2fqqg1kl6bpnxfrcgcgz1zdw33gfa5gdi7";
+    rev = "libpsl-${libVersion}";
     repo = "libpsl";
     owner = "rockdaboot";
   };
 
+  buildInputs = [ icu libxslt ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  preAutoreconf = ''
+    echo "EXTRA_DIST =" > gtk-doc.make
+    echo "CLEANFILES =" >> gtk-doc.make
+  '';
+
+  preConfigure = ''
+    # The libpsl check phase requires the list's test scripts (tests/) as well
+    tar --directory=list --strip-components=1 -xf "${listArchive}"
+  '';
+  configureFlags = "--disable-static --enable-man";
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
   meta = with stdenv.lib; {
     inherit version;
     description = "C library for the Publix Suffix List";
@@ -26,13 +58,4 @@ stdenv.mkDerivation rec {
     platforms = with platforms; linux ++ darwin;
     maintainers = with maintainers; [ nckx ];
   };
-
-  buildInputs = [ icu libxslt ];
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
-  configureFlags = "--disable-static --enable-man";
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
 }