diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-11-02 15:45:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-02 15:45:27 +0100 |
| commit | 6b10854c8194f1ebaa5bce623e71c6da1c008861 (patch) | |
| tree | ceb1fe7a82c42c0c680ccf2175253a2a642fd191 /pkgs/development/libraries | |
| parent | 3170af7cf7f16e79f08ceba5c06e1e9baa986a7b (diff) | |
| parent | a06429504b67debf3f50f55d1a6d6d3721031be1 (diff) | |
Merge pull request #194232 from yrd/rnote
rnote, poppler: update
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 15 |
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..ccae3037e092f 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.11.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-CTuphE7XdChVFzYcFeIaMbpN8nikmSY9RAPMp08tqCg="; }; - 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 |