Unverified Commit 0ce6cd66 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #288667 from thiagokokada/cleanup-picom

picom-{allusive,jonaburg}: remove; picom-next: alias to picom;  picom: migrate to by-name 
parents 4c5f133d 51aca4da
Loading
Loading
Loading
Loading
+0 −26
Original line number Diff line number Diff line
{ 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 ];
  };
})
+0 −20
Original line number Diff line number Diff line
{ 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 ];
  };
})
+0 −35
Original line number Diff line number Diff line
{ 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 ];
  };
})
+3 −0
Original line number Diff line number Diff line
@@ -825,6 +825,9 @@ 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
  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
Loading