version bump to 25.05

pkgs/default.nix

@@ -1,51 +1,12 @@
 {
-  pkgs ? import <nixpkgs> {},
-  lib ? pkgs.lib,
+  pkgs,
+  lib,
+  rpcs3_latest,
 }: let
-  numpy-1 = pkgs.python311Packages.numpy.overridePythonAttrs (oldAttrs: rec {
-    version = "1.26.4";
-    src = pkgs.fetchPypi {
-      pname = "numpy";
-      inherit version;
-      sha256 = "0410j6jfz1yzm5s0v0yrc1j0q6ih4322357and7arr0jxnlsn0ia";
-    };
-  });
-
-  customPython = pkgs.python311.override {
-    packageOverrides = self: super: {
-      numpy = numpy-1;
-    };
+  rpcs3Pkgs = pkgs.callPackage ./rpcs3 {
+    inherit lib rpcs3_latest;
   };
-  customPythonPackages = customPython.pkgs;
 in {
-  inherit numpy-1 customPythonPackages;
-
+  inherit (rpcs3Pkgs) pugixml SDL3 rpcs3 rpcs3_latest;
   fish-rust = pkgs.callPackage ./fish-rust {};
-
-  python-rembg = pkgs.callPackage ./python-rembg {
-    inherit lib;
-    fetchPypi = pkgs.fetchPypi;
-    python311Packages = customPythonPackages;
-    python-pymatting = pkgs.callPackage ./python-pymatting {
-      inherit lib;
-      fetchPypi = pkgs.fetchPypi;
-      python311Packages = customPythonPackages;
-    };
-    python-opencv-headless = pkgs.callPackage ./python-opencv-headless {
-      inherit lib;
-      fetchPypi = pkgs.fetchPypi;
-      cmake = pkgs.cmake;
-      pkg-config = pkgs.pkg-config;
-      stdenv = pkgs.stdenv;
-      makeWrapper = pkgs.makeWrapper;
-      python311Packages = customPythonPackages;
-    };
-  };
-
-  # removing for now since it seems to work, will leave just in case
-  # python-ngx-lsp = pkgs.callPackage ./python-nginx-language-server {
-  #  inherit lib;
-  #  fetchFromGitHub = pkgs.fetchFromGitHub;
-  #  python311Packages = customPythonPackages;
-  #};
 }

pkgs/python-opencv-headless/default.nix

@@ -6,50 +6,70 @@
   makeWrapper,
   cmake,
   pkg-config,
+  cudaPackages,
+  enableCuda ? false,
 }:
 python311Packages.buildPythonPackage rec {
   pname = "opencv-python-headless";
   version = "4.11.0.86";
-  format = "setuptools";
-
+  format = "other";
   src = fetchPypi {
     pname = "opencv-python-headless";
     inherit version;
-    format = "setuptools";
     sha256 = "mW6ygspLQ+xqOXJBTeDiMx9dnNorQQkaSXOcGfuEN5g=";
   };
-
-  nativeBuildInputs = with python311Packages; [
-    cmake
-    pkg-config
-    makeWrapper
-    scikit-build
-  ];
-
-  buildInputs = with python311Packages; [
-    scikit-build
-  ];
-
+  nativeBuildInputs = with python311Packages;
+    [
+      cmake
+      pkg-config
+      makeWrapper
+      scikit-build
+    ]
+    ++ lib.optionals enableCuda (with cudaPackages; [
+      cudatoolkit
+    ]);
+  buildInputs = with python311Packages;
+    [
+      scikit-build
+    ]
+    ++ lib.optionals enableCuda (with cudaPackages; [
+      cudatoolkit
+      cudnn
+    ]);
   propagatedBuildInputs = with python311Packages; [
     setuptools
     numpy
   ];
-
   dontUseCmakeConfigure = true;
-
-  doCheck = false;
-
-  pythonImportsCheck = ["cv2"];
-
-  postFixup = ''
-    wrapPythonProgramsIn "$out/lib/python3.11/site-packages" "${stdenv.cc.cc.lib}"
+  SKBUILD_CMAKE_ARGS =
+    [
+      "-DCMAKE_BUILD_TYPE=Release"
+      "-DBUILD_opencv_apps=OFF"
+      "-DBUILD_EXAMPLES=OFF"
+      "-DBUILD_TESTS=OFF"
+      "-DBUILD_PERF_TESTS=OFF"
+      "-DBUILD_DOCS=OFF"
+      "-DOPENCV_GENERATE_PKGCONFIG=ON"
+      "-DCMAKE_BUILD_PARALLEL_LEVEL=$(nproc)"
+    ]
+    ++ lib.optionals enableCuda [
+      "-DWITH_CUDA=ON"
+      "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}"
+      "-DWITH_CUDNN=ON"
+    ];
+  postPatch = lib.optionalString enableCuda ''
+    export LD_LIBRARY_PATH=${cudaPackages.cudatoolkit.lib}/lib:$LD_LIBRARY_PATH
+  '';
+  doCheck = false;
+  pythonImportsCheck = ["cv2"];
+  postFixup = ''
+    wrapPythonProgramsIn "$out/lib/python3.11/site-packages" "${stdenv.cc.cc.lib}${lib.optionalString enableCuda ":${cudaPackages.cudatoolkit.lib}/lib"}"
   '';
-
   meta = with lib; {
-    description = "Wrapper package for OpenCV python bindings (headless)";
+    description = "Wrapper package for OpenCV python bindings (headless)${lib.optionalString enableCuda " with CUDA support"}";
     homepage = "https://github.com/opencv/opencv-python";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; ["Cobray"];
+    maintainers = ["Cobray"];
   };
 }

