From 8bf0dabc0ec81aa0157f330011af25ae0b48f8a6 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 4 Nov 2025 09:10:53 -0800 Subject: [PATCH 1/3] wlock: 0-unstable-2024-09-13 -> 1.0 --- pkgs/by-name/wl/wlock/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wl/wlock/package.nix b/pkgs/by-name/wl/wlock/package.nix index b6870e7fd0ff..b9001a86d369 100644 --- a/pkgs/by-name/wl/wlock/package.nix +++ b/pkgs/by-name/wl/wlock/package.nix @@ -9,16 +9,16 @@ libxkbcommon, wayland-scanner, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "wlock"; - version = "0-unstable-2024-09-13"; + version = "1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "sewn"; repo = "wlock"; - rev = "be975445fa0da7252f8e13b610c518dd472652d0"; - hash = "sha256-Xt7Q51RhFG+UXYukxfORIhc4Df86nxtpDhAhaSmI38A="; + tag = finalAttrs.version; + hash = "sha256-vbGrePrZN+IWwzwoNUzMHmb6k9nQbRLVZmbWIAsYneY="; }; postPatch = '' @@ -52,4 +52,4 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ fliegendewurst ]; mainProgram = "wlock"; }; -} +}) From 93cc30545fbc70d25a12929e3fc7d86e5e917896 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 4 Nov 2025 09:15:44 -0800 Subject: [PATCH 2/3] wlock: cleanup --- pkgs/by-name/wl/wlock/package.nix | 34 +++++++++++++++++-------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/wl/wlock/package.nix b/pkgs/by-name/wl/wlock/package.nix index b9001a86d369..a11b00955c29 100644 --- a/pkgs/by-name/wl/wlock/package.nix +++ b/pkgs/by-name/wl/wlock/package.nix @@ -2,13 +2,15 @@ lib, stdenv, fetchFromGitea, - libxcrypt, pkg-config, + wayland-scanner, wayland, wayland-protocols, libxkbcommon, - wayland-scanner, + libxcrypt, + nix-update-script, }: + stdenv.mkDerivation (finalAttrs: { pname = "wlock"; version = "1.0"; @@ -25,28 +27,30 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Makefile --replace-fail 'chmod 4755' 'chmod 755' ''; - buildInputs = [ - libxcrypt - wayland - wayland-protocols - libxkbcommon - ]; - strictDeps = true; - makeFlags = [ - "PREFIX=$(out)" - ("WAYLAND_SCANNER=" + lib.getExe wayland-scanner) - ]; - nativeBuildInputs = [ pkg-config wayland-scanner ]; + buildInputs = [ + wayland + wayland-protocols + libxkbcommon + libxcrypt + ]; + + makeFlags = [ + "PREFIX=$(out)" + ("WAYLAND_SCANNER=" + lib.getExe wayland-scanner) + ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Sessionlocker for Wayland compositors that support the ext-session-lock-v1 protocol"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; homepage = "https://codeberg.org/sewn/wlock"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ fliegendewurst ]; From 8b18ceb274580dbe70926fbde0618566678960ec Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 4 Nov 2025 09:17:05 -0800 Subject: [PATCH 3/3] wlock: add maintainer --- pkgs/by-name/wl/wlock/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wl/wlock/package.nix b/pkgs/by-name/wl/wlock/package.nix index a11b00955c29..24d7462a648a 100644 --- a/pkgs/by-name/wl/wlock/package.nix +++ b/pkgs/by-name/wl/wlock/package.nix @@ -53,7 +53,10 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Only; homepage = "https://codeberg.org/sewn/wlock"; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ fliegendewurst ]; + maintainers = with lib.maintainers; [ + fliegendewurst + yiyu + ]; mainProgram = "wlock"; }; })