dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

wlroots: 0.14.1 -> 0.15.0

Browse Source 
Release notes: https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/0.15.0
Only three reverse-dependencies are compatible with the new release so far.
This commit is contained in:
Michael Weiss 2021-12-18 21:18:35 +01:00
parent cc6c379322
commit 63d7ba609d
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
3 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/wlroots/default.nix → pkgs/development/libraries/wlroots/0.15.nix
View File

@ -1,20 +1,21 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner { lib, stdenv, fetchFromGitLab, meson_0_60, ninja, pkg-config, wayland-scanner
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
, libpng, ffmpeg, xcbutilrenderutil, seatd , libpng, ffmpeg, xcbutilrenderutil, seatd, vulkan-loader, glslang
, enableXWayland ? true, xwayland ? null , enableXWayland ? true, xwayland ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wlroots"; pname = "wlroots";
version = "0.14.1"; version = "0.15.0";
src = fetchFromGitHub { src = fetchFromGitLab {
owner = "swaywm"; domain = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots"; repo = "wlroots";
rev = version; rev = version;
sha256 = "1sshp3lvlkl1i670kxhwsb4xzxl8raz6769kqvgmxzcb63ns9ay1"; sha256 = "0wdzs0wpv61pxgy3mx3xjsndyfmbj30v47d3w9ymmnd4r479n41n";
}; };
# $out for the library and $examples for the example programs (in examples): # $out for the library and $examples for the example programs (in examples):
@ -22,12 +23,12 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ pkg-config ]; depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; nativeBuildInputs = [ meson_0_60 ninja pkg-config wayland-scanner ];
buildInputs = [ buildInputs = [
libGL wayland wayland-protocols libinput libxkbcommon pixman libGL wayland wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
libpng ffmpeg xcbutilrenderutil seatd libpng ffmpeg xcbutilrenderutil seatd vulkan-loader glslang
] ]
++ lib.optional enableXWayland xwayland ++ lib.optional enableXWayland xwayland
; ;
@ -55,7 +56,7 @@ stdenv.mkDerivation rec {
compositor; or about 50,000 lines of code you were going to write anyway. compositor; or about 50,000 lines of code you were going to write anyway.
''; '';
inherit (src.meta) homepage; inherit (src.meta) homepage;
changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}"; changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}";
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ primeos synthetica ]; maintainers = with maintainers; [ primeos synthetica ];

44
pkgs/top-level/all-packages.nix
View File

