1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00

Merge pull request #107132 from marsam/update-zstd

zstd: 1.4.5 -> 1.4.8
This commit is contained in:
Mario Rodas 2020-12-29 19:43:29 -05:00 committed by GitHub
commit d07c724b5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, bash, gnugrep
{ stdenv, fetchFromGitHub, cmake, bash, gnugrep
, fixDarwinDylibNames
, file
, legacySupport ? false
@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "zstd";
version = "1.4.5";
version = "1.4.8";
src = fetchFromGitHub {
owner = "facebook";
repo = "zstd";
rev = "v${version}";
sha256 = "0ay3qlk4sffnmcl3b34q4zd7mkcmjds023icmib1mdli97qcp38l";
sha256 = "018zgigp5xlrb4mgshgrvns0cfbhhcg89cifbjj4rv6s3n9riphw";
};
nativeBuildInputs = [ cmake ]
@ -22,10 +22,6 @@ stdenv.mkDerivation rec {
patches = [
./playtests-darwin.patch
(fetchpatch {
url = "https://github.com/facebook/zstd/pull/2163.patch";
sha256 = "07mfjc5f9wy0w2xlj36hyf7g5ax9r2rf6ixhkffhnwc6rwy0q54p";
})
] # This I didn't upstream because if you use posix threads with MinGW it will
# work fine, and I'm not sure how to write the condition.
++ stdenv.lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch;
@ -88,6 +84,7 @@ stdenv.mkDerivation rec {
property shared by most LZ compression algorithms, such as zlib.
'';
homepage = "https://facebook.github.io/zstd/";
changelog = "https://github.com/facebook/zstd/blob/v${version}/CHANGELOG";
license = with licenses; [ bsd3 ]; # Or, at your opinion, GPL-2.0-only.
platforms = platforms.all;