From e121bb4312fdffc6dbac238dacc6c2493d4084c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Mon, 9 Mar 2026 00:43:45 +0100 Subject: [PATCH 1/2] xp-pen-deco-01-v2-driver: drop --- .../xp-pen-drivers/deco-01-v2/default.nix | 82 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/qt5-packages.nix | 2 - 4 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix diff --git a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix deleted file mode 100644 index 05c4bfee3ce4..000000000000 --- a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - libusb1, - glibc, - libGL, - makeWrapper, - qtx11extras, - wrapQtAppsHook, - autoPatchelfHook, - libx11, - libxtst, - libxi, - libxrandr, - libxinerama, -}: - -let - dataDir = "var/lib/xppend1v2"; -in -stdenv.mkDerivation rec { - pname = "xp-pen-deco-01-v2-driver"; - version = "3.4.9-231023"; - - src = fetchzip { - url = "https://www.xp-pen.com/download/file/id/1936/pid/440/ext/gz.html#.tar.gz"; - name = "xp-pen-deco-01-v2-driver-${version}.tar.gz"; - sha256 = "sha256-A/dv6DpelH0NHjlGj32tKv37S+9q3F8cYByiYlMuqLg="; - }; - - nativeBuildInputs = [ - wrapQtAppsHook - autoPatchelfHook - makeWrapper - ]; - - dontBuild = true; - - dontWrapQtApps = true; # this is done manually - - buildInputs = [ - libusb1 - libx11 - libxtst - libxi - libxrandr - libxinerama - glibc - libGL - (lib.getLib stdenv.cc.cc) - qtx11extras - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{opt,bin} - cp -r App/usr/lib/pentablet/{PenTablet,resource.rcc,conf} $out/opt - chmod +x $out/opt/PenTablet - cp -r App/lib $out/lib - sed -i 's#usr/lib/pentablet#${dataDir}#g' $out/opt/PenTablet - - runHook postInstall - ''; - - postFixup = '' - makeWrapper $out/opt/PenTablet $out/bin/xp-pen-deco-01-v2-driver \ - "''${qtWrapperArgs[@]}" \ - --run 'if [ "$EUID" -ne 0 ]; then echo "Please run as root."; exit 1; fi' \ - --run 'if [ ! -d /${dataDir} ]; then mkdir -p /${dataDir}; cp -r '$out'/opt/conf /${dataDir}; chmod u+w -R /${dataDir}; fi' - ''; - - meta = { - homepage = "https://www.xp-pen.com/product/461.html"; - description = "Drivers for the XP-PEN Deco 01 v2 drawing tablet"; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ virchau13 ]; - license = lib.licenses.unfree; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e31aa77a83c6..0d93268e2bc5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2409,6 +2409,7 @@ mapAliases { xorgserver = xorg-server; # Added 2026-02-04 xorgsgmldoctools = xorg-sgml-doctools; # Added 2026-01-19 xow_dongle-firmware = throw "'xow_dongle-firmware' has been renamed to/replaced by 'xone-dongle-firmware'"; # Added 2025-12-30 + xp-pen-deco-01-v2-driver = warnAlias "'xp-pen-deco-01-v2-driver' has been replaced by 'xppen_4'. Consider using it with 'programs.xppen' module." xppen_4; # Added 2026-02-02 xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22 xsynth-dssi = throw "'xsynth-dssi' was removed due to lack of upstream maintenance and relying on gtk2"; # Added 2025-12-02 xtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 801652b02a16..03381e0ffa01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12430,8 +12430,6 @@ with pkgs; openbsd = callPackage ../os-specific/bsd/openbsd { }; - xp-pen-deco-01-v2-driver = libsForQt5.xp-pen-deco-01-v2-driver; - radicle-node-unstable = callPackage ../by-name/ra/radicle-node/unstable.nix { }; newlib-nano = newlib.override { diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 58c73a157878..a349acd425a3 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -216,8 +216,6 @@ makeScopeWithSplicing' { signond = callPackage ../development/libraries/signond { }; timed = callPackage ../applications/system/timed { }; - - xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { }; } // lib.optionalAttrs config.allowAliases { kf5gpgmepp = throw '' From 51bed2b0c107b9422fa3dc6beeafee60b760e04c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 11 Feb 2026 02:32:10 +0100 Subject: [PATCH 2/2] xp-pen-g430-driver: drop --- .../by-name/xp/xp-pen-g430-driver/package.nix | 51 ------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 pkgs/by-name/xp/xp-pen-g430-driver/package.nix diff --git a/pkgs/by-name/xp/xp-pen-g430-driver/package.nix b/pkgs/by-name/xp/xp-pen-g430-driver/package.nix deleted file mode 100644 index bb745306080a..000000000000 --- a/pkgs/by-name/xp/xp-pen-g430-driver/package.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - autoPatchelfHook, - libusb1, - libx11, - libxtst, - qt5, - libglvnd, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xp-pen-g430-driver"; - version = "1.2.13.1"; - - src = fetchzip { - url = "https://archive.org/download/linux-pentablet-v-1.2.13.1.tar.gz-20200428/Linux_Pentablet_V1.2.13.1.tar.gz%2820200428%29.zip/Linux_Pentablet_V1.2.13.1.tar.gz"; - name = "xp-pen-g430-driver-${finalAttrs.version}.tar.gz"; - hash = "sha256-Wavf4EAzR/NX3GOfdAEdFX08gkD03FVvAkIl37Zmipc="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - qt5.wrapQtAppsHook - ]; - - buildInputs = [ - libusb1 - libx11 - libxtst - qt5.qtbase - libglvnd - (lib.getLib stdenv.cc.cc) - ]; - - installPhase = '' - mkdir -p $out/bin - cp Pentablet_Driver $out/bin/pentablet-driver - cp config.xml $out/bin/config.xml - ''; - - meta = { - homepage = "https://www.xp-pen.com/download-46.html"; - description = "Driver for XP-PEN Pentablet drawing tablets"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = [ ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0d93268e2bc5..fd8daadc81eb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2410,6 +2410,7 @@ mapAliases { xorgsgmldoctools = xorg-sgml-doctools; # Added 2026-01-19 xow_dongle-firmware = throw "'xow_dongle-firmware' has been renamed to/replaced by 'xone-dongle-firmware'"; # Added 2025-12-30 xp-pen-deco-01-v2-driver = warnAlias "'xp-pen-deco-01-v2-driver' has been replaced by 'xppen_4'. Consider using it with 'programs.xppen' module." xppen_4; # Added 2026-02-02 + xp-pen-g430-driver = warnAlias "'xp-pen-g430-driver' has been replaced by 'xppen_3'. Consider using it with 'programs.xppen' module." xppen_3; # Added 2026-02-02 xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22 xsynth-dssi = throw "'xsynth-dssi' was removed due to lack of upstream maintenance and relying on gtk2"; # Added 2025-12-02 xtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13