@ -3586,7 +3586,9 @@ with pkgs;
reg = callPackage ../tools/virtualization/reg { }; reg = callPackage ../tools/virtualization/reg { };
river = callPackage ../applications/window-managers/river { }; river = callPackage ../applications/window-managers/river {
wlroots = wlroots_0_14;
};
rmapi = callPackage ../applications/misc/remarkable/rmapi { }; rmapi = callPackage ../applications/misc/remarkable/rmapi { };
@ -24459,7 +24461,9 @@ with pkgs;
cardboard = callPackage ../applications/window-managers/cardboard { }; cardboard = callPackage ../applications/window-managers/cardboard { };
cage = callPackage ../applications/window-managers/cage { }; cage = callPackage ../applications/window-managers/cage {
wlroots = wlroots_0_14;
};
calf = callPackage ../applications/audio/calf { calf = callPackage ../applications/audio/calf {
inherit (gnome2) libglade; inherit (gnome2) libglade;
@ -24866,7 +24870,9 @@ with pkgs;
dyff = callPackage ../development/tools/dyff {}; dyff = callPackage ../development/tools/dyff {};
dwl = callPackage ../applications/window-managers/dwl { }; dwl = callPackage ../applications/window-managers/dwl {
wlroots = wlroots_0_14;
};
dwm = callPackage ../applications/window-managers/dwm { dwm = callPackage ../applications/window-managers/dwm {
# dwm is configured entirely through source modification. Allow users to # dwm is configured entirely through source modification. Allow users to
@ -26071,13 +26077,18 @@ with pkgs;
super-productivity = callPackage ../applications/office/super-productivity { }; super-productivity = callPackage ../applications/office/super-productivity { };
wlroots = wlroots_0_14; wlroots = wlroots_0_15;
wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {}; wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {};
wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix { wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix {
inherit (xorg) xcbutilrenderutil; inherit (xorg) xcbutilrenderutil;
}; };
wlroots_0_15 = callPackage ../development/libraries/wlroots/0.15.nix {
inherit (xorg) xcbutilrenderutil;
};
sway-unwrapped = callPackage ../applications/window-managers/sway { }; sway-unwrapped = callPackage ../applications/window-managers/sway {
wlroots = wlroots_0_14;
};
sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; sway = callPackage ../applications/window-managers/sway/wrapper.nix { };
swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; swaybg = callPackage ../applications/window-managers/sway/bg.nix { };
swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; swayidle = callPackage ../applications/window-managers/sway/idle.nix { };
@ -26097,7 +26108,9 @@ with pkgs;
wbg = callPackage ../applications/misc/wbg { }; wbg = callPackage ../applications/misc/wbg { };
hikari = callPackage ../applications/window-managers/hikari { }; hikari = callPackage ../applications/window-managers/hikari {
wlroots = wlroots_0_14;
};
i3 = callPackage ../applications/window-managers/i3 { i3 = callPackage ../applications/window-managers/i3 {
xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
@ -26161,7 +26174,9 @@ with pkgs;
i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
waybox = callPackage ../applications/window-managers/waybox { }; waybox = callPackage ../applications/window-managers/waybox {
wlroots = wlroots_0_14;
};
workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };
@ -26623,7 +26638,9 @@ with pkgs;
lame = callPackage ../development/libraries/lame { }; lame = callPackage ../development/libraries/lame { };
labwc = callPackage ../applications/window-managers/labwc { }; labwc = callPackage ../applications/window-managers/labwc {
wlroots = wlroots_0_14;
};
larswm = callPackage ../applications/window-managers/larswm { }; larswm = callPackage ../applications/window-managers/larswm { };
@ -29295,7 +29312,8 @@ with pkgs;
wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
inherit (wayfireApplications) wayfire wcm; inherit (wayfireApplications) wayfire wcm;
wayfireApplications-unwrapped = recurseIntoAttrs ( wayfireApplications-unwrapped = recurseIntoAttrs (
callPackage ../applications/window-managers/wayfire/applications.nix { } (callPackage ../applications/window-managers/wayfire/applications.nix { }).
extend (_: _: { wlroots = wlroots_0_14; })
); );
wayfirePlugins = recurseIntoAttrs ( wayfirePlugins = recurseIntoAttrs (
callPackage ../applications/window-managers/wayfire/plugins.nix { callPackage ../applications/window-managers/wayfire/plugins.nix {
@ -29349,7 +29367,9 @@ with pkgs;
electron = electron_14; electron = electron_14;
}; };
wio = callPackage ../applications/window-managers/wio { }; wio = callPackage ../applications/window-managers/wio {
wlroots = wlroots_0_14;
};
whitebox-tools = callPackage ../applications/gis/whitebox-tools { whitebox-tools = callPackage ../applications/gis/whitebox-tools {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
@ -34030,7 +34050,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit;
}; };
cagebreak = callPackage ../applications/window-managers/cagebreak { }; cagebreak = callPackage ../applications/window-managers/cagebreak {
wlroots = wlroots_0_14;
};
psftools = callPackage ../os-specific/linux/psftools {}; psftools = callPackage ../os-specific/linux/psftools {};

4
pkgs/top-level/python-packages.nix
View File

@ -8092,7 +8092,9 @@ in {
pywizlight = callPackage ../development/python-modules/pywizlight { }; pywizlight = callPackage ../development/python-modules/pywizlight { };
pywlroots = callPackage ../development/python-modules/pywlroots { }; pywlroots = callPackage ../development/python-modules/pywlroots {
wlroots = pkgs.wlroots_0_14;
};
pyxattr = callPackage ../development/python-modules/pyxattr { }; pyxattr = callPackage ../development/python-modules/pyxattr { };