diff options
author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2024-02-13 21:02:18 +0000 |
---|---|---|
committer | Thiago Kenji Okada <thiagokokada@gmail.com> | 2024-02-13 21:07:46 +0000 |
commit | e084adaf44bbf0f4ae8bdfb24b03608fe05cb996 (patch) | |
tree | c06f9ecd19f8f2d1d83e1c30dad22988e031530f | |
parent | 03ddd6654e74c2343b43e84338b279dc13c2089a (diff) | |
download | nixlib-e084adaf44bbf0f4ae8bdfb24b03608fe05cb996.tar nixlib-e084adaf44bbf0f4ae8bdfb24b03608fe05cb996.tar.gz nixlib-e084adaf44bbf0f4ae8bdfb24b03608fe05cb996.tar.bz2 nixlib-e084adaf44bbf0f4ae8bdfb24b03608fe05cb996.tar.lz nixlib-e084adaf44bbf0f4ae8bdfb24b03608fe05cb996.tar.xz nixlib-e084adaf44bbf0f4ae8bdfb24b03608fe05cb996.tar.zst nixlib-e084adaf44bbf0f4ae8bdfb24b03608fe05cb996.zip |
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.
-rw-r--r-- | pkgs/applications/window-managers/picom/picom-next.nix | 35 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 1 insertions, 37 deletions
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 { }; |