From 70b174d79dddf424a10f1fbf8373bf5ee88ad661 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 11 Mar 2017 10:20:59 +0100 Subject: [PATCH] Revert "libarchive: 3.2.2 -> 3.3.1" This reverts commit 051b3b3b7876cff28f6815a843f6d4e165299686. This is a mass rebuild and should go into staging. --- pkgs/development/libraries/libarchive/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 883273f188c..89e2762e3cc 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -10,13 +10,20 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { name = "libarchive-${version}"; - version = "3.3.1"; + version = "3.2.2"; src = fetchurl { url = "${meta.homepage}/downloads/${name}.tar.gz"; - sha256 = "1rr40hxlm9vy5z2zb5w7pyfkgd1a4s061qapm83s19accb8mpji9"; + sha256 = "03q6y428rg723c9fj1vidzjw46w1vf8z0h95lkvz1l9jw571j739"; }; + patches = [ + (fetchurl { + url = "https://github.com/libarchive/libarchive/commit/98dcbbf0bf4854bf987557e55e55fff7abbf3ea9.patch"; + sha256 = "1934krf5imc9rq1av6immpsfn77pglanhz1csq8j22h9ab87n5z6"; + }) + ]; + outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig ];