From ed8078b92dcefa7b8e499b877546ab21adddf9fa Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sun, 30 Jun 2024 00:24:36 -0700
Subject: [PATCH 1/3] sanjuuni: move to pkgs/by-name

---
 .../sanjuuni/default.nix => by-name/sa/sanjuuni/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/graphics/sanjuuni/default.nix => by-name/sa/sanjuuni/package.nix} (100%)

diff --git a/pkgs/tools/graphics/sanjuuni/default.nix b/pkgs/by-name/sa/sanjuuni/package.nix
similarity index 100%
rename from pkgs/tools/graphics/sanjuuni/default.nix
rename to pkgs/by-name/sa/sanjuuni/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4227b56896a1..cfefbf58b46c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12615,8 +12615,6 @@ with pkgs;
 
   sanctity = callPackage ../tools/misc/sanctity { };
 
-  sanjuuni = callPackage ../tools/graphics/sanjuuni { };
-
   sasquatch = callPackage ../tools/filesystems/sasquatch { };
 
   sasview = libsForQt5.callPackage ../applications/science/misc/sasview { };

From 4e3a06726aa784543af54d86d88ef19ded01c378 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sun, 30 Jun 2024 00:25:21 -0700
Subject: [PATCH 2/3] sanjuuni: format with nixfmt-rfc-style

---
 pkgs/by-name/sa/sanjuuni/package.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix
index 023492cbf1cd..18dd1b11486f 100644
--- a/pkgs/by-name/sa/sanjuuni/package.nix
+++ b/pkgs/by-name/sa/sanjuuni/package.nix
@@ -1,13 +1,14 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, pkg-config
-, autoreconfHook
-, ffmpeg
-, poco
-, ocl-icd
-, opencl-clhpp
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  pkg-config,
+  autoreconfHook,
+  ffmpeg,
+  poco,
+  ocl-icd,
+  opencl-clhpp,
 }:
 
 stdenv.mkDerivation rec {

From ff931a64add1e5b442cfa543336f1b6e60558125 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sun, 30 Jun 2024 00:26:10 -0700
Subject: [PATCH 3/3] sanjuuni: 0.4 -> 0.5

Changelog: https://github.com/MCJack123/sanjuuni/releases/tag/0.5
---
 pkgs/by-name/sa/sanjuuni/package.nix | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix
index 18dd1b11486f..e43efa771b57 100644
--- a/pkgs/by-name/sa/sanjuuni/package.nix
+++ b/pkgs/by-name/sa/sanjuuni/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   fetchpatch,
   pkg-config,
-  autoreconfHook,
   ffmpeg,
   poco,
   ocl-icd,
@@ -13,28 +12,16 @@
 
 stdenv.mkDerivation rec {
   pname = "sanjuuni";
-  version = "0.4";
+  version = "0.5";
 
   src = fetchFromGitHub {
     owner = "MCJack123";
     repo = "sanjuuni";
     rev = version;
-    sha256 = "sha256-wgtyrik4Z5AXd8MHkiMuxMpGh/xcEtNqivyhvL68aac=";
+    sha256 = "sha256-wJRPD4OWOTPiyDr9dYseRA7BI942HPfHONVJGTc/+wU=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "build-with-cxx17.patch";
-      url = "https://github.com/MCJack123/sanjuuni/commit/f2164bc18935bcf63ee5b0a82087bc91f7fd258d.patch";
-      hash = "sha256-MjDeAiB3WkemCRYzgOHzHlbPUoI4DHEYe28xIIC+c7I=";
-      excludes = [ "configure" ]; # conflicts with release tarball; we manually regenerate this
-    })
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-    autoreconfHook
-  ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
     ffmpeg