libpsl: list 2015-08-07 -> 2015-08-27
Use fetchFromGitHub for both list and library, removing fetchurl.
This commit is contained in:
parent
b653aac1cc
commit
328f68cb7e
@ -1,16 +1,16 @@
|
|||||||
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc
|
{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu
|
||||||
, icu, libxslt, pkgconfig }:
|
, libxslt, pkgconfig }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
version = "${libVersion}-list-${listVersion}";
|
version = "${libVersion}-list-${listVersion}";
|
||||||
|
|
||||||
listVersion = "2015-08-07";
|
listVersion = "2015-08-27";
|
||||||
listArchive = let
|
listSources = fetchFromGitHub {
|
||||||
rev = "de9af76664aa5fd89dfee3c44c56ba91c03eefab";
|
sha256 = "14kgxyfvvrwqyxmfy1by1pzbbv6hs9n744v8zr160rz8rln8lzb9";
|
||||||
in fetchurl {
|
rev = "1fc1ed365818a6a77d6f31d425ff03ca54cdc7f3";
|
||||||
sha256 = "007yxs92dffgapkqik6rfrng5af8hjzf8wd7hlff91q836k40abi";
|
repo = "list";
|
||||||
url = "https://codeload.github.com/publicsuffix/list/tar.gz/${rev}";
|
owner = "publicsuffix";
|
||||||
};
|
};
|
||||||
|
|
||||||
libVersion = "0.8.0";
|
libVersion = "0.8.0";
|
||||||
@ -35,7 +35,7 @@ in stdenv.mkDerivation {
|
|||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
# The libpsl check phase requires the list's test scripts (tests/) as well
|
# The libpsl check phase requires the list's test scripts (tests/) as well
|
||||||
tar --directory=list --strip-components=1 -xf "${listArchive}"
|
cp -Rv "${listSources}"/* list
|
||||||
'';
|
'';
|
||||||
configureFlags = "--disable-static --enable-gtk-doc --enable-man";
|
configureFlags = "--disable-static --enable-gtk-doc --enable-man";
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user