diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-08-31 23:57:52 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-08-31 23:59:16 +0200 |
| commit | 328f68cb7ebbfadd511b3fd515cfeba4c80523f8 (patch) | |
| tree | 4d4bcf241af5cacb59352cfa61d3041c16eedaa3 /pkgs/development/libraries/libpsl | |
| parent | b653aac1ccf40acee51fc6240b63c12f17e23a1a (diff) | |
| download | nixpkgs-328f68cb7ebbfadd511b3fd515cfeba4c80523f8.tar nixpkgs-328f68cb7ebbfadd511b3fd515cfeba4c80523f8.tar.gz nixpkgs-328f68cb7ebbfadd511b3fd515cfeba4c80523f8.tar.bz2 nixpkgs-328f68cb7ebbfadd511b3fd515cfeba4c80523f8.tar.lz nixpkgs-328f68cb7ebbfadd511b3fd515cfeba4c80523f8.tar.xz nixpkgs-328f68cb7ebbfadd511b3fd515cfeba4c80523f8.tar.zst nixpkgs-328f68cb7ebbfadd511b3fd515cfeba4c80523f8.zip | |
libpsl: list 2015-08-07 -> 2015-08-27
Use fetchFromGitHub for both list and library, removing fetchurl.
Diffstat (limited to 'pkgs/development/libraries/libpsl')
| -rw-r--r-- | pkgs/development/libraries/libpsl/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 883ba807eda..1c651f72ede 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc -, icu, libxslt, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu +, libxslt, pkgconfig }: let version = "${libVersion}-list-${listVersion}"; - listVersion = "2015-08-07"; - listArchive = let - rev = "de9af76664aa5fd89dfee3c44c56ba91c03eefab"; - in fetchurl { - sha256 = "007yxs92dffgapkqik6rfrng5af8hjzf8wd7hlff91q836k40abi"; - url = "https://codeload.github.com/publicsuffix/list/tar.gz/${rev}"; + listVersion = "2015-08-27"; + listSources = fetchFromGitHub { + sha256 = "14kgxyfvvrwqyxmfy1by1pzbbv6hs9n744v8zr160rz8rln8lzb9"; + rev = "1fc1ed365818a6a77d6f31d425ff03ca54cdc7f3"; + repo = "list"; + owner = "publicsuffix"; }; libVersion = "0.8.0"; @@ -35,7 +35,7 @@ in stdenv.mkDerivation { preConfigure = '' # 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"; |