Merge staging-next into staging

2 files changed, 34 insertions, 61 deletions

diff --git a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix
new file mode 100644
index 00000000000..0a700a52573
--- /dev/null
+++ b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pdm-backend
+, more-itertools
+, click
+}:
+
+buildPythonPackage rec {
+  pname = "hyprshade";
+  version = "0.9.3";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "loqusion";
+    repo = "hyprshade";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ou072V9nZUqf5DEolkMQy979SjaZs4iOuoszw50k4Y8=";
+  };
+
+  nativeBuildInputs = [
+    pdm-backend
+  ];
+
+  propagatedBuildInputs = [ more-itertools click ];
+
+  meta = with lib; {
+    homepage = "https://github.com/loqusion/hyprshade";
+    description = "Hyprland shade configuration tool";
+    license = licenses.mit;
+    maintainers = with maintainers; [ willswats ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix
deleted file mode 100644
index fdd9604f7c7..00000000000
--- a/pkgs/applications/window-managers/oroborus/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, freetype
-, fribidi
-, libICE
-, libSM
-, libXaw
-, libXext
-, libXft
-, libXinerama
-, libXmu
-, libXpm
-, libXrandr
-, libXrender
-, libXt
-, pkg-config
-, xorgproto
-}:
-
-stdenv.mkDerivation rec {
-  pname = "oroborus";
-  version = "2.0.20";
-
-  src = fetchurl {
-    url = "mirror://debian/pool/main/o/oroborus/oroborus_${version}.tar.gz";
-    hash = "sha256-UiClQLz2gSxnc/vlg9nqP1T0UsusVb7cqt66jDqae4k=a";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    freetype
-    fribidi
-    libICE
-    libSM
-    libXaw
-    libXext
-    libXft
-    libXinerama
-    libXmu
-    libXpm
-    libXrandr
-    libXrender
-    libXt
-    xorgproto
-  ];
-
-  # Workaround build failure on -fno-common toolchains:
-  #   ld: workspaces.o:src/keyboard.h:93: multiple definition of
-  #     `NumLockMask'; client.o:src/keyboard.h:93: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  meta = with lib; {
-    homepage = "https://web.archive.org/web/20191129172107/https://www.oroborus.org/";
-    description = "A really minimalistic X window manager";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.linux;
-  };
-}