From 9254f9fd5074fc6791027e7f4255a62337f2c739 Mon Sep 17 00:00:00 2001 From: Harinn Date: Wed, 11 Feb 2026 11:44:28 +0700 Subject: [PATCH 1/3] qcad: 3.32.5.0 -> 3.32.6.0 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index af4545e79946..6e8cc25a4810 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "qcad"; - version = "3.32.5.0"; + version = "3.32.6.0"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-sg9Vrekh57JAQb1o8AWDkDuOs3ovELJ2WTTXPa+e3JU="; + hash = "sha256-7PckPPD7CWd+IQWTLhr5+vizIjPpRdva2yDOyC6t0Uc="; }; patches = [ From 4f29bdf8a22d275368d41f20badf45cf9d4a9964 Mon Sep 17 00:00:00 2001 From: Harinn Date: Wed, 11 Feb 2026 11:47:00 +0700 Subject: [PATCH 2/3] qcad: migrate rec to finalAttrs --- pkgs/applications/misc/qcad/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 6e8cc25a4810..1d273cbb30b9 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -17,15 +17,15 @@ wrapQtAppsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qcad"; version = "3.32.6.0"; src = fetchFromGitHub { - name = "qcad-${version}-src"; + name = "${finalAttrs.pname}-${finalAttrs.version}-src"; owner = "qcad"; repo = "qcad"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-7PckPPD7CWd+IQWTLhr5+vizIjPpRdva2yDOyC6t0Uc="; }; @@ -136,4 +136,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ yvesf ]; platforms = qtbase.meta.platforms; }; -} +}) From 03b1e9e83df453927e6ce31ba9e8b5ecf1d57541 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 14 Feb 2026 21:08:08 +0700 Subject: [PATCH 3/3] qcad: migrate to by-name --- .../qc}/qcad/application-dir.patch | 0 .../qc/qcad/package.nix} | 39 ++++++++----------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 16 insertions(+), 25 deletions(-) rename pkgs/{applications/misc => by-name/qc}/qcad/application-dir.patch (100%) rename pkgs/{applications/misc/qcad/default.nix => by-name/qc/qcad/package.nix} (82%) diff --git a/pkgs/applications/misc/qcad/application-dir.patch b/pkgs/by-name/qc/qcad/application-dir.patch similarity index 100% rename from pkgs/applications/misc/qcad/application-dir.patch rename to pkgs/by-name/qc/qcad/application-dir.patch diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/by-name/qc/qcad/package.nix similarity index 82% rename from pkgs/applications/misc/qcad/default.nix rename to pkgs/by-name/qc/qcad/package.nix index 1d273cbb30b9..502bc3030932 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/by-name/qc/qcad/package.nix @@ -4,17 +4,10 @@ fetchFromGitHub, installShellFiles, pkg-config, - qmake, - qttools, + qt5, boost, libGLU, muparser, - qtbase, - qtscript, - qtsvg, - qtxmlpatterns, - qtmacextras, - wrapQtAppsHook, }: stdenv.mkDerivation (finalAttrs: { @@ -35,33 +28,33 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version} ]; then - mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version} + if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} ]; then + mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} cp \ src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \ - src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}/qt-labs-qtscriptgenerator-${qtbase.version}.pro + src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.pro fi ''; nativeBuildInputs = [ installShellFiles pkg-config - qmake - qttools - wrapQtAppsHook + qt5.qmake + qt5.qttools + qt5.wrapQtAppsHook ]; buildInputs = [ boost libGLU muparser - qtbase - qtscript - qtsvg - qtxmlpatterns + qt5.qtbase + qt5.qtscript + qt5.qtsvg + qt5.qtxmlpatterns ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - qtmacextras + qt5.qtmacextras ]; qmakeFlags = [ @@ -113,13 +106,13 @@ stdenv.mkDerivation (finalAttrs: { # workaround to fix the library browser: rm -r $out/lib/plugins/sqldrivers - ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers + ln -s -t $out/lib/plugins ${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}/sqldrivers rm -r $out/lib/plugins/printsupport - ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/printsupport + ln -s -t $out/lib/plugins ${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}/printsupport rm -r $out/lib/plugins/imageformats - ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/imageformats + ln -s -t $out/lib/plugins ${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}/imageformats install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/org.qcad.QCAD.svg @@ -134,6 +127,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Only; mainProgram = "qcad"; maintainers = with lib.maintainers; [ yvesf ]; - platforms = qtbase.meta.platforms; + platforms = qt5.qtbase.meta.platforms; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2500b65d51..fd5e78f68778 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10689,8 +10689,6 @@ with pkgs; qbittorrent-enhanced-nox = qbittorrent-enhanced.override { guiSupport = false; }; - qcad = libsForQt5.callPackage ../applications/misc/qcad { }; - qctools = libsForQt5.callPackage ../applications/video/qctools { }; qelectrotech = libsForQt5.callPackage ../applications/misc/qelectrotech { };