diff options
| author | TredwellGit <tredwell@tutanota.com> | 2020-09-30 12:44:00 +0000 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-10-06 09:54:46 +0200 |
| commit | 9702f49ec63f8420938bb0750c46d95b56efdfd9 (patch) | |
| tree | 141685bf455c59e50e77d08e6300249f02609244 /pkgs/development/libraries/libjpeg-turbo | |
| parent | 13eb51b092e48fb343affc431942ef88716a6be6 (diff) | |
| download | nixpkgs-9702f49ec63f8420938bb0750c46d95b56efdfd9.tar nixpkgs-9702f49ec63f8420938bb0750c46d95b56efdfd9.tar.gz nixpkgs-9702f49ec63f8420938bb0750c46d95b56efdfd9.tar.bz2 nixpkgs-9702f49ec63f8420938bb0750c46d95b56efdfd9.tar.lz nixpkgs-9702f49ec63f8420938bb0750c46d95b56efdfd9.tar.xz nixpkgs-9702f49ec63f8420938bb0750c46d95b56efdfd9.tar.zst nixpkgs-9702f49ec63f8420938bb0750c46d95b56efdfd9.zip | |
libjpeg: 2.0.4 -> 2.0.5
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.5
Diffstat (limited to 'pkgs/development/libraries/libjpeg-turbo')
| -rw-r--r-- | pkgs/development/libraries/libjpeg-turbo/default.nix | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 36838341fe2..2a25a565a8f 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,30 +1,18 @@ -{ stdenv, fetchurl, fetchpatch, cmake, nasm, enableStatic ? false, enableShared ? true }: +{ stdenv, fetchFromGitHub, cmake, nasm, enableStatic ? false, enableShared ? true }: stdenv.mkDerivation rec { pname = "libjpeg-turbo"; - version = "2.0.4"; + version = "2.0.5"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "01ill8bgjyk582wipx7sh7gj2nidylpbzvwhx0wkcm6mxx3qbp9k"; + src = fetchFromGitHub { + owner = "libjpeg-turbo"; + repo = "libjpeg-turbo"; + rev = version; + sha256 = "0p32yivybxdicm01qa9h1vj91apygzxpvnklrjmbx8z9z2l3qxc9"; }; patches = - [ - # Fixes race in tests that causes "jpegtran-shared-icc" to fail - # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/425 - (fetchpatch { - url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a2291b252de1413a13db61b21863ae7aea0946f3.patch"; - sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym"; - }) - - (fetchpatch { - name = "cve-2020-13790.patch"; - url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3de15e0c344d.diff"; - sha256 = "0hm5i6qir5w3zxb0xvqdh4jyvbfg7xnd28arhyfsaclfz9wdb0pb"; - }) - ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; @@ -41,7 +29,7 @@ stdenv.mkDerivation rec { installCheckTarget = "test"; meta = with stdenv.lib; { - homepage = "http://libjpeg-turbo.virtualgl.org/"; + homepage = "https://libjpeg-turbo.org/"; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses maintainers = with maintainers; [ vcunat colemickens ]; |