about summary refs log tree commit diff
path: root/pkgs/applications/graphics
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-05-21 12:01:13 +0000
committerGitHub <noreply@github.com>2024-05-21 12:01:13 +0000
commit262ee2400ecb4710ac9eaf9d683d202c44bc24e0 (patch)
tree30f3b863d471a2d87b60e0556279b424b95cedbb /pkgs/applications/graphics
parent0c60d3983454140900010a9da72c75c60a5de420 (diff)
parent8257910e21e9794cb4aef49454ae3ad532350f24 (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r--pkgs/applications/graphics/ImageMagick/6.x.nix24
1 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix
index a433cc6516dea..9be6460d8f1de 100644
--- a/pkgs/applications/graphics/ImageMagick/6.x.nix
+++ b/pkgs/applications/graphics/ImageMagick/6.x.nix
@@ -36,13 +36,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "6.9.12-68";
+  version = "6.9.13-10";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick6";
     rev = finalAttrs.version;
-    sha256 = "sha256-slQcA0cblxtG/1DiJx5swUh7Kfwgz5HG70eqJFLaQJI=";
+    sha256 = "sha256-AdlJaCJOrN+NkkzzzgELtgAr5iZ9dvlVYVc7tYiM+R8=";
   };
 
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@@ -121,24 +121,30 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with maintainers; [ ];
     license = licenses.asl20;
     knownVulnerabilities = [
-      "CVE-2018-16328"
-      "CVE-2018-16329"
       "CVE-2019-13136"
       "CVE-2019-17547"
       "CVE-2020-25663"
       "CVE-2020-27768"
-      "CVE-2021-3596"
-      "CVE-2021-3596"
-      "CVE-2021-3596"
-      "CVE-2021-3610"
-      "CVE-2021-20244"
+      "CVE-2020-27769"
+      "CVE-2020-27829"
+      "CVE-2021-20243"
       "CVE-2021-20244"
       "CVE-2021-20310"
       "CVE-2021-20311"
       "CVE-2021-20312"
       "CVE-2021-20313"
+      "CVE-2021-3596"
       "CVE-2022-0284"
       "CVE-2022-2719"
+      "CVE-2023-1289"
+      "CVE-2023-2157"
+      "CVE-2023-34151"
+      "CVE-2023-34152"
+      "CVE-2023-34153"
+      "CVE-2023-3428"
+      "CVE-2023-34474"
+      "CVE-2023-34475"
+      "CVE-2023-5341"
     ];
   };
 })