From 4ebd45c2ab61a81fe9e7e46d63c7102e77987380 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 27 May 2026 16:39:31 -0500
Subject: [PATCH 1/7] cdemu: inline common-drv-attrs and refactor

(cherry picked from commit aa1a4a413eecb93daee0e192e73568499af9d0aa)
---
 .../applications/emulators/cdemu/analyzer.nix | 45 +++++++++++-----
 pkgs/applications/emulators/cdemu/client.nix  | 44 +++++++++++-----
 .../emulators/cdemu/common-drv-attrs.nix      | 33 ------------
 pkgs/applications/emulators/cdemu/daemon.nix  | 52 ++++++++++---------
 pkgs/applications/emulators/cdemu/gui.nix     | 50 ++++++++++++------
 .../emulators/cdemu/libmirage.nix             | 38 ++++++--------
 6 files changed, 140 insertions(+), 122 deletions(-)
 delete mode 100644 pkgs/applications/emulators/cdemu/common-drv-attrs.nix

diff --git a/pkgs/applications/emulators/cdemu/analyzer.nix b/pkgs/applications/emulators/cdemu/analyzer.nix
index e9065676e147..90fdb30a1821 100644
--- a/pkgs/applications/emulators/cdemu/analyzer.nix
+++ b/pkgs/applications/emulators/cdemu/analyzer.nix
@@ -1,7 +1,6 @@
 {
   cmake,
   pkg-config,
-  callPackage,
   gobject-introspection,
   wrapGAppsHook3,
   python3Packages,
@@ -11,20 +10,17 @@
   gdk-pixbuf,
   intltool,
   libmirage,
+  fetchurl,
+  lib,
 }:
-python3Packages.buildPythonApplication {
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "image-analyzer";
+  version = "3.2.6";
 
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.6";
-      pname = "image-analyzer";
-      hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/image-analyzer-${finalAttrs.version}.tar.xz";
+    hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc=";
+  };
 
   buildInputs = [
     libxml2
@@ -33,10 +29,12 @@ python3Packages.buildPythonApplication {
     adwaita-icon-theme
     gdk-pixbuf
   ];
+
   propagatedBuildInputs = with python3Packages; [
     pygobject3
     matplotlib
   ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -47,8 +45,27 @@ python3Packages.buildPythonApplication {
 
   pyproject = false;
   dontWrapGApps = true;
+
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-}
+  meta = {
+    description = "Suite of tools for emulating optical drives and discs";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
+    homepage = "https://cdemu.sourceforge.io/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bendlas ];
+  };
+})
diff --git a/pkgs/applications/emulators/cdemu/client.nix b/pkgs/applications/emulators/cdemu/client.nix
index afb68755775c..c45fda289abc 100644
--- a/pkgs/applications/emulators/cdemu/client.nix
+++ b/pkgs/applications/emulators/cdemu/client.nix
@@ -1,25 +1,21 @@
 {
-  callPackage,
   python3Packages,
   cmake,
   pkg-config,
   intltool,
   wrapGAppsNoGuiHook,
   gobject-introspection,
+  fetchurl,
+  lib,
 }:
