Merge pull request #335960 from museoa/labwc

labwc: 0.7.4 -> 0.8.0

pkgs/by-name/la/labwc/package.nix

@@ -1,41 +1,46 @@
-{ lib
-, cairo
-, fetchFromGitHub
-, gettext
-, glib
-, libdrm
-, libinput
-, libpng
-, librsvg
-, libxcb
-, libxkbcommon
-, libxml2
-, meson
-, ninja
-, pango
-, pkg-config
-, scdoc
-, stdenv
-, wayland
-, wayland-protocols
-, wayland-scanner
-, wlroots
-, xcbutilwm
-, xwayland
+{
+  lib,
+  cairo,
+  fetchFromGitHub,
+  gettext,
+  glib,
+  libdrm,
+  libinput,
+  libpng,
+  librsvg,
+  libxcb,
+  libxkbcommon,
+  libxml2,
+  meson,
+  ninja,
+  pango,
+  pkg-config,
+  scdoc,
+  stdenv,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+  wlroots_0_18,
+  xcbutilwm,
+  xwayland,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "labwc";
-  version = "0.7.4";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "labwc";
     repo = "labwc";
-    rev = finalAttrs.version;
-    hash = "sha256-7MH1mMfyMkaTVwEBJWvI1Lt3M6kosXOwkowuBTZej3c=";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-1PyPk6r/hXkC0EfOIeDqNGrrpvo616derD9u7i3XjkA=";
   };
 
-  outputs = [ "out" "man" ];
+  outputs = [
+    "out"
+    "doc"
+    "man"
+  ];
 
   nativeBuildInputs = [
     gettext
@@ -59,16 +64,14 @@ stdenv.mkDerivation (finalAttrs: {
     pango
     wayland
     wayland-protocols
-    wlroots
+    wlroots_0_18
     xcbutilwm
     xwayland
   ];
 
-  strictDeps = true;
+  mesonFlags = [ (lib.mesonEnable "xwayland" true) ];
 
-  mesonFlags = [
-    (lib.mesonEnable "xwayland" true)
-  ];
+  strictDeps = true;
 
   passthru = {
     providedSessions = [ "labwc" ];
@@ -77,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/labwc/labwc";
     description = "Wayland stacking compositor, inspired by Openbox";
-    changelog = "https://github.com/labwc/labwc/blob/${finalAttrs.src.rev}/NEWS.md";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "labwc";
     maintainers = with lib.maintainers; [ AndersonTorres ];

pkgs/top-level/all-packages.nix

@@ -31505,10 +31505,6 @@ with pkgs;
 
   lame = callPackage ../development/libraries/lame { };
 
-  labwc = callPackage ../by-name/la/labwc/package.nix {
-    wlroots = wlroots_0_17;
-  };
-
   larswm = callPackage ../applications/window-managers/larswm { };
 
   lash = callPackage ../applications/audio/lash { };