From 26b29edc7abcfb6e4e4925fafd7e4ae85d2d0120 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 9 Jun 2025 15:46:49 +0800 Subject: [PATCH] yabar: drop the 'yabar' upstream project was archived --- .../window-managers/yabar/build.nix | 93 ------------------- .../window-managers/yabar/default.nix | 23 ----- .../window-managers/yabar/unstable.nix | 44 --------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 4 - 5 files changed, 2 insertions(+), 164 deletions(-) delete mode 100644 pkgs/applications/window-managers/yabar/build.nix delete mode 100644 pkgs/applications/window-managers/yabar/default.nix delete mode 100644 pkgs/applications/window-managers/yabar/unstable.nix diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix deleted file mode 100644 index b455b32fa7ae..000000000000 --- a/pkgs/applications/window-managers/yabar/build.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ - stdenv, - fetchFromGitHub, - cairo, - gdk-pixbuf, - libconfig, - pango, - pkg-config, - xcbutilwm, - alsa-lib, - wirelesstools, - asciidoc, - libxslt, - makeWrapper, - docbook_xsl, - configFile ? null, - lib, - rev, - sha256, - version, - patches ? [ ], -}: - -stdenv.mkDerivation { - pname = "yabar"; - inherit version; - - src = fetchFromGitHub { - inherit rev sha256; - - owner = "geommer"; - repo = "yabar"; - }; - - inherit patches; - - hardeningDisable = [ "format" ]; - - strictDeps = true; - depsBuildBuild = [ - pkg-config - ]; - nativeBuildInputs = [ - pkg-config - asciidoc - docbook_xsl - libxslt - makeWrapper - libconfig - pango - ]; - buildInputs = [ - cairo - gdk-pixbuf - libconfig - pango - xcbutilwm - alsa-lib - wirelesstools - ]; - - postPatch = '' - substituteInPlace ./Makefile \ - --replace "\$(shell git describe)" "${version}" \ - --replace "a2x" "a2x --no-xmllint" - ''; - - makeFlags = [ - "DESTDIR=$(out)" - "PREFIX=/" - ]; - - postInstall = '' - mkdir -p $out/share/yabar/examples - cp -v examples/*.config $out/share/yabar/examples - - ${lib.optionalString (configFile != null) '' - wrapProgram "$out/bin/yabar" \ - --add-flags "-c ${configFile}" - ''} - ''; - - #passthru.tests = { inherit (nixosTests) yabar; }; # nixos currently uses yabar-unstable - - meta = with lib; { - description = "Modern and lightweight status bar for X window managers"; - homepage = "https://github.com/geommer/yabar"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ ]; - mainProgram = "yabar"; - }; -} diff --git a/pkgs/applications/window-managers/yabar/default.nix b/pkgs/applications/window-managers/yabar/default.nix deleted file mode 100644 index 5a58d086340c..000000000000 --- a/pkgs/applications/window-managers/yabar/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - callPackage, - attrs ? { }, - fetchpatch, -}: - -let - overrides = rec { - version = "0.4.0"; - - rev = version; - sha256 = "1nw9dar1caqln5fr0dqk7dg6naazbpfwwzxwlkxz42shsc3w30a6"; - - patches = [ - (fetchpatch { - url = "https://github.com/geommer/yabar/commit/9779a5e04bd6e8cdc1c9fcf5d7ac31416af85a53.patch"; - sha256 = "1szhr3k1kq6ixgnp74wnzgfvgxm6r4zpc3ny2x2wzy6lh2czc07s"; - }) - ]; - - } // attrs; -in -callPackage ./build.nix overrides diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix deleted file mode 100644 index 44998faaf667..000000000000 --- a/pkgs/applications/window-managers/yabar/unstable.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - fetchpatch, - playerctl, - libxkbcommon, - callPackage, - nixosTests, - attrs ? { }, -}: - -let - pkg = callPackage ./build.nix ( - { - version = "unstable-2018-01-18"; - - rev = "c516e8e78d39dd2b339acadc4c175347171150bb"; - sha256 = "1p9lx78cayyn7qc2q66id2xfs76jyddnqv2x1ypsvixaxwcvqgdb"; - } - // attrs - ); -in -pkg.overrideAttrs (o: { - buildInputs = o.buildInputs ++ [ - playerctl - libxkbcommon - ]; - - makeFlags = o.makeFlags ++ [ - "PLAYERCTL=1" - ]; - - patches = (o.patches or [ ]) ++ [ - (fetchpatch { - url = "https://github.com/geommer/yabar/commit/008dc1420ff684cf12ce2ef3ac9d642e054e39f5.patch"; - sha256 = "1q7nd66ai6nr2m6iqxn55gvbr4r5gjc00c8wyjc3riv31qcbqbhv"; - }) - ]; - - passthru = (o.passthru or { }) // { - tests = (o.passthru.tests or { }) // { - inherit (nixosTests) yabar; - }; - }; - -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7b352fbce19b..3c3403991c8d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2121,6 +2121,8 @@ mapAliases { yandex-browser-beta = throw "'yandex-browser-beta' has been removed, as it was broken and unmaintained"; # Added 2025-04-17 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 + yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10 + yabar-unstable = yabar; # Added 2025-06-10 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2e4e3b8a249..3fbc1a8168cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14578,10 +14578,6 @@ with pkgs; xygrib = libsForQt5.callPackage ../applications/misc/xygrib { }; - yabar = callPackage ../applications/window-managers/yabar { }; - - yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { }; - ydiff = with python3.pkgs; toPythonApplication ydiff; yokadi = python3Packages.callPackage ../applications/misc/yokadi { };