pkgs/python-pymatting/default.nix

@@ -7,33 +7,28 @@ python311Packages.buildPythonPackage rec {
   pname = "pymatting";
   version = "1.1.13";
   format = "pyproject";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-LNt8S++s3e9Netwt6ONKJy3mOdYIrlwKCGE9+kJTgQE=";
   };
-
   nativeBuildInputs = with python311Packages; [
     setuptools
     poetry-core
   ];
-
   propagatedBuildInputs = with python311Packages; [
+    numpy
     scipy
     pillow
     numba
   ];
-
   buildInputs = [
   ];
-
   doCheck = false;
-
   meta = with lib; {
     description = "A library for alpha matting";
     homepage = "https://github.com/pymatting/pymatting";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; ["Cobray"];
+    maintainers = ["Cobray"];
   };
 }

pkgs/python-rembg/default.nix

@@ -3,15 +3,15 @@
   python311Packages,
   fetchPypi,
   python-pymatting,
-  python-opencv-headless,
+  enableCuda ? false,
 }:
 python311Packages.buildPythonPackage rec {
   pname = "rembg";
-  version = "2.0.50";
+  version = "2.0.66";
   format = "pyproject";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bMt/GbplRawFZUqoXq37zAq1dribnu/ZlIYTuUIS+DU=";
+    sha256 = "sha256-hRBoq0zMY6artJs69z/cZntx41tmWGM9E/0HSFWPvZk=";
   };
   nativeBuildInputs = with python311Packages; [
     poetry-core
@@ -27,20 +27,22 @@ python311Packages.buildPythonPackage rec {
       tqdm
       aiohttp
       pytorch-bin
+      (opencv4.override {enableCuda = enableCuda;})
     ]
     ++ [
-      python-opencv-headless
       python-pymatting
     ];
   pythonRemoveDeps = ["opencv-python-headless"];
   dontPrecompilePages = true;
   doInstallCheck = false;
   doCheck = false;
+  dontCheck = true;
+  checkPhase = "echo 'Skipping tests'";
   meta = with lib; {
-    description = "Tool to remove image backgrounds";
+    description = "Tool to remove image backgrounds${lib.optionalString enableCuda " with CUDA support"}";
     homepage = "https://github.com/danielgatis/rembg";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; ["Cobray"];
+    maintainers = ["Cobray"];
   };
 }

