diff options
author | Andreas Rammhold <andreas@rammhold.de> | 2019-07-20 23:53:56 +0200 |
---|---|---|
committer | Andreas Rammhold <andreas@rammhold.de> | 2019-07-20 23:58:53 +0200 |
commit | 2c5763538ab481f95cd40bce13b526958a87394d (patch) | |
tree | 3e3dcdac6517aae857582d4f96acfd88c9f14155 /pkgs/development/libraries/libarchive/default.nix | |
parent | 863f821bdf1a7c86e575855f603c41f41b7873ee (diff) | |
download | nixpkgs-2c5763538ab481f95cd40bce13b526958a87394d.tar nixpkgs-2c5763538ab481f95cd40bce13b526958a87394d.tar.gz nixpkgs-2c5763538ab481f95cd40bce13b526958a87394d.tar.bz2 nixpkgs-2c5763538ab481f95cd40bce13b526958a87394d.tar.lz nixpkgs-2c5763538ab481f95cd40bce13b526958a87394d.tar.xz nixpkgs-2c5763538ab481f95cd40bce13b526958a87394d.tar.zst nixpkgs-2c5763538ab481f95cd40bce13b526958a87394d.zip |
libarchive: 3.3.3 -> 3.4.0
Release notes: https://github.com/libarchive/libarchive/releases/tag/v3.4.0
Diffstat (limited to 'pkgs/development/libraries/libarchive/default.nix')
-rw-r--r-- | pkgs/development/libraries/libarchive/default.nix | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index f2a1c500a8b..3cf8a6da736 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,5 +1,5 @@ { - fetchurl, fetchpatch, stdenv, pkgconfig, + fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, # Optional but increases closure only negligibly. @@ -10,31 +10,18 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { name = "libarchive-${version}"; - version = "3.3.3"; + version = "3.4.0"; - src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.gz"; - sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms"; + src = fetchFromGitHub { + owner = "libarchive"; + repo = "libarchive"; + rev = "v${version}"; + sha256 = "063f5bw9qmksj3iy6094qxwawx174cx00q1fg6l698wqw7xn8ihq"; }; - patches = [ - (fetchpatch { - # details: https://github.com/libarchive/libarchive/pull/1105 - name = "cve-2018-1000877.diff"; # CVE-2018-1000877..80 - url = "https://github.com/libarchive/libarchive/pull/1105.diff"; - sha256 = "0mxcawfdy9m40mykzwhkl39a6vnh4ypgy0ipcz74qm4bi72x0gyf"; - }) - (fetchpatch { - # details: https://github.com/libarchive/libarchive/pull/1120 - name = "cve-2019-1000019_cve-2019-1000020.diff"; - url = "https://github.com/libarchive/libarchive/pull/1120.diff"; - sha256 = "1mgx92v8hm7hw9j34nbfriqfkxshh3cy25rhavr7kl7lz4x5a6g4"; - }) - ]; - outputs = [ "out" "lib" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ sharutils zlib bzip2 openssl xz lzo ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] ++ stdenv.lib.optional xarSupport libxml2; |