From 2143122291a8e2fd7a718057144a893eacfb3c89 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:48:35 +0530 Subject: [PATCH 1/2] uwsm: 0.18.2 -> 0.19.0 Changelog: https://github.com/Vladimir-csp/uwsm/releases/tag/v0.19.0 (cherry picked from commit e32ed381ecf07fac29d2d89aa59755ffc6c33f4c) --- pkgs/by-name/uw/uwsm/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix index fa5ad6f3692bc..3e6db1d647914 100644 --- a/pkgs/by-name/uw/uwsm/package.nix +++ b/pkgs/by-name/uw/uwsm/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uwsm"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "uwsm"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-/LmSc1AKNZ/VZ2rkUsOvwqpJmPgb6dThTtOu44BriQs="; + hash = "sha256-gptZld9BIQaujg9fGAgKD7wXjKeL5quXnSGOKn25jn8="; }; nativeBuildInputs = [ @@ -88,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Universal wayland session manager"; homepage = "https://github.com/Vladimir-csp/uwsm"; + changelog = "https://github.com/Vladimir-csp/uwsm/releases/tag/v${finalAttrs.version}"; mainProgram = "uwsm"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ From 5d28a3e31a5b353e9338b51dc218c77524f42994 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:54:32 +0530 Subject: [PATCH 2/2] uwsm: pass python-bin meson option enable man output dir (cherry picked from commit 04e88717732460acb7ef1cce758b8a63f0cce3ec) --- pkgs/by-name/uw/uwsm/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix index 3e6db1d647914..7df5b832c7465 100644 --- a/pkgs/by-name/uw/uwsm/package.nix +++ b/pkgs/by-name/uw/uwsm/package.nix @@ -60,12 +60,9 @@ stdenv.mkDerivation (finalAttrs: { "uuctl" = uuctlSupport; "man-pages" = true; }) + (lib.mesonOption "python-bin" python.interpreter) ]; - passthru = { - updateScript = nix-update-script { }; - }; - postInstall = let wrapperArgs = '' @@ -85,6 +82,15 @@ stdenv.mkDerivation (finalAttrs: { ''} ''; + outputs = [ + "out" + "man" + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Universal wayland session manager"; homepage = "https://github.com/Vladimir-csp/uwsm";