diff options
Diffstat (limited to 'pkgs/development/libraries/openjpeg/2.x.nix')
| -rw-r--r-- | pkgs/development/libraries/openjpeg/2.x.nix | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix index fe0e5aeb69147..edb9c9bf8c908 100644 --- a/pkgs/development/libraries/openjpeg/2.x.nix +++ b/pkgs/development/libraries/openjpeg/2.x.nix @@ -1,10 +1,10 @@ { callPackage, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2.3.1"; - branch = "2.3"; + version = "2.4.0"; + branch = "2.4"; revision = "v${version}"; - sha256 = "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"; + sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf"; extraFlags = [ "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}" @@ -14,24 +14,8 @@ callPackage ./generic.nix (args // rec { patches = [ ./fix-cmake-config-includedir.patch (fetchpatch { - url = "https://github.com/uclouvain/openjpeg/commit/21399f6b7d318fcdf4406d5e88723c4922202aa3.patch"; - name = "CVE-2019-12973-1.patch"; - sha256 = "161yvnfbzy2016qqapm0ywfgglgs1v8ljnk6fj8d2bwdh1cxxz8f"; - }) - (fetchpatch { - url = "https://github.com/uclouvain/openjpeg/commit/3aef207f90e937d4931daf6d411e092f76d82e66.patch"; - name = "CVE-2019-12973-2.patch"; - sha256 = "1jkkfw13l7nx4hxdhc7z17f4vfgqcaf09zpl235kypbxx1ygc7vq"; - }) - (fetchpatch { - url = "https://github.com/uclouvain/openjpeg/commit/024b8407392cb0b82b04b58ed256094ed5799e04.patch"; - name = "CVE-2020-6851.patch"; - sha256 = "1lfwlzqxb69cwzjp8v9lijz4c2qhf3b8m6sq1khipqlgrb3l58xw"; - }) - (fetchpatch { - url = "https://github.com/uclouvain/openjpeg/commit/05f9b91e60debda0e83977e5e63b2e66486f7074.patch"; - name = "CVE-2020-8112.patch"; - sha256 = "16kykc8wbq9kx9w9kkf3i7snak82m184qrl9bpxvkjl7h0n9aw49"; + url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch"; + sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8"; }) ]; }) |