about summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorYannik Rödel <hey@yannik.info>2022-10-30 14:04:45 +0100
committerJan Tojnar <jtojnar@gmail.com>2022-11-02 12:56:50 +0100
commitca9eb8eee37736e4ae2d493136597e1edb3f813d (patch)
tree678eff776b5b0d8da6709457d6c6986c5768f91b /pkgs/development/libraries
parentd40fea9aeb8840fea0d377baa4b38e39b9582458 (diff)
poppler: 22.08.0 -> 22.09.0
https://lists.freedesktop.org/archives/poppler/2022-August/015313.html
https://gitlab.freedesktop.org/poppler/poppler/-/compare/poppler-22.08.0...poppler-22.09.0

CVE-2022-38784
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/poppler/default.nix15
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 8ff218b79316c..a4311e7fcd057 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchurl
-, fetchpatch
 , fetchFromGitLab
 , cairo
 , cmake
@@ -43,28 +42,20 @@ let
     owner = "poppler";
     repo = "test";
     rev = "920c89f8f43bdfe8966c8e397e7f67f5302e9435";
-    sha256 = "sha256-ySP7zcVI3HW4lk8oqVMPTlFh5pgvBwqcE0EXE71iWos=";
+    hash = "sha256-ySP7zcVI3HW4lk8oqVMPTlFh5pgvBwqcE0EXE71iWos=";
   };
 in
 stdenv.mkDerivation (finalAttrs: rec {
   pname = "poppler-${suffix}";
-  version = "22.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
+  version = "22.09.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
-    sha256 = "sha256-tJMyhyFALyXLdSP5zcL318WfRa2Zm951xjyQYE2w8gs=";
+    hash = "sha256-16j3SCETWcrbd0uj4Y7NpkZLNAJwRcBkjrMNWFKkHi4=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2022-38784.patch";
-      url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/27354e9d9696ee2bc063910a6c9a6b27c5184a52.patch";
-      sha256 = "sha256-M12zaHxcgQB/37tHffllqzd+Juq9BH5gpKVGaRY00vI=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     ninja