Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

4 files changed, 0 insertions, 199 deletions

diff --git a/nixpkgs/pkgs/applications/window-managers/picom/default.nix b/nixpkgs/pkgs/applications/window-managers/picom/default.nix
deleted file mode 100644
index ade2c1e0ddfe..000000000000
--- a/nixpkgs/pkgs/applications/window-managers/picom/default.nix
+++ /dev/null
@@ -1,118 +0,0 @@
-{ asciidoc
-, dbus
-, docbook_xml_dtd_45
-, docbook_xsl
-, fetchFromGitHub
-, lib
-, libconfig
-, libdrm
-, libev
-, libGL
-, libX11
-, libxcb
-, libxdg_basedir
-, libXext
-, libxml2
-, libxslt
-, makeWrapper
-, meson
-, ninja
-, pcre2
-, pixman
-, pkg-config
-, stdenv
-, uthash
-, xcbutil
-, xcbutilimage
-, xcbutilrenderutil
-, xorgproto
-, xwininfo
-, withDebug ? false
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "picom";
-  version = "11.1";
-
-  src = fetchFromGitHub {
-    owner = "yshui";
-    repo = "picom";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-vdR3HzBZxtth3zJD3vMSlrnBTbopidw7FGKOk69S0R0=";
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [
-    asciidoc
-    docbook_xml_dtd_45
-    docbook_xsl
-    makeWrapper
-    meson
-    ninja
-    pkg-config
-    uthash
-  ];
-
-  buildInputs = [
-    dbus
-    libconfig
-    libdrm
-    libev
-    libGL
-    libX11
-    libxcb
-    libxdg_basedir
-    libXext
-    libxml2
-    libxslt
-    pcre2
-    pixman
-    xcbutil
-    xcbutilimage
-    xcbutilrenderutil
-    xorgproto
-  ];
-
-  # Use "debugoptimized" instead of "debug" so perhaps picom works better in
-  # normal usage too, not just temporary debugging.
-  mesonBuildType = if withDebug then "debugoptimized" else "release";
-  dontStrip = withDebug;
-
-  mesonFlags = [
-    "-Dwith_docs=true"
-  ];
-
-  installFlags = [ "PREFIX=$(out)" ];
-
-  # In debug mode, also copy src directory to store. If you then run `gdb picom`
-  # in the bin directory of picom store path, gdb finds the source files.
-  postInstall = ''
-    wrapProgram $out/bin/picom-trans \
-      --prefix PATH : ${lib.makeBinPath [ xwininfo ]}
-  '' + lib.optionalString withDebug ''
-    cp -r ../src $out/
-  '';
-
-  meta = with lib; {
-    description = "A fork of XCompMgr, a sample compositing manager for X servers";
-    longDescription = ''
-      A fork of XCompMgr, which is a sample compositing manager for X
-      servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
-      extensions. It enables basic eye-candy effects. This fork adds
-      additional features, such as additional effects, and a fork at a
-      well-defined and proper place.
-
-      The package can be installed in debug mode as:
-
-        picom.override { withDebug = true; }
-
-      For gdb to find the source files, you need to run gdb in the bin directory
-      of picom package in the nix store.
-    '';
-    license = licenses.mit;
-    homepage = "https://github.com/yshui/picom";
-    maintainers = with maintainers; [ ertes gepbird twey thiagokokada ];
-    platforms = platforms.linux;
-    mainProgram = "picom";
-  };
-})
diff --git a/nixpkgs/pkgs/applications/window-managers/picom/picom-allusive.nix b/nixpkgs/pkgs/applications/window-managers/picom/picom-allusive.nix
deleted file mode 100644
index e0086142f1c3..000000000000
--- a/nixpkgs/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/nixpkgs/pkgs/applications/window-managers/picom/picom-jonaburg.nix b/nixpkgs/pkgs/applications/window-managers/picom/picom-jonaburg.nix
deleted file mode 100644
index d04cf5f4ecd6..000000000000
--- a/nixpkgs/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/nixpkgs/pkgs/applications/window-managers/picom/picom-next.nix b/nixpkgs/pkgs/applications/window-managers/picom/picom-next.nix
deleted file mode 100644
index 22c748088074..000000000000
--- a/nixpkgs/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 ];
-  };
-})