From 81ff7c0634fa0762d5a19cb38e39befaa0793d1e Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 4 Nov 2025 00:53:44 +0000
Subject: [PATCH 1/4] caneda: fix build with cmake 4

---
 pkgs/applications/science/electronics/caneda/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
index b99c2201ec09..757314931a2c 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@@ -2,6 +2,7 @@
   mkDerivation,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   qtbase,
   qttools,
@@ -20,6 +21,13 @@ mkDerivation rec {
     sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/c/caneda/0.4.0-2/debian/patches/fix_cmake_minimum_version.patch";
+      hash = "sha256-MRkCA0GWcI6yEo4Ej+F67k0iNG1JHeLNhH0Rbz1QWoA=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     qtbase

From ad39d44f248a724705956a059f45eeb10433ce40 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 4 Nov 2025 00:55:21 +0000
Subject: [PATCH 2/4] caneda: adopt orphaned package

---
 pkgs/applications/science/electronics/caneda/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
index 757314931a2c..d7ed930cc88b 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@@ -41,7 +41,7 @@ mkDerivation rec {
     mainProgram = "caneda";
     homepage = "http://caneda.org";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ magicquark ];
     platforms = with lib.platforms; linux;
   };
 }

From 8f57530b0b43dd38fcb2e5f0b24d983d3df8d92d Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 4 Nov 2025 01:01:19 +0000
Subject: [PATCH 3/4] caneda: migrate to pkgs/by-name

---
 .../ca/caneda/package.nix}                    | 23 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 13 deletions(-)
 rename pkgs/{applications/science/electronics/caneda/default.nix => by-name/ca/caneda/package.nix} (79%)

diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/by-name/ca/caneda/package.nix
similarity index 79%
rename from pkgs/applications/science/electronics/caneda/default.nix
rename to pkgs/by-name/ca/caneda/package.nix
index d7ed930cc88b..284dd6e72fe8 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/by-name/ca/caneda/package.nix
@@ -1,16 +1,13 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   fetchpatch,
   cmake,
-  qtbase,
-  qttools,
-  qtsvg,
-  qwt6_1,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "caneda";
   version = "0.4.0";
 
@@ -28,12 +25,16 @@ mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    libsForQt5.qt5.wrapQtAppsHook
+  ];
+
   buildInputs = [
-    qtbase
-    qttools
-    qtsvg
-    qwt6_1
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtsvg
+    libsForQt5.qwt6_1
   ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c55ef11199c..0966d484e378 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13800,8 +13800,6 @@ with pkgs;
 
   eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { };
 
-  caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { };
-
   degate = libsForQt5.callPackage ../applications/science/electronics/degate { };
 
   geda = callPackage ../applications/science/electronics/geda {

From 607074e8e83c496c341f989a3f44c2e1e314e646 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 4 Nov 2025 01:03:58 +0000
Subject: [PATCH 4/4] caneda: modernise

---
 pkgs/by-name/ca/caneda/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/caneda/package.nix b/pkgs/by-name/ca/caneda/package.nix
index 284dd6e72fe8..4e157aa9ee5d 100644
--- a/pkgs/by-name/ca/caneda/package.nix
+++ b/pkgs/by-name/ca/caneda/package.nix
@@ -7,14 +7,14 @@
   libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "caneda";
   version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "Caneda";
     repo = "Caneda";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ=";
   };
 
@@ -39,10 +39,11 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Open source EDA software focused on easy of use and portability";
+    changelog = "https://github.com/Caneda/Caneda/releases/tag/${finalAttrs.version}";
     mainProgram = "caneda";
     homepage = "http://caneda.org";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ magicquark ];
     platforms = with lib.platforms; linux;
   };
-}
+})