-python3Packages.buildPythonApplication {
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "cdemu-client";
+  version = "3.2.5";
 
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.5";
-      pname = "cdemu-client";
-      hash = "sha256-py2F61v8vO0BCM18GCflAiD48deZjbMM6wqoCDZsOd8=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/cdemu-client-${finalAttrs.version}.tar.xz";
+    hash = "sha256-py2F61v8vO0BCM18GCflAiD48deZjbMM6wqoCDZsOd8=";
+  };
 
   nativeBuildInputs = [
     cmake
@@ -28,6 +24,7 @@ python3Packages.buildPythonApplication {
     wrapGAppsNoGuiHook
     gobject-introspection
   ];
+
   propagatedBuildInputs = with python3Packages; [
     dbus-python
     pygobject3
@@ -35,8 +32,27 @@ python3Packages.buildPythonApplication {
 
   pyproject = false;
   dontWrapGApps = true;
+
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-}
+  meta = {
+    description = "Suite of tools for emulating optical drives and discs";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
+    homepage = "https://cdemu.sourceforge.io/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bendlas ];
+  };
+})
diff --git a/pkgs/applications/emulators/cdemu/common-drv-attrs.nix b/pkgs/applications/emulators/cdemu/common-drv-attrs.nix
deleted file mode 100644
index edc3361a5fad..000000000000
--- a/pkgs/applications/emulators/cdemu/common-drv-attrs.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  fetchurl,
-  pname,
-  version,
-  hash,
-}:
-
-{
-  inherit pname version;
-  src = fetchurl {
-    url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz";
-    inherit hash;
-  };
-  meta = {
-    description = "Suite of tools for emulating optical drives and discs";
-    longDescription = ''
-      CDEmu consists of:
-
-      - a kernel module implementing a virtual drive-controller
-      - libmirage which is a software library for interpreting optical disc images
-      - a daemon which emulates the functionality of an optical drive+disc
-      - textmode and GTK clients for controlling the emulator
-      - an image analyzer to view the structure of image files
-
-      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
-    '';
-    homepage = "https://cdemu.sourceforge.io/";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ bendlas ];
-  };
-}
diff --git a/pkgs/applications/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix
index 874b0522aa07..42cac77cba31 100644
--- a/pkgs/applications/emulators/cdemu/daemon.nix
+++ b/pkgs/applications/emulators/cdemu/daemon.nix
@@ -1,6 +1,5 @@
 {
   stdenv,
-  callPackage,
   cmake,
   pkg-config,
   glib,
@@ -8,34 +7,31 @@
   intltool,
   libmirage,
   coreutils,
+  fetchurl,
+  lib,
 }:
 
-let
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.7";
-      pname = "cdemu-daemon";
-      hash = "sha256-EKh2G6RA9Yq46BpTAqN2s6TpLJb8gwDuEpGiwdGcelc=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
-in
-stdenv.mkDerivation {
-  inherit pname version src;
+stdenv.mkDerivation (finalAttrs: {
+  pname = "cdemu-daemon";
+  version = "3.2.7";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/cdemu-daemon-${finalAttrs.version}.tar.xz";
+    hash = "sha256-EKh2G6RA9Yq46BpTAqN2s6TpLJb8gwDuEpGiwdGcelc=";
+  };
 
   nativeBuildInputs = [
     cmake
     pkg-config
     intltool
   ];
+
   buildInputs = [
     glib
     libao
     libmirage
   ];
+
   postInstall = ''
     mkdir -p $out/share/dbus-1/services
     cp -R ../service-example $out/share/cdemu
@@ -46,14 +42,22 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    inherit (meta)
-      description
-      license
-      longDescription
-      maintainers
-      platforms
-      ;
+    description = "Suite of tools for emulating optical drives and discs";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
     homepage = "https://cdemu.sourceforge.io/about/daemon/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bendlas ];
     mainProgram = "cdemu-daemon";
   };
-}
+})
diff --git a/pkgs/applications/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix
index 90523e12ead6..11fd3c2c7c88 100644
--- a/pkgs/applications/emulators/cdemu/gui.nix
+++ b/pkgs/applications/emulators/cdemu/gui.nix
@@ -1,5 +1,4 @@
 {
-  callPackage,
   cmake,
   pkg-config,
   wrapGAppsHook3,
@@ -10,20 +9,18 @@
   adwaita-icon-theme,
   gdk-pixbuf,
   libappindicator-gtk3,
+  fetchurl,
+  lib,
 }:
-python3Packages.buildPythonApplication {
 
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.6";
-      pname = "gcdemu";
-      hash = "sha256-w4vzKoSotL5Cjfr4Cu4YhNSWXJqS+n/vySrwvbhR1zA=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "gcdemu";
+  version = "3.2.6";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/gcdemu-${finalAttrs.version}.tar.xz";
+    hash = "sha256-w4vzKoSotL5Cjfr4Cu4YhNSWXJqS+n/vySrwvbhR1zA=";
+  };
 
   nativeBuildInputs = [
     cmake
@@ -32,18 +29,41 @@ python3Packages.buildPythonApplication {
     intltool
     gobject-introspection
   ];
+
   buildInputs = [
     libnotify
     adwaita-icon-theme
     gdk-pixbuf
     libappindicator-gtk3
   ];
-  propagatedBuildInputs = with python3Packages; [ pygobject3 ];
+
+  propagatedBuildInputs = with python3Packages; [
+    pygobject3
+  ];
 
   pyproject = false;
   dontWrapGApps = true;
+
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-}
+  meta = {
+    description = "Suite of tools for emulating optical drives and discs";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
+    homepage = "https://cdemu.sourceforge.io/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bendlas ];
+  };
+})
diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix
index e2017be9616c..16e1cc2e3a01 100644
--- a/pkgs/applications/emulators/cdemu/libmirage.nix
+++ b/pkgs/applications/emulators/cdemu/libmirage.nix
@@ -1,6 +1,5 @@
 {
   stdenv,
-  callPackage,
   cmake,
   pkg-config,
   gobject-introspection,
@@ -16,23 +15,18 @@
   util-linux,
   libselinux,
   libsepol,
+  fetchurl,
+  lib,
 }:
 
