From 740bbde05d5a4aef9af6e90ab39fa5456bdeec85 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 18 Feb 2026 09:45:58 -0600 Subject: [PATCH] i3-resurrect: migrate to by-name --- .../i3/i3-resurrect/package.nix} | 19 +++++++------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 14 deletions(-) rename pkgs/{applications/window-managers/i3/i3-resurrect.nix => by-name/i3/i3-resurrect/package.nix} (75%) diff --git a/pkgs/applications/window-managers/i3/i3-resurrect.nix b/pkgs/by-name/i3/i3-resurrect/package.nix similarity index 75% rename from pkgs/applications/window-managers/i3/i3-resurrect.nix rename to pkgs/by-name/i3/i3-resurrect/package.nix index 1cfb8a616574..3966dce0fec5 100644 --- a/pkgs/applications/window-managers/i3/i3-resurrect.nix +++ b/pkgs/by-name/i3/i3-resurrect/package.nix @@ -1,17 +1,12 @@ { lib, - buildPythonApplication, - click, - i3ipc, - psutil, - natsort, + python3Packages, fetchPypi, xprop, xdotool, - importlib-metadata, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "i3-resurrect"; version = "1.4.5"; format = "setuptools"; @@ -22,13 +17,13 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ - click - psutil + python3Packages.click + python3Packages.psutil xprop - natsort - i3ipc + python3Packages.natsort + python3Packages.i3ipc xdotool - importlib-metadata + python3Packages.importlib-metadata ]; doCheck = false; # no tests diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9fafdf995ed..eb808e63e450 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9513,8 +9513,6 @@ with pkgs; i3-ratiosplit = callPackage ../applications/window-managers/i3/i3-ratiosplit.nix { }; - i3-resurrect = python3Packages.callPackage ../applications/window-managers/i3/i3-resurrect.nix { }; - i3-swallow = python3Packages.callPackage ../applications/window-managers/i3/swallow.nix { }; i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };