From 5b405ca28c7996b3380ad6b75ae788028b7f5753 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 28 Mar 2024 18:35:30 +0800 Subject: [PATCH 1/3] hikari: remove --- .../window-managers/hikari/default.nix | 64 ------------------- pkgs/top-level/all-packages.nix | 4 -- 2 files changed, 68 deletions(-) delete mode 100644 pkgs/applications/window-managers/hikari/default.nix diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix deleted file mode 100644 index 508f13f985b2..000000000000 --- a/pkgs/applications/window-managers/hikari/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchzip -, pkg-config, bmake -, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman -, libucl, wayland, wayland-protocols, wlroots, mesa -, features ? { - gammacontrol = true; - layershell = true; - screencopy = true; - xwayland = true; - } -}: - -stdenv.mkDerivation rec { - pname = "hikari"; - version = "2.3.3"; - - src = fetchzip { - url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-5Ug0U3ESC5F/gj7bahnLYkeY/weSCj0QASwdFuWwdMI="; - }; - - nativeBuildInputs = [ pkg-config bmake ]; - - buildInputs = [ - cairo - glib - libevdev - libinput - libxkbcommon - linux-pam - pango - pixman - libucl - mesa # for libEGL - wayland - wayland-protocols - wlroots - ]; - - enableParallelBuilding = true; - - makeFlags = with lib; [ "PREFIX=$(out)" ] - ++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES" - ++ mapAttrsToList (feat: enabled: - optionalString enabled "WITH_${toUpper feat}=YES" - ) features; - - postPatch = '' - # Can't suid in nix store - # Run hikari as root (it will drop privileges as early as possible), or create - # a systemd unit to give it the necessary permissions/capabilities. - substituteInPlace Makefile --replace '4555' '555' - - sed -i 's@@@' src/*.c - ''; - - meta = with lib; { - description = "Stacking Wayland compositor which is actively developed on FreeBSD but also supports Linux"; - homepage = "https://hikari.acmelabs.space"; - license = licenses.bsd2; - platforms = platforms.linux ++ platforms.freebsd; - maintainers = with maintainers; [ jpotier ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cafe07f01ae..c9afa50f8772 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32072,10 +32072,6 @@ with pkgs; wbg = callPackage ../applications/misc/wbg { }; - hikari = callPackage ../applications/window-managers/hikari { - wlroots = wlroots_0_15; - }; - i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; From 2d23affa03e83909dfbf6fff46a4889bb8af4fec Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 28 Mar 2024 18:36:34 +0800 Subject: [PATCH 2/3] wlroots_0_15: remove --- pkgs/development/libraries/wlroots/default.nix | 9 --------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 10 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 61027c374c11..4dd884b45859 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config @@ -113,14 +112,6 @@ let in rec { - wlroots_0_15 = generic { - version = "0.15.1"; - hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; - extraBuildInputs = [ - ffmpeg_4 - ]; - }; - wlroots_0_16 = generic { version = "0.16.2"; hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9afa50f8772..92cb3ab5b489 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32041,7 +32041,6 @@ with pkgs; super-productivity = callPackage ../applications/office/super-productivity { }; inherit (callPackages ../development/libraries/wlroots {}) - wlroots_0_15 wlroots_0_16 wlroots_0_17 wlroots; From 47bfff92bfb3f6b713eba5ef4772f373e2771eb5 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 28 Mar 2024 18:42:10 +0800 Subject: [PATCH 3/3] aliases.nix: add hikari and wlroots_0_15 --- pkgs/top-level/aliases.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 12a5057bc5f7..562289841efc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -498,6 +498,7 @@ mapAliases ({ haxe_3_2 = throw "'haxe_3_2' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2023-09-10 + hikari = throw "hikari has been removed from nixpkgs, it was unmaintained and required wlroots_0_15 at the time of removal"; # Added 2024-03-28 hip = throw "'hip' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 hipcc = throw "'hipcc' has been replaced with 'rocmPackages.hipcc'"; # Added 2023-10-08 hipchat = throw "'hipchat' has been discontinued since 2019; upstream recommends Slack."; # Added 2023-12-02 @@ -1282,6 +1283,7 @@ mapAliases ({ win-virtio = virtio-win; # Added 2023-10-17 win-signed-gplpv-drivers = throw "win-signed-gplpv-drivers has been removed from nixpkgs, as it's unmaintained: https://help.univention.com/t/installing-signed-gplpv-drivers/21828"; # Added 2023-08-17 wlroots_0_14 = throw "'wlroots_0_14' has been removed in favor of newer versions"; # Added 2023-07-29 + wlroots_0_15 = throw "'wlroots_0_15' has been removed in favor of newer versions"; # Added 2024-03-28 wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10 wordpress6_2 = throw "'wordpress6_2' has been removed in favor of the latest version"; # Added 2023-10-10 wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name