Merge pull request #323251 from tomodachi94/update/sanjuuni/0.5

sanjuuni: 0.4 -> 0.5, modernize

pkgs/by-name/sa/sanjuuni/package.nix

@@ -1,39 +1,27 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, pkg-config
-, autoreconfHook
-, ffmpeg
-, poco
-, ocl-icd
-, opencl-clhpp
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  pkg-config,
+  ffmpeg,
+  poco,
+  ocl-icd,
+  opencl-clhpp,
 }:
 
 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

pkgs/top-level/all-packages.nix

@@ -12562,8 +12562,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 { };