From 2cf6f62eb5459dc296c0566b2cbbe9828198a3b2 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 18 Jun 2025 17:51:32 -0400
Subject: [PATCH 1/2] mandelbulber: 2.32 -> 2.33

Diff: https://github.com/buddhi1980/mandelbulber2/compare/2.32...2.33
Release notes: https://github.com/buddhi1980/mandelbulber2/releases/tag/2.33
---
 pkgs/applications/graphics/mandelbulber/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix
index e57017bb6a34..c00ba7439514 100644
--- a/pkgs/applications/graphics/mandelbulber/default.nix
+++ b/pkgs/applications/graphics/mandelbulber/default.nix
@@ -17,13 +17,13 @@ assert withOpenCL -> ocl-icd != null;
 
 stdenv.mkDerivation rec {
   pname = "mandelbulber";
-  version = "2.32";
+  version = "2.33";
 
   src = fetchFromGitHub {
     owner = "buddhi1980";
     repo = "mandelbulber2";
     rev = version;
-    sha256 = "sha256-amNNRuuk7qtcyXUVLEW71yEETExgKw48HeQQyxbi8BE=";
+    sha256 = "sha256-3PPgH9E+k2DFm8ib1bmvTsllQ9kYi3oLDwPHcs1Otac=";
   };
 
   nativeBuildInputs = [

From fff79c396505b9ff3afcc1398704009629058581 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 22 Jun 2025 16:36:32 -0400
Subject: [PATCH 2/2] mandelbulber: cleanup/add tests

The package has a test suite, but it's run by just using the --test option on
the main program. So I added it to passthru.tests. This required switching to
finalAttrs (so I could use finalPackage).
---
 .../graphics/mandelbulber/default.nix         | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix
index c00ba7439514..00e61c66a7f1 100644
--- a/pkgs/applications/graphics/mandelbulber/default.nix
+++ b/pkgs/applications/graphics/mandelbulber/default.nix
@@ -2,6 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  runCommand,
+  writableTmpDirAsHomeHook,
+  nix-update-script,
   libpng,
   gsl,
   libsndfile,
@@ -15,14 +18,14 @@
 assert withOpenCL -> opencl-clhpp != null;
 assert withOpenCL -> ocl-icd != null;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mandelbulber";
   version = "2.33";
 
   src = fetchFromGitHub {
     owner = "buddhi1980";
     repo = "mandelbulber2";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-3PPgH9E+k2DFm8ib1bmvTsllQ9kYi3oLDwPHcs1Otac=";
   };
 
@@ -45,13 +48,25 @@ stdenv.mkDerivation rec {
       ocl-icd
     ];
 
-  sourceRoot = "${src.name}/mandelbulber2";
+  sourceRoot = "${finalAttrs.src.name}/mandelbulber2";
 
   qmakeFlags = [
     "SHARED_PATH=${placeholder "out"}"
     (if withOpenCL then "qmake/mandelbulber-opencl.pro" else "qmake/mandelbulber.pro")
   ];
 
+  passthru = {
+    tests = {
+      test = runCommand "mandelbulber2-test" {
+        nativeBuildInputs = [
+          finalAttrs.finalPackage
+          writableTmpDirAsHomeHook
+        ];
+      } "mandelbulber2 --test && touch $out";
+    };
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "3D fractal rendering engine";
     mainProgram = "mandelbulber2";
@@ -61,4 +76,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ kovirobi ];
   };
-}
+})