-let
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.10";
-      pname = "libmirage";
-      hash = "sha256-+T5Gu3VcprCkSJcq/kTySRnNI7nc+GbRtctLkzPhgK4=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
-in
-stdenv.mkDerivation {
-  inherit pname version src;
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libmirage";
+  version = "3.2.10";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/libmirage-${finalAttrs.version}.tar.xz";
+    hash = "sha256-+T5Gu3VcprCkSJcq/kTySRnNI7nc+GbRtctLkzPhgK4=";
+  };
 
   env = {
     PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
@@ -47,6 +41,7 @@ stdenv.mkDerivation {
     xz
     libsamplerate
   ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -54,6 +49,7 @@ stdenv.mkDerivation {
     gobject-introspection
     vala
   ];
+
   propagatedBuildInputs = [
     pcre
     util-linux
@@ -62,12 +58,10 @@ stdenv.mkDerivation {
   ];
 
   meta = {
-    inherit (meta)
-      maintainers
-      license
-      platforms
-      ;
+    maintainers = with lib.maintainers; [ bendlas ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
     description = "CD-ROM image access library";
     homepage = "https://cdemu.sourceforge.io/about/libmirage/";
   };
-}
+})

From f17b852d81eabed34759dd4cb65d4d389a6264b0 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 27 May 2026 16:51:39 -0500
Subject: [PATCH 2/7] cdemu-*: migrate to by-name

(cherry picked from commit 9d366f5d08344c21fa2e847f031fe9b79f88c165)
---
 .../client.nix => by-name/cd/cdemu-client/package.nix} |  0
 .../daemon.nix => by-name/cd/cdemu-daemon/package.nix} |  0
 .../cdemu/gui.nix => by-name/gc/gcdemu/package.nix}    |  0
 .../im/image-analyzer/package.nix}                     |  0
 .../libmirage.nix => by-name/li/libmirage/package.nix} |  0
 pkgs/top-level/all-packages.nix                        | 10 ----------
 6 files changed, 10 deletions(-)
 rename pkgs/{applications/emulators/cdemu/client.nix => by-name/cd/cdemu-client/package.nix} (100%)
 rename pkgs/{applications/emulators/cdemu/daemon.nix => by-name/cd/cdemu-daemon/package.nix} (100%)
 rename pkgs/{applications/emulators/cdemu/gui.nix => by-name/gc/gcdemu/package.nix} (100%)
 rename pkgs/{applications/emulators/cdemu/analyzer.nix => by-name/im/image-analyzer/package.nix} (100%)
 rename pkgs/{applications/emulators/cdemu/libmirage.nix => by-name/li/libmirage/package.nix} (100%)

diff --git a/pkgs/applications/emulators/cdemu/client.nix b/pkgs/by-name/cd/cdemu-client/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/client.nix
rename to pkgs/by-name/cd/cdemu-client/package.nix
diff --git a/pkgs/applications/emulators/cdemu/daemon.nix b/pkgs/by-name/cd/cdemu-daemon/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/daemon.nix
rename to pkgs/by-name/cd/cdemu-daemon/package.nix
diff --git a/pkgs/applications/emulators/cdemu/gui.nix b/pkgs/by-name/gc/gcdemu/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/gui.nix
rename to pkgs/by-name/gc/gcdemu/package.nix
diff --git a/pkgs/applications/emulators/cdemu/analyzer.nix b/pkgs/by-name/im/image-analyzer/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/analyzer.nix
rename to pkgs/by-name/im/image-analyzer/package.nix
diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/by-name/li/libmirage/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/libmirage.nix
rename to pkgs/by-name/li/libmirage/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26305fc6c1a1..b1c3735c5dba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1223,21 +1223,11 @@ with pkgs;
     else
       throw "Don't know 32-bit platform for cross from: ${stdenv.hostPlatform.stdenv}";
 
