From 80889d91b8185425b327184cfbd8237b93c02ff0 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 25 Jul 2025 22:55:27 +0800 Subject: [PATCH 1/2] kanshi: 1.7.0 -> 1.8.0 Diff: https://gitlab.freedesktop.org/emersion/kanshi/-/compare/v1.7.0...v1.8.0 Changelog: https://gitlab.freedesktop.org/emersion/kanshi/-/tags/v1.8.0 Migration notice: https://git.sr.ht/~emersion/kanshi#kanshi --- pkgs/by-name/ka/kanshi/package.nix | 35 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ka/kanshi/package.nix b/pkgs/by-name/ka/kanshi/package.nix index 10a4266ecdc6..5a9e5b295499 100644 --- a/pkgs/by-name/ka/kanshi/package.nix +++ b/pkgs/by-name/ka/kanshi/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromSourcehut, + fetchFromGitLab, meson, ninja, pkg-config, @@ -12,21 +12,24 @@ libscfg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kanshi"; - version = "1.7.0"; + version = "1.8.0"; - src = fetchFromSourcehut { - owner = "~emersion"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "emersion"; repo = "kanshi"; - rev = "v${version}"; - sha256 = "sha256-FDt+F5tWHLsMejlExb5yPh0SlWzuUlK9u54Uy+alrzw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-90FnVtiYR8AEAddIQe9sfgQDMO8OqlQ8fNy/nJsbhKs="; }; strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja @@ -34,18 +37,14 @@ stdenv.mkDerivation rec { scdoc wayland-scanner ]; + buildInputs = [ wayland libvarlink libscfg ]; - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=maybe-uninitialized" - ]; - - meta = with lib; { - homepage = "https://sr.ht/~emersion/kanshi"; + meta = { description = "Dynamic display configuration tool"; longDescription = '' kanshi allows you to define output profiles that are automatically enabled @@ -55,12 +54,14 @@ stdenv.mkDerivation rec { kanshi can be used on Wayland compositors supporting the wlr-output-management protocol. ''; - license = licenses.mit; + homepage = "https://gitlab.freedesktop.org/emersion/kanshi"; + changelog = "https://gitlab.freedesktop.org/emersion/kanshi/-/tags/${finalAttrs.src.tag}"; + license = lib.licenses.mit; mainProgram = "kanshi"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ balsoft danielbarter ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) From 8af1e1b6b2c9581c9b417472da0d29832c316458 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 25 Jul 2025 22:55:42 +0800 Subject: [PATCH 2/2] kanshi: add aleksana to maintainers --- pkgs/by-name/ka/kanshi/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ka/kanshi/package.nix b/pkgs/by-name/ka/kanshi/package.nix index 5a9e5b295499..f0aca5ea07ef 100644 --- a/pkgs/by-name/ka/kanshi/package.nix +++ b/pkgs/by-name/ka/kanshi/package.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ balsoft danielbarter + aleksana ]; platforms = lib.platforms.linux; };