Unverified Commit 557686a8 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #252816 from wineee/wlroots-alias

parents 5cc4b22d fd11fe9e

pkgs/development/libraries/pixman/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ 
, qemu

, scribus

, tigervnc

, wlroots

, wlroots_0_17

, wlroots_0_18

, xwayland



, gitUpdater
@@ -66,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { 


  passthru = {

    tests = {

      inherit cairo qemu scribus tigervnc wlroots xwayland;

      inherit cairo qemu scribus tigervnc wlroots_0_17 wlroots_0_18 xwayland;

      pkg-config = testers.hasPkgConfigModules {

        package = finalAttrs.finalPackage;

      };

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -1521,6 +1521,7 @@ mapAliases ({ 
  wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-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

  wlroots = wlroots_0_18; # wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release

  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

pkgs/top-level/all-packages.nix

+4 −3
Original line number Diff line number Diff line
@@ -31193,8 +31193,7 @@ with pkgs; 
  inherit (callPackages ../development/libraries/wlroots {})

    wlroots_0_16

    wlroots_0_17

    wlroots_0_18

    wlroots;

    wlroots_0_18;















  sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
























@@ -34335,7 +34334,9 @@ with pkgs;



























  trayer = callPackage ../applications/window-managers/trayer { };



























  tinywl = callPackage ../applications/window-managers/tinywl { };













  tinywl = callPackage ../applications/window-managers/tinywl {













    wlroots = wlroots_0_18;













  };





























  tree-from-tags = callPackage ../applications/audio/tree-from-tags { };