-  cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { };
-
-  cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { };
-
   fceux-qt5 = fceux.override { ___qtVersion = "5"; };
   fceux-qt6 = fceux.override { ___qtVersion = "6"; };
 
-  gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
-
-  image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { };
-
   kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { };
 
-  libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { };
-
   mame-tools = lib.addMetaAttrs {
     description = mame.meta.description + " (tools only)";
   } (lib.getOutput "tools" mame);

From 31036f6731e35b85e6d395d94750b01a3160fa3a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 27 May 2026 17:11:54 -0500
Subject: [PATCH 3/7] cdemu-*: add updateScript

(cherry picked from commit a9aa8b41038423efa2805a0d5507cf5d915e7b34)
---
 pkgs/by-name/cd/cdemu-client/package.nix   | 15 +++++++++++++++
 pkgs/by-name/cd/cdemu-daemon/package.nix   | 15 +++++++++++++++
 pkgs/by-name/gc/gcdemu/package.nix         | 15 +++++++++++++++
 pkgs/by-name/im/image-analyzer/package.nix | 15 +++++++++++++++
 pkgs/by-name/li/libmirage/package.nix      | 15 +++++++++++++++
 5 files changed, 75 insertions(+)

diff --git a/pkgs/by-name/cd/cdemu-client/package.nix b/pkgs/by-name/cd/cdemu-client/package.nix
index c45fda289abc..54abd96a1d23 100644
--- a/pkgs/by-name/cd/cdemu-client/package.nix
+++ b/pkgs/by-name/cd/cdemu-client/package.nix
@@ -7,6 +7,7 @@
   gobject-introspection,
   fetchurl,
   lib,
