cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #169083 from dotlambda/advancecomp-2.3

Browse source 
advancecomp: 2.1 -> 2.3
This commit is contained in:
7c6f434c 2022-04-17 20:27:29 +00:00 committed by GitHub
commit 63f81838e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/tools/compression/advancecomp/default.nix
View file

@ -1,40 +1,23 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, autoreconfHook , autoreconfHook
, zlib , zlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "advancecomp"; pname = "advancecomp";
version = "2.1"; version = "2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "amadvance"; owner = "amadvance";
repo = "advancecomp"; repo = "advancecomp";
rev = "v${version}"; rev = "v${version}";
sha256 = "1pd6czamamrd0ppk5a3a65hcgdlqwja98aandhqiajhnibwldv8x"; hash = "sha256-klyTqqZs5TwadgDP8LJ1wUhXlO+/kQPM6qhiSki31Q8=";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];
patches = [
(fetchpatch {
name = "CVE-2019-9210.patch";
url = "https://github.com/amadvance/advancecomp/commit/fcf71a89265c78fc26243574dda3a872574a5c02.patch";
sha256 = "0cdv9g87c1y8zwhqkd9ba2zjw4slcvg7yzcqv43idvnwb5fl29n7";
excludes = [ "doc/history.d" ];
})
# Pull upstream fix for gcc-11:
(fetchpatch {
name = "gcc-11.patch";
url = "https://github.com/amadvance/advancecomp/commit/7b08f7a2af3f66ab95437e4490499cebb20e5e41.patch";
sha256 = "0gpppq6b760m1429g7d808ipdgb4lrqc1b6xk2457y66pbaiwc9s";
})
];
# autover.sh relies on 'git describe', which obviously doesn't work as we're not cloning # autover.sh relies on 'git describe', which obviously doesn't work as we're not cloning
# the full git repo. so we have to put the version number in `.version`, otherwise # the full git repo. so we have to put the version number in `.version`, otherwise
# the binaries get built reporting "none" as their version number. # the binaries get built reporting "none" as their version number.