pkgs/rpcs3/default.nix

@@ -0,0 +1,90 @@
+{
+  pkgs,
+  rpcs3_latest,
+  ...
+}: {
+  pugixml = pkgs.pugixml.overrideAttrs (oldAttrs: rec {
+    version = "1.15";
+    src = pkgs.fetchurl {
+      url = "https://github.com/zeux/pugixml/releases/download/v${version}/pugixml-${version}.tar.gz";
+      sha256 = "sha256-ZVreV/pwP7QhwuuaARO1BkvdsUXUFd0fiMeTU9kNURo=";
+    };
+  });
+  SDL3 = pkgs.stdenv.mkDerivation rec {
+    pname = "SDL3";
+    version = "3.1.3";
+    src = pkgs.fetchFromGitHub {
+      owner = "libsdl-org";
+      repo = "SDL";
+      rev = "preview-${version}";
+      sha256 = "sha256-S7yRcLHMPgq6+gec8l+ESxp2dJ+6Po/UNsBUXptQzMQ=";
+    };
+    nativeBuildInputs = [pkgs.cmake];
+    buildInputs = [pkgs.libGL pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.alsa-lib];
+    cmakeFlags = [
+      "-DSDL_STATIC=OFF"
+      "-DSDL_SHARED=ON"
+      "-DSDL_INSTALL_CMAKEDIR=${placeholder "out"}/lib/cmake/SDL3"
+    ];
+  };
+  rpcs3_latest = pkgs.rpcs3.overrideAttrs (oldAttrs: {
+    meta = {
+      maintainers = ["Cobray"];
+      description = "Latest build of PS3 emulator";
+      homepage = "https://rpcs3.net/";
+      license = pkgs.lib.licenses.gpl2;
+    };
+    src = pkgs.fetchgit {
+      url = "https://github.com/RPCS3/rpcs3.git";
+      rev = rpcs3_latest.rev;
+      sha256 = "sha256-0TDxSNMk9L4+ouxYzWFNi3XxPAyD43Xl32hz1T4lFIc=";
+      fetchSubmodules = true;
+    };
+    patches = [];
+    nativeBuildInputs =
+      (oldAttrs.nativeBuildInputs or [])
+      ++ [
+        pkgs.llvmPackages_19.llvm.dev
+        pkgs.llvmPackages_19.clang
+        pkgs.pkg-config
+        pkgs.qt6.qmake
+        pkgs.qt6.full
+        pkgs.xxd
+        pkgs.wayland-scanner
+      ];
+    buildInputs =
+      (oldAttrs.buildInputs or [])
+      ++ [
+        pkgs.llvmPackages_19.llvm
+        pkgs.llvmPackages_19.libclang
+        pkgs.qt6.full
+        pkgs.vulkan-loader
+        pkgs.vulkan-tools
+        pkgs.wayland
+        pkgs.wayland-protocols
+        pkgs.libxkbcommon
+        pkgs.libpulseaudio
+        pkgs.libevdev
+        pkgs.udev
+        pkgs.glew
+        pkgs.libpng
+        pkgs.zstd
+      ];
+    cmakeFlags =
+      (oldAttrs.cmakeFlags or [])
+      ++ [
+        "-DCMAKE_PREFIX_PATH=${pkgs.qt6.full}:${pkgs.wayland}"
+        "-DUSE_SYSTEM_FFMPEG=ON"
+        "-DUSE_SYSTEM_CURL=ON"
+        "-DUSE_SYSTEM_WOLFSSL=ON"
+        "-DUSE_QT=ON"
+        "-DUSE_VULKAN=ON"
+        "-DUSE_WAYLAND=ON"
+        "-DUSE_PULSEAUDIO=ON"
+        "-DUSE_LIBEVDEV=ON"
+        "-DUSE_SYSTEM_ZSTD=ON"
+        "-DUSE_DISCORD_RPC=ON"
+        "-DUSE_SDL=OFF"
+      ];
+  });
+}