+  writeScript,
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "cdemu-client";
@@ -37,6 +38,20 @@ python3Packages.buildPythonApplication (finalAttrs: {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  passthru = {
+    updateScript = writeScript "update-cdemu-client" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for cdemu-client
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/cdemu-client" | pcre2grep -o1 'cdemu-client-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version cdemu-client "$newVersion"
+    '';
+  };
+
   meta = {
     description = "Suite of tools for emulating optical drives and discs";
     longDescription = ''
diff --git a/pkgs/by-name/cd/cdemu-daemon/package.nix b/pkgs/by-name/cd/cdemu-daemon/package.nix
index 42cac77cba31..4f5f43c006dd 100644
--- a/pkgs/by-name/cd/cdemu-daemon/package.nix
+++ b/pkgs/by-name/cd/cdemu-daemon/package.nix
@@ -9,6 +9,7 @@
   coreutils,
   fetchurl,
   lib,
+  writeScript,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -41,6 +42,20 @@ stdenv.mkDerivation (finalAttrs: {
       --replace /bin/true ${coreutils}/bin/true
   '';
 
+  passthru = {
+    updateScript = writeScript "update-cdemu-daemon" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for cdemu-daemon
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/cdemu-daemon" | pcre2grep -o1 'cdemu-daemon-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version cdemu-daemon "$newVersion"
+    '';
+  };
+
   meta = {
     description = "Suite of tools for emulating optical drives and discs";
     longDescription = ''
diff --git a/pkgs/by-name/gc/gcdemu/package.nix b/pkgs/by-name/gc/gcdemu/package.nix
index 11fd3c2c7c88..82586645a2fa 100644
--- a/pkgs/by-name/gc/gcdemu/package.nix
+++ b/pkgs/by-name/gc/gcdemu/package.nix
@@ -11,6 +11,7 @@
   libappindicator-gtk3,
   fetchurl,
   lib,
+  writeScript,
 }:
 
 python3Packages.buildPythonApplication (finalAttrs: {
@@ -48,6 +49,20 @@ python3Packages.buildPythonApplication (finalAttrs: {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  passthru = {
+    updateScript = writeScript "update-gcdemu" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for gcdemu
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/gcdemu" | pcre2grep -o1 'gcdemu-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version gcdemu "$newVersion"
+    '';
+  };
+
   meta = {
     description = "Suite of tools for emulating optical drives and discs";
     longDescription = ''
diff --git a/pkgs/by-name/im/image-analyzer/package.nix b/pkgs/by-name/im/image-analyzer/package.nix
index 90fdb30a1821..16e8c6616460 100644
--- a/pkgs/by-name/im/image-analyzer/package.nix
+++ b/pkgs/by-name/im/image-analyzer/package.nix
@@ -12,6 +12,7 @@
   libmirage,
   fetchurl,
   lib,
+  writeScript,
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "image-analyzer";
@@ -50,6 +51,20 @@ python3Packages.buildPythonApplication (finalAttrs: {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  passthru = {
+    updateScript = writeScript "update-image-analyzer" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for image-analyzer
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/image-analyzer" | pcre2grep -o1 'image-analyzer-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version image-analyzer "$newVersion"
+    '';
+  };
+
   meta = {
     description = "Suite of tools for emulating optical drives and discs";
     longDescription = ''
diff --git a/pkgs/by-name/li/libmirage/package.nix b/pkgs/by-name/li/libmirage/package.nix
index 16e1cc2e3a01..7b2427774cb8 100644
--- a/pkgs/by-name/li/libmirage/package.nix
+++ b/pkgs/by-name/li/libmirage/package.nix
@@ -17,6 +17,7 @@
   libsepol,
   fetchurl,
   lib,
+  writeScript,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -57,6 +58,20 @@ stdenv.mkDerivation (finalAttrs: {
     libsepol
   ];
 
+  passthru = {
+    updateScript = writeScript "update-libmirage" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for libmirage
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/libmirage" | pcre2grep -o1 'libmirage-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version libmirage "$newVersion"
+    '';
+  };
+
   meta = {
     maintainers = with lib.maintainers; [ bendlas ];
     license = lib.licenses.gpl2Plus;

From c4d7a54601e057c9d02d5a7a7e71de0aeef2b9c7 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 27 May 2026 22:15:24 +0000
Subject: [PATCH 4/7] cdemu-*: update to latest versions

cdemu-daemon: 3.2.7 -> 3.3.0

cdemu-client: 3.2.5 -> 3.3.0

gcdemu: 3.2.6 -> 3.3.0

image-analyzer: 3.2.6 -> 3.3.0

libmirage: 3.2.10 -> 3.3.1
(cherry picked from commit a156cab325bea0dfd51321aab1de2126b9d75efc)
---
 pkgs/by-name/cd/cdemu-client/package.nix   | 4 ++--
 pkgs/by-name/cd/cdemu-daemon/package.nix   | 4 ++--
 pkgs/by-name/gc/gcdemu/package.nix         | 4 ++--
 pkgs/by-name/im/image-analyzer/package.nix | 4 ++--
 pkgs/by-name/li/libmirage/package.nix      | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/cd/cdemu-client/package.nix b/pkgs/by-name/cd/cdemu-client/package.nix
index 54abd96a1d23..9e409d46fb4c 100644
--- a/pkgs/by-name/cd/cdemu-client/package.nix
+++ b/pkgs/by-name/cd/cdemu-client/package.nix
@@ -11,11 +11,11 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "cdemu-client";
-  version = "3.2.5";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/cdemu-client-${finalAttrs.version}.tar.xz";
-    hash = "sha256-py2F61v8vO0BCM18GCflAiD48deZjbMM6wqoCDZsOd8=";
+    hash = "sha256-WiKm00ZKUDeHX6RII4+JKruAzUyWzZWyI0iZeDqksnA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cd/cdemu-daemon/package.nix b/pkgs/by-name/cd/cdemu-daemon/package.nix
index 4f5f43c006dd..f25748b01c85 100644
--- a/pkgs/by-name/cd/cdemu-daemon/package.nix
+++ b/pkgs/by-name/cd/cdemu-daemon/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cdemu-daemon";
-  version = "3.2.7";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/cdemu-daemon-${finalAttrs.version}.tar.xz";
-    hash = "sha256-EKh2G6RA9Yq46BpTAqN2s6TpLJb8gwDuEpGiwdGcelc=";
+    hash = "sha256-AYHjiOAQdu685gc6p0j2QNtCmTYTWix1kzWQZYvGPWU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gc/gcdemu/package.nix b/pkgs/by-name/gc/gcdemu/package.nix
index 82586645a2fa..3cd67894358e 100644
--- a/pkgs/by-name/gc/gcdemu/package.nix
+++ b/pkgs/by-name/gc/gcdemu/package.nix
@@ -16,11 +16,11 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "gcdemu";
-  version = "3.2.6";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/gcdemu-${finalAttrs.version}.tar.xz";
-    hash = "sha256-w4vzKoSotL5Cjfr4Cu4YhNSWXJqS+n/vySrwvbhR1zA=";
+    hash = "sha256-C9d4Rv47kQhs2kbTCwAUcdm+dcljA8IVkwhLJHJpUS0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/im/image-analyzer/package.nix b/pkgs/by-name/im/image-analyzer/package.nix
index 16e8c6616460..364286765d26 100644
--- a/pkgs/by-name/im/image-analyzer/package.nix
+++ b/pkgs/by-name/im/image-analyzer/package.nix
@@ -16,11 +16,11 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "image-analyzer";
-  version = "3.2.6";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/image-analyzer-${finalAttrs.version}.tar.xz";
-    hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc=";
+    hash = "sha256-N2aufwYEBVx7z2Vo7Qi4DP2MsDXXr5LrQdeNYOtNGnU=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/li/libmirage/package.nix b/pkgs/by-name/li/libmirage/package.nix
index 7b2427774cb8..f45a1342ab26 100644
--- a/pkgs/by-name/li/libmirage/package.nix
+++ b/pkgs/by-name/li/libmirage/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmirage";
-  version = "3.2.10";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/libmirage-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+T5Gu3VcprCkSJcq/kTySRnNI7nc+GbRtctLkzPhgK4=";
+    hash = "sha256-mstOGdmKJXRUrQA5F1DZGqVuY+f25Q5ZpdOXPx4MZRI=";
   };
 
   env = {

From de016f14aaaf84b056d65eb56ce1fdc562ef0def Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 03:39:51 +0000
Subject: [PATCH 5/7] cdemu-client: 3.3.0 -> 3.3.1

(cherry picked from commit a93061ccc7789ec3fcf3866eec9ef01bbd211dc3)
---
 pkgs/by-name/cd/cdemu-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cd/cdemu-client/package.nix b/pkgs/by-name/cd/cdemu-client/package.nix
index 9e409d46fb4c..f5915f76ef43 100644
--- a/pkgs/by-name/cd/cdemu-client/package.nix
+++ b/pkgs/by-name/cd/cdemu-client/package.nix
@@ -11,11 +11,11 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "cdemu-client";
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/cdemu-client-${finalAttrs.version}.tar.xz";
-    hash = "sha256-WiKm00ZKUDeHX6RII4+JKruAzUyWzZWyI0iZeDqksnA=";
+    hash = "sha256-26KMd2NtoMHG2AJgPGSJTgcshfSyJzW0dUipmA3NGlw=";
   };
 
   nativeBuildInputs = [

From c5667c708f4908905727af30205ca4b5bc0bc028 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Jun 2026 23:08:26 +0000
Subject: [PATCH 6/7] gcdemu: 3.3.0 -> 3.3.1

(cherry picked from commit 038f1c02e07b7ff14f3b173668a9a3876a7dc360)
---
 pkgs/by-name/gc/gcdemu/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gc/gcdemu/package.nix b/pkgs/by-name/gc/gcdemu/package.nix
index 3cd67894358e..86632141ea17 100644
--- a/pkgs/by-name/gc/gcdemu/package.nix
+++ b/pkgs/by-name/gc/gcdemu/package.nix
@@ -16,11 +16,11 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "gcdemu";
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/gcdemu-${finalAttrs.version}.tar.xz";
-    hash = "sha256-C9d4Rv47kQhs2kbTCwAUcdm+dcljA8IVkwhLJHJpUS0=";
+    hash = "sha256-zBRZxbT+J85pMTYaTRxrV3ua61m6KYU6aStpeghYdvY=";
   };
 
   nativeBuildInputs = [

From 446af15196f72f8f3d882317717a684a118446b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Jun 2026 23:08:32 +0000
Subject: [PATCH 7/7] libmirage: 3.3.1 -> 3.3.2

(cherry picked from commit b1eee66ee36b7b1e23718a280b022bd89c4e9657)
---
 pkgs/by-name/li/libmirage/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libmirage/package.nix b/pkgs/by-name/li/libmirage/package.nix
index f45a1342ab26..9d1783fc9710 100644
--- a/pkgs/by-name/li/libmirage/package.nix
+++ b/pkgs/by-name/li/libmirage/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmirage";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/libmirage-${finalAttrs.version}.tar.xz";
-    hash = "sha256-mstOGdmKJXRUrQA5F1DZGqVuY+f25Q5ZpdOXPx4MZRI=";
+    hash = "sha256-wMAzJpEue1QnDllWheFk3ZX+8pSkYw13s+GU0G/AOfs=";
   };
 
   env = {