From f68c5bb998b47f22f9376b4f735b6e6d10373fef Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 13 Feb 2024 21:00:45 +0000 Subject: [PATCH 1/4] picom-allusive: remove --- .../window-managers/picom/picom-allusive.nix | 26 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/applications/window-managers/picom/picom-allusive.nix diff --git a/pkgs/applications/window-managers/picom/picom-allusive.nix b/pkgs/applications/window-managers/picom/picom-allusive.nix deleted file mode 100644 index e0086142f1c3..000000000000 --- a/pkgs/applications/window-managers/picom/picom-allusive.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ picom, lib, fetchFromGitHub, installShellFiles, pcre }: - -picom.overrideAttrs (oldAttrs: rec { - pname = "picom-allusive"; - version = "1.2.5"; - - src = fetchFromGitHub { - owner = "allusive-dev"; - repo = "picom-allusive"; - rev = version; - hash = "sha256-yM4TJjoVs+i33m/u/oWlx1TDKJrgwlfiGu72DOL/tl8="; - }; - - nativeBuildInputs = [ installShellFiles pcre ] ++ oldAttrs.nativeBuildInputs; - - postInstall = '' - installManPage $src/man/picom.1.gz - '' + (lib.optionalString (oldAttrs ? postInstall) oldAttrs.postInstall); - - meta = (builtins.removeAttrs oldAttrs.meta [ "longDescription" ]) // { - description = "A fork of picom featuring improved animations and other features"; - homepage = "https://github.com/allusive-dev/picom-allusive"; - license = with lib.licenses; [ mit mpl20 ]; - maintainers = with lib.maintainers; [ allusive iogamaster ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d94efa53ea09..20a460de7909 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -824,6 +824,7 @@ mapAliases ({ pharo-spur64 = pharo; # Added 2022-08-03 phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 + picom-allusive = throw "picom-allusive was renamed to compfy and is being abandoned by upstream"; # Added 2024-02-13 # Obsolete PHP version aliases php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b36b4132b3c2..0c8111de497b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36440,8 +36440,6 @@ with pkgs; picom = callPackage ../applications/window-managers/picom { }; - picom-allusive = callPackage ../applications/window-managers/picom/picom-allusive.nix { }; - picom-jonaburg = callPackage ../applications/window-managers/picom/picom-jonaburg.nix { }; picom-next = callPackage ../applications/window-managers/picom/picom-next.nix { }; From 03ddd6654e74c2343b43e84338b279dc13c2089a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 13 Feb 2024 21:01:23 +0000 Subject: [PATCH 2/4] picom-jonaburg: remove --- .../window-managers/picom/picom-jonaburg.nix | 20 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 pkgs/applications/window-managers/picom/picom-jonaburg.nix diff --git a/pkgs/applications/window-managers/picom/picom-jonaburg.nix b/pkgs/applications/window-managers/picom/picom-jonaburg.nix deleted file mode 100644 index d04cf5f4ecd6..000000000000 --- a/pkgs/applications/window-managers/picom/picom-jonaburg.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ picom, lib, fetchFromGitHub, pcre }: - -picom.overrideAttrs (oldAttrs: rec { - pname = "picom-jonaburg"; - version = "unstable-2022-03-19"; - src = fetchFromGitHub { - owner = "jonaburg"; - repo = "picom"; - rev = "e3c19cd7d1108d114552267f302548c113278d45"; - sha256 = "sha256-4voCAYd0fzJHQjJo4x3RoWz5l3JJbRvgIXn1Kg6nz6Y="; - }; - - nativeBuildInputs = [ pcre ] ++ oldAttrs.nativeBuildInputs; - - meta = with lib; { - description = "A fork of picom featuring animations and improved rounded corners."; - homepage = "https://github.com/jonaburg/picom"; - maintainers = with maintainers; oldAttrs.meta.maintainers ++ [ michaelBelsanti ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 20a460de7909..6d88b72cfa66 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -825,6 +825,7 @@ mapAliases ({ phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 picom-allusive = throw "picom-allusive was renamed to compfy and is being abandoned by upstream"; # Added 2024-02-13 + picom-jonaburg = throw "picom-jonaburg was removed because it is unmaintained by upstream"; # Added 2024-02-13 # Obsolete PHP version aliases php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c8111de497b..24432cd2c974 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36440,8 +36440,6 @@ with pkgs; picom = callPackage ../applications/window-managers/picom { }; - picom-jonaburg = callPackage ../applications/window-managers/picom/picom-jonaburg.nix { }; - picom-next = callPackage ../applications/window-managers/picom/picom-next.nix { }; xd = callPackage ../applications/networking/p2p/xd { }; From e084adaf44bbf0f4ae8bdfb24b03608fe05cb996 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 13 Feb 2024 21:02:18 +0000 Subject: [PATCH 3/4] picom-next: alias to picom Since picom v11 there is no more reason to keep a separate picom derivation that tracks the `next` branch from upstream since the current release is basically the `next` branch. Also, picom-next right now is pointing to an old commit, so it is clear that nobody is maintaining it updated. If there is a necessity later, we can bring back the picom-next again. --- .../window-managers/picom/picom-next.nix | 35 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/applications/window-managers/picom/picom-next.nix diff --git a/pkgs/applications/window-managers/picom/picom-next.nix b/pkgs/applications/window-managers/picom/picom-next.nix deleted file mode 100644 index 22c748088074..000000000000 --- a/pkgs/applications/window-managers/picom/picom-next.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, fetchFromGitHub -, libXinerama -, pcre -, pcre2 -, picom -, xcbutil -}: - -picom.overrideAttrs (oldAttrs: { - pname = "picom-next"; - version = "unstable-2023-08-03"; - - buildInputs = [ - pcre2 - xcbutil - ] - # remove dependencies that are not used anymore - ++ (lib.subtractLists [ - libXinerama - pcre - ] - oldAttrs.buildInputs); - - src = fetchFromGitHub { - owner = "yshui"; - repo = "picom"; - rev = "5d6957d3da1bf99311a676eab94c69ef4276bedf"; - hash = "sha256-Mzf0533roLSODjMCPKyGSMbP7lIbT+PoLTZfoIBAI6g="; - }; - - meta = oldAttrs.meta // { - maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6d88b72cfa66..6b22af8ae0fc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -826,6 +826,7 @@ mapAliases ({ photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 picom-allusive = throw "picom-allusive was renamed to compfy and is being abandoned by upstream"; # Added 2024-02-13 picom-jonaburg = throw "picom-jonaburg was removed because it is unmaintained by upstream"; # Added 2024-02-13 + picom-next = picom; # Added 2024-02-13 # Obsolete PHP version aliases php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24432cd2c974..1e52adad004d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36440,8 +36440,6 @@ with pkgs; picom = callPackage ../applications/window-managers/picom { }; - picom-next = callPackage ../applications/window-managers/picom/picom-next.nix { }; - xd = callPackage ../applications/networking/p2p/xd { }; xdaliclock = callPackage ../tools/misc/xdaliclock { }; From 51aca4dadd20e3a0ff4908d3036a73c703e8a0fb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 13 Feb 2024 21:09:05 +0000 Subject: [PATCH 4/4] picom: migrate to by-name --- .../picom/default.nix => by-name/pi/picom/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/window-managers/picom/default.nix => by-name/pi/picom/package.nix} (100%) diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/by-name/pi/picom/package.nix similarity index 100% rename from pkgs/applications/window-managers/picom/default.nix rename to pkgs/by-name/pi/picom/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e52adad004d..d9258076db02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36438,8 +36438,6 @@ with pkgs; x-create-mouse-void = callPackage ../applications/window-managers/x-create-mouse-void { }; - picom = callPackage ../applications/window-managers/picom { }; - xd = callPackage ../applications/networking/p2p/xd { }; xdaliclock = callPackage ../tools/misc/xdaliclock { };