From 59d7078680db2dfbd286edccb77f58960a39cda6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 13 May 2026 10:35:19 +0200 Subject: [PATCH] wlroots_0_18: drop The libinput update in PR #493438 broke the build, and we don't seem to need it anymore. --- pkgs/by-name/ga/gamescope/package.nix | 4 ++-- pkgs/development/libraries/wlroots/default.nix | 5 ----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index fe65994b2373..b47b12849218 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -42,7 +42,7 @@ glslang, hwdata, stb, - wlroots_0_18, + wlroots_0_19, libdecor, lcms, lib, @@ -159,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: { vulkan-headers ] ++ lib.optionals enableExecutable ( - wlroots_0_18.buildInputs + wlroots_0_19.buildInputs ++ [ # gamescope uses a custom wlroots branch libxcomposite diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 57b0bc594df3..2970b864faa2 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -162,11 +162,6 @@ let in { - wlroots_0_18 = generic { - version = "0.18.3"; - hash = "sha256-D8RapSeH+5JpTtq+OU8PyVZubLhjcebbCBPuSO5Q7kU="; - }; - wlroots_0_19 = generic { version = "0.19.3"; hash = "sha256-J+wSVUtuizaCyCn523chFbE8VtbPjyu5XYv5eLT+GM0="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c2ad87e8d135..c09af1ec3ca1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2208,6 +2208,7 @@ mapAliases { wireshark-qt = warnAlias "'wireshark-qt' has been renamed to/replaced by 'wireshark'" wireshark; # Added 2026-01-23 wkhtmltopdf-bin = throw "'wkhtmltopdf-bin' has been renamed to/replaced by 'wkhtmltopdf'"; # Converted to throw 2025-10-27 wlroots_0_17 = throw "'wlroots_0_17' has been removed in favor of newer versions"; # Added 2026-03-07 + wlroots_0_18 = throw "'wlroots_0_18' has been removed in favor of newer versions"; # Added 2026-05-13 wlx-overlay-s = throw "'wlx-overlay-s' and 'wayvr-dashboard' have been merged into a single application. Please switch to 'wayvr'"; # Added 2026-01-09 wmii_hg = throw "'wmii_hg' has been renamed to/replaced by 'wmii'"; # Converted to throw 2025-10-27 wolfssl = throw "'wolfssl' has been removed because it has an unclear licensing situation and no remaining users in Nixpkgs"; # Added 2026-04-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a61bae6dc97..a736f6b5bd05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9498,7 +9498,6 @@ with pkgs; ; inherit (callPackages ../development/libraries/wlroots { }) - wlroots_0_18 wlroots_0_19 wlroots_0_20 ;