From a849a90897029a7a33ed0a8b76dc0ca936601f83 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 7 Jun 2025 11:49:43 +0800 Subject: [PATCH 1/2] yubikey-personalization-gui: drop --- .../yubikey-personalization-gui/default.nix | 62 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 pkgs/tools/misc/yubikey-personalization-gui/default.nix diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix deleted file mode 100644 index 1698737f2000..000000000000 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - mkDerivation, - pkg-config, - qtbase, - qmake, - imagemagick, - libyubikey, - yubikey-personalization, -}: - -mkDerivation rec { - pname = "yubikey-personalization-gui"; - version = "3.1.25"; - - src = fetchurl { - url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/yubikey-personalization-gui-${version}.tar.gz"; - sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8"; - }; - - nativeBuildInputs = [ - pkg-config - qmake - imagemagick - ]; - buildInputs = [ - yubikey-personalization - qtbase - libyubikey - ]; - - installPhase = '' - install -D -m0755 build/release/yubikey-personalization-gui "$out/bin/yubikey-personalization-gui" - install -D -m0644 resources/lin/yubikey-personalization-gui.1 "$out/share/man/man1/yubikey-personalization-gui.1" - - # Desktop files - install -D -m0644 resources/lin/yubikey-personalization-gui.desktop "$out/share/applications/yubikey-personalization-gui.desktop" - - # Icons - install -D -m0644 resources/lin/yubikey-personalization-gui.xpm "$out/share/pixmaps/yubikey-personalization-gui.xpm" - install -D -m0644 resources/lin/yubikey-personalization-gui.png "$out/share/icons/hicolor/128x128/apps/yubikey-personalization-gui.png" - for SIZE in 16 24 32 48 64 96; do - # set modify/create for reproducible builds - convert -scale ''${SIZE} +set date:create +set date:modify \ - resources/lin/yubikey-personalization-gui.png \ - yubikey-personalization-gui.png - - install -D -m0644 yubikey-personalization-gui.png "$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps/yubikey-personalization-gui.png" - done - ''; - - meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; - homepage = "https://developers.yubico.com/yubikey-personalization-gui"; - description = "QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; - license = licenses.bsd2; - platforms = platforms.unix; - mainProgram = "yubikey-personalization-gui"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 096df1a9a019..ffc514177b0d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2107,6 +2107,7 @@ mapAliases { yandex-browser-corporate = throw "'yandex-browser-corporate' has been removed, as it was broken and unmaintained"; # Added 2025-04-17 youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17 yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27 + yubikey-personalization-gui = throw "'yubikey-personalization-gui' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07 yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 yuzu = throw "yuzu has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 339dc8a399fe..0e6d427e4b0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9825,8 +9825,6 @@ with pkgs; yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { }; - yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; - zlib = callPackage ../development/libraries/zlib { stdenv = # zlib is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv From 25f6c2b2536033ed0171a4a741afa5e1aa9d5ec5 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 7 Jun 2025 13:06:57 +0800 Subject: [PATCH 2/2] yubikey-manager-qt: drop --- .../tools/misc/yubikey-manager-qt/default.nix | 98 ------------------- .../remove-upload-import.diff | 16 --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 116 deletions(-) delete mode 100644 pkgs/tools/misc/yubikey-manager-qt/default.nix delete mode 100644 pkgs/tools/misc/yubikey-manager-qt/remove-upload-import.diff diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix deleted file mode 100644 index 5dc4d4718e2b..000000000000 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - lib, - mkDerivation, - fetchurl, - imagemagick, - pcsclite, - pyotherside, - python3, - qmake, - qtbase, - qtgraphicaleffects, - qtquickcontrols2, - yubikey-manager, - yubikey-personalization, -}: - -mkDerivation rec { - pname = "yubikey-manager-qt"; - version = "1.2.5"; - - src = fetchurl { - url = "https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-${version}.tar.gz"; - hash = "sha256-6bKeR3UX2DhXGcKJ1bxvT1aLTgCfc+aNo6ckE89NV+I="; - }; - - patches = [ ./remove-upload-import.diff ]; - - nativeBuildInputs = [ - python3.pkgs.wrapPython - qmake - imagemagick - ]; - - postPatch = '' - substituteInPlace ykman-gui/deployment.pri --replace '/usr/bin' "$out/bin" - ''; - - buildInputs = [ - pyotherside - python3 - qtbase - qtgraphicaleffects - qtquickcontrols2 - ]; - - pythonPath = [ - (yubikey-manager.override { python3Packages = python3.pkgs; }) - ]; - - postInstall = '' - # Desktop files - install -D -m0644 resources/ykman-gui.desktop "$out/share/applications/ykman-gui.desktop" - substituteInPlace "$out/share/applications/ykman-gui.desktop" \ - --replace Exec=ykman-gui "Exec=$out/bin/ykman-gui" - - # Icons - install -Dt $out/share/ykman-gui/icons resources/icons/*.{icns,ico} - install -D -m0644 resources/icons/ykman.png "$out/share/icons/hicolor/128x128/apps/ykman.png" - ln -s -- "$out/share/icons/hicolor/128x128/apps/ykman.png" "$out/share/icons/hicolor/128x128/apps/ykman-gui.png" - for SIZE in 16 24 32 48 64 96; do - # set modify/create for reproducible builds - convert -scale ''${SIZE} +set date:create +set date:modify \ - resources/icons/ykman.png ykman.png - - imageFolder="$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps" - install -D -m0644 ykman.png "$imageFolder/ykman.png" - ln -s -- "$imageFolder/ykman.png" "$imageFolder/ykman-gui.png" - done - unset SIZE imageFolder - ''; - - qtWrapperArgs = [ - "--prefix" - "LD_LIBRARY_PATH" - ":" - (lib.makeLibraryPath [ - pcsclite - yubikey-personalization - ]) - ]; - - preFixup = '' - buildPythonPath "$pythonPath" - qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") - ''; - - meta = with lib; { - description = "Cross-platform application for configuring any YubiKey over all USB interfaces"; - homepage = "https://developers.yubico.com/yubikey-manager-qt/"; - knownVulnerabilities = [ - "Yubico has announced the End of Life of YubiKey Manager QT. Upstream recommends yubioath-flutter to configure a YubiKey. yubikey-manager-qt will be dropped after NixOS 25.05." - ]; - license = licenses.bsd2; - maintainers = [ maintainers.cbley ]; - mainProgram = "ykman-gui"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/yubikey-manager-qt/remove-upload-import.diff b/pkgs/tools/misc/yubikey-manager-qt/remove-upload-import.diff deleted file mode 100644 index 3e22803a3b56..000000000000 --- a/pkgs/tools/misc/yubikey-manager-qt/remove-upload-import.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- a/ykman-gui/py/yubikey.py 2025-01-08 19:42:20.058393985 +0100 -+++ b/ykman-gui/py/yubikey.py 2025-01-08 19:44:12.520364702 +0100 -@@ -50,12 +50,10 @@ - if int(ykman_v.split(".")[0] ) > 4: - from yubikit.support import get_name - from ykman.device import list_all_devices, scan_devices -- from ykman.otp import ( -- _PrepareUploadFailed as PrepareUploadFailed -- , _prepare_upload_key as prepare_upload_key, generate_static_pw) -+ from ykman.otp import generate_static_pw - else: - from ykman import connect_to_device, scan_devices, get_name - from ykman.otp import PrepareUploadFailed, prepare_upload_key, generate_static_pw - - from fido2.ctap2 import Ctap2, ClientPin - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ffc514177b0d..8151b0650080 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2107,6 +2107,7 @@ mapAliases { yandex-browser-corporate = throw "'yandex-browser-corporate' has been removed, as it was broken and unmaintained"; # Added 2025-04-17 youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17 yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27 + yubikey-manager-qt = throw "'yubikey-manager-qt' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07 yubikey-personalization-gui = throw "'yubikey-personalization-gui' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07 yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e6d427e4b0d..ef5df7439db3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9823,8 +9823,6 @@ with pkgs; xgboostWithCuda = xgboost.override { cudaSupport = true; }; - yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { }; - zlib = callPackage ../development/libraries/zlib { stdenv = # zlib is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv