Merge pull request #304545 from GaetanLepage/river

river: 0.2.6 -> 0.3.0
This commit is contained in:
Adam C. Stephens 2024-04-16 12:55:41 -04:00 committed by GitHub
commit c2d460af86
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,6 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitea
, libGL , libGL
, libX11 , libX11
, libevdev , libevdev
@ -12,7 +12,7 @@
, udev , udev
, wayland , wayland
, wayland-protocols , wayland-protocols
, wlroots_0_16 , wlroots_0_17
, xwayland , xwayland
, zig_0_11 , zig_0_11
, withManpages ? true , withManpages ? true
@ -21,16 +21,17 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "river"; pname = "river";
version = "0.2.6"; version = "0.3.0";
outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
src = fetchFromGitHub { src = fetchFromGitea {
owner = "riverwm"; domain = "codeberg.org";
owner = "river";
repo = "river"; repo = "river";
rev = "refs/tags/v${finalAttrs.version}"; rev = "refs/tags/v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-JPb8l5ANxYCqinWNoQK5PAyn4CaiSj0e9mAhZwd9HOw="; hash = "sha256-6LZuWx0sC6bW0K7D0PR8hJlVW6i6NIzOOORdMu3Gk5U=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -49,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
pixman pixman
udev udev
wayland-protocols wayland-protocols
wlroots_0_16 wlroots_0_17
] ++ lib.optional xwaylandSupport libX11; ] ++ lib.optional xwaylandSupport libX11;
dontConfigure = true; dontConfigure = true;
@ -64,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.providedSessions = [ "river" ]; passthru.providedSessions = [ "river" ];
meta = { meta = {
homepage = "https://github.com/ifreund/river"; homepage = "https://codeberg.org/river/river";
description = "A dynamic tiling wayland compositor"; description = "A dynamic tiling wayland compositor";
longDescription = '' longDescription = ''
River is a dynamic tiling Wayland compositor with flexible runtime River is a dynamic tiling Wayland compositor with flexible runtime
@ -79,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
- Scriptable configuration and control through a custom Wayland protocol - Scriptable configuration and control through a custom Wayland protocol
and separate riverctl binary implementing it. and separate riverctl binary implementing it.
''; '';
changelog = "https://github.com/ifreund/river/releases/tag/v${finalAttrs.version}"; changelog = "https://codeberg.org/river/river/releases/tag/v${finalAttrs.version}";
license = lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
adamcstephens adamcstephens