From 689b24f7da82c9f581255062537783d7bb6b9d6a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 17 Aug 2024 18:49:29 +0200 Subject: [PATCH] ragnarwm: drop --- .../services/x11/window-managers/default.nix | 1 - .../services/x11/window-managers/ragnarwm.nix | 31 -------- nixos/tests/all-tests.nix | 1 - nixos/tests/ragnarwm.nix | 38 ---------- pkgs/by-name/ra/ragnarwm/package.nix | 73 ------------------- pkgs/top-level/aliases.nix | 1 + 6 files changed, 1 insertion(+), 144 deletions(-) delete mode 100644 nixos/modules/services/x11/window-managers/ragnarwm.nix delete mode 100644 nixos/tests/ragnarwm.nix delete mode 100644 pkgs/by-name/ra/ragnarwm/package.nix diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 57a91fe09159..9d7ed19480ee 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -34,7 +34,6 @@ in ./openbox.nix ./pekwm.nix ./notion.nix - ./ragnarwm.nix ./ratpoison.nix ./sawfish.nix ./smallwm.nix diff --git a/nixos/modules/services/x11/window-managers/ragnarwm.nix b/nixos/modules/services/x11/window-managers/ragnarwm.nix deleted file mode 100644 index 0c5b06fb4e57..000000000000 --- a/nixos/modules/services/x11/window-managers/ragnarwm.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -let - cfg = config.services.xserver.windowManager.ragnarwm; -in -{ - ###### interface - - options = { - services.xserver.windowManager.ragnarwm = { - enable = mkEnableOption "ragnarwm"; - package = mkPackageOption pkgs "ragnarwm" { }; - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - services.displayManager.sessionPackages = [ cfg.package ]; - environment.systemPackages = [ cfg.package ]; - }; - - meta.maintainers = with lib.maintainers; [ sigmanificient ]; -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f6093eb7e14a..d62d95c4889f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1387,7 +1387,6 @@ in radicale = runTest ./radicale.nix; radicle = runTest ./radicle.nix; radicle-ci-broker = runTest ./radicle-ci-broker.nix; - ragnarwm = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ragnarwm.nix; rasdaemon = runTest ./rasdaemon.nix; rathole = runTest ./rathole.nix; rauc = runTest ./rauc.nix; diff --git a/nixos/tests/ragnarwm.nix b/nixos/tests/ragnarwm.nix deleted file mode 100644 index f951f4aff389..000000000000 --- a/nixos/tests/ragnarwm.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, ... }: -{ - name = "ragnarwm"; - - meta = { - maintainers = with lib.maintainers; [ sigmanificient ]; - }; - - nodes.machine = - { pkgs, lib, ... }: - { - imports = [ - ./common/x11.nix - ./common/user-account.nix - ]; - test-support.displayManager.auto.user = "alice"; - services.displayManager.defaultSession = lib.mkForce "ragnar"; - services.xserver.windowManager.ragnarwm.enable = true; - - # Setup the default terminal of Ragnar - environment.systemPackages = [ pkgs.alacritty ]; - }; - - testScript = '' - with subtest("ensure x starts"): - machine.wait_for_x() - machine.wait_for_file("/home/alice/.Xauthority") - machine.succeed("xauth merge ~alice/.Xauthority") - - with subtest("ensure we can open a new terminal"): - # Sleeping a bit before the test, as it may help for sending keys - machine.sleep(2) - machine.send_key("meta_l-ret") - machine.wait_for_window(r"alice.*?machine") - machine.sleep(2) - machine.screenshot("terminal") - ''; -} diff --git a/pkgs/by-name/ra/ragnarwm/package.nix b/pkgs/by-name/ra/ragnarwm/package.nix deleted file mode 100644 index dee88d1aa92d..000000000000 --- a/pkgs/by-name/ra/ragnarwm/package.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - writeText, - fontconfig, - libx11, - libxft, - libxcursor, - libxcomposite, - conf ? null, - nixosTests, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "ragnarwm"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "cococry"; - repo = "Ragnar"; - tag = finalAttrs.version; - hash = "sha256-OZhIwrKEhTfkw9K8nZIwGZzxXBObseWS92Y+85HmdNs="; - }; - - prePatch = '' - substituteInPlace Makefile \ - --replace-fail '/usr/bin' "$out/bin" \ - --replace-fail '/usr/share' "$out/share" - ''; - - postPatch = - let - configFile = - if lib.isDerivation conf || builtins.isPath conf then conf else writeText "config.h" conf; - in - lib.optionalString (conf != null) "cp ${configFile} config.h"; - - buildInputs = [ - fontconfig - libx11 - libxft - libxcursor - libxcomposite - ]; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - enableParallelBuilding = true; - - preInstall = '' - mkdir -p $out/bin - mkdir -p $out/share/applications - ''; - - postInstall = '' - install -Dm644 $out/share/applications/ragnar.desktop $out/share/xsessions/ragnar.desktop - ''; - - passthru = { - tests.ragnarwm = nixosTests.ragnarwm; - providedSessions = [ "ragnar" ]; - }; - - meta = { - description = "Minimal, flexible & user-friendly X tiling window manager"; - homepage = "https://ragnar-website.vercel.app"; - changelog = "https://github.com/cococry/Ragnar/releases/tag/${finalAttrs.version}"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sigmanificient ]; - mainProgram = "ragnar"; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af55e1118485..c212d55f7324 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1746,6 +1746,7 @@ mapAliases { rabbit = throw "'rabbit' has been renamed to/replaced by 'rabbit-ng'"; # Added 2026-02-18 radiance = throw "'radiance' has been removed as it was broken for a long time"; # Added 2026-01-02 radicale3 = throw "'radicale3' has been renamed to/replaced by 'radicale'"; # Converted to throw 2025-10-27 + ragnarwm = throw "'ragnarwm' has been removed as it was broken"; # Added 2026-04-21 railway-travel = throw "'railway-travel' has been renamed to/replaced by 'diebahn'"; # Converted to throw 2025-10-27 rambox-pro = throw "'rambox-pro' has been renamed to/replaced by 'rambox'"; # Converted to throw 2025-10-27 rapidjson-unstable = throw "'rapidjson-unstable' has been renamed to/replaced by 'rapidjson'"; # Converted to throw 2025-10-27