mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-09 13:43:50 +00:00
libarchive: 3.6.2 -> 3.7.2
https://github.com/libarchive/libarchive/releases/tag/v3.7.0 https://github.com/libarchive/libarchive/releases/tag/v3.7.1 https://github.com/libarchive/libarchive/releases/tag/v3.7.2
This commit is contained in:
parent
45ed3777a5
commit
e81936d59e
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, acl
|
||||
, attr
|
||||
, autoreconfHook
|
||||
@ -23,36 +22,22 @@
|
||||
, cmake
|
||||
, nix
|
||||
, samba
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
let
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
in
|
||||
assert xarSupport -> libxml2 != null;
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libarchive";
|
||||
version = "3.6.2";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libarchive";
|
||||
repo = "libarchive";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-wQbA6vlXH8pnpY7LJLkjrRFEBpcaPR1SqxnK71UVwxg=";
|
||||
hash = "sha256-p2JgJ/rvqaQ6yyXSh+ehScUH565ud5bQncl+lOnsWfc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "dev" ];
|
||||
|
||||
patches = [
|
||||
# fixes static linking; upstream in releases after 3.6.2
|
||||
# https://github.com/libarchive/libarchive/pull/1825 merged upstream
|
||||
(assert finalAttrs.version == "3.6.2"; fetchpatch {
|
||||
name = "001-only-add-iconv-to-pc-file-if-needed.patch";
|
||||
url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch";
|
||||
hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = let
|
||||
skipTestPaths = [
|
||||
# test won't work in nix sandbox
|
||||
|
Loading…
Reference in New Issue
Block a user