diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-01-28 22:19:23 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-01-28 22:19:23 +0100 |
| commit | 103cf020376d63e7b4aad3035dc1b196de1c7fc0 (patch) | |
| tree | 7cfa5534f616581903d1a1d35e60e9220b24bbdc /pkgs/development/libraries/libewf | |
| parent | 36103e9863cfabf660c07f7230fc5d2162f85b92 (diff) | |
| download | nixlib-103cf020376d63e7b4aad3035dc1b196de1c7fc0.tar nixlib-103cf020376d63e7b4aad3035dc1b196de1c7fc0.tar.gz nixlib-103cf020376d63e7b4aad3035dc1b196de1c7fc0.tar.bz2 nixlib-103cf020376d63e7b4aad3035dc1b196de1c7fc0.tar.lz nixlib-103cf020376d63e7b4aad3035dc1b196de1c7fc0.tar.xz nixlib-103cf020376d63e7b4aad3035dc1b196de1c7fc0.tar.zst nixlib-103cf020376d63e7b4aad3035dc1b196de1c7fc0.zip | |
libewf: 20140608 -> 20171104
Diffstat (limited to 'pkgs/development/libraries/libewf')
| -rw-r--r-- | pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch | 20 | ||||
| -rw-r--r-- | pkgs/development/libraries/libewf/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/libewf/default.upstream | 7 |
3 files changed, 5 insertions, 32 deletions
diff --git a/pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch b/pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch deleted file mode 100644 index 54878303589d..000000000000 --- a/pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch +++ /dev/null @@ -1,20 +0,0 @@ -Patch from Debian: -https://sources.debian.net/data/main/libe/libewf/20140608-6/debian/patches/04-fix-FTBFS-GCC5.patch - -Description: fix a FTBFS with GCC-5. Thanks to Linn Crosetto <linn@hp.com> for - the first fix (see #777938). This patch closes #777945. -Author: Joao Eriberto Mota Filho <eriberto@debian.org> -Last-Update: 2015-07-02 -Index: libewf-20140608/libuna/Makefile.am -=================================================================== ---- libewf-20140608.orig/libuna/Makefile.am -+++ libewf-20140608/libuna/Makefile.am -@@ -3,7 +3,7 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common \ - @LIBCSTRING_CPPFLAGS@ \ -- @LIBCERROR_CPPFLAGS@ -+ @LIBCERROR_CPPFLAGS@ -std=gnu89 - - noinst_LTLIBRARIES = libuna.la - diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index ec53b50b5af2..b1a6238a3780 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,16 +1,16 @@ { fetchurl, stdenv, zlib, openssl, libuuid, file, fuse, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - version = "20140608"; + version = "20171104"; name = "libewf-${version}"; + src = fetchurl { - url = "https://googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/libewf-20140608.tar.gz"; - sha256 = "0wfsffzxk934hl8cpwr14w8ixnh8d23x0xnnzcspjwi2c7730h6i"; + url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; + sha256 = "0h7036gpj5cryvh17aq6i2cpnbpwg5yswmfydxbbwvd9yfxd6dng"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib openssl libuuid ]; - patches = [ ./04-fix-FTBFS-GCC5.patch ]; meta = { description = "Library for support of the Expert Witness Compression Format"; diff --git a/pkgs/development/libraries/libewf/default.upstream b/pkgs/development/libraries/libewf/default.upstream deleted file mode 100644 index a071132463f8..000000000000 --- a/pkgs/development/libraries/libewf/default.upstream +++ /dev/null @@ -1,7 +0,0 @@ -url https://code.google.com/p/libewf/ -version_link 'googledrive[.]com' -version_link '[.]tar[.]' -do_overwrite () { - do_overwrite_just_version - set_var_value url "$CURRENT_URL" -} |