From 596df5fc813f11540b6ad646029d2eeea0e983e2 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 17 May 2025 23:16:43 +0800 Subject: [PATCH 1/4] waypaper: add prince213 to maintainers --- pkgs/by-name/wa/waypaper/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wa/waypaper/package.nix b/pkgs/by-name/wa/waypaper/package.nix index 8d3b0018582f..5db5c9e1e2c8 100644 --- a/pkgs/by-name/wa/waypaper/package.nix +++ b/pkgs/by-name/wa/waypaper/package.nix @@ -57,7 +57,10 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://github.com/anufrievroman/waypaper"; license = licenses.gpl3Only; - maintainers = with maintainers; [ totalchaos ]; + maintainers = with maintainers; [ + prince213 + totalchaos + ]; platforms = platforms.linux; }; } From 3a79524cfb0cdc6e52cc702cf92b71864878a9f0 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 17 May 2025 23:03:14 +0800 Subject: [PATCH 2/4] waypaper: 2.5 -> 2.6 --- pkgs/by-name/wa/waypaper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waypaper/package.nix b/pkgs/by-name/wa/waypaper/package.nix index 5db5c9e1e2c8..e9beb2a05828 100644 --- a/pkgs/by-name/wa/waypaper/package.nix +++ b/pkgs/by-name/wa/waypaper/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "waypaper"; - version = "2.5"; + version = "2.6"; pyproject = true; src = fetchFromGitHub { owner = "anufrievroman"; repo = "waypaper"; tag = version; - hash = "sha256-g1heJUBVJzRZXcNQCwRcqp6cTUaroKVpcTjG0KldlxU="; + hash = "sha256-MGfTuQcVChI4g7RONiTZZ4a5uX5SDjfLeMxbLIZ7VH4="; }; nativeBuildInputs = [ From b685d78a3a33b3f13955c71239d79d24e3acb2dd Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 17 May 2025 23:13:24 +0800 Subject: [PATCH 3/4] waypaper: use python3Packages --- pkgs/by-name/wa/waypaper/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/wa/waypaper/package.nix b/pkgs/by-name/wa/waypaper/package.nix index e9beb2a05828..65b0814015da 100644 --- a/pkgs/by-name/wa/waypaper/package.nix +++ b/pkgs/by-name/wa/waypaper/package.nix @@ -1,13 +1,13 @@ { lib, - python3, + python3Packages, fetchFromGitHub, gobject-introspection, wrapGAppsHook3, killall, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "waypaper"; version = "2.6"; pyproject = true; @@ -24,15 +24,15 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook3 ]; - build-system = [ python3.pkgs.setuptools ]; + build-system = with python3Packages; [ setuptools ]; - dependencies = [ - python3.pkgs.pygobject3 - python3.pkgs.platformdirs - python3.pkgs.pillow - python3.pkgs.imageio - python3.pkgs.imageio-ffmpeg - python3.pkgs.screeninfo + dependencies = with python3Packages; [ + imageio + imageio-ffmpeg + pillow + platformdirs + pygobject3 + screeninfo ]; propagatedBuildInputs = [ killall ]; From 11ac85f54cb8a82eca45aa40f359019a261cfa7c Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 17 May 2025 23:15:22 +0800 Subject: [PATCH 4/4] waypaper: avoid with lib; --- pkgs/by-name/wa/waypaper/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wa/waypaper/package.nix b/pkgs/by-name/wa/waypaper/package.nix index 65b0814015da..bca1f3039aa0 100644 --- a/pkgs/by-name/wa/waypaper/package.nix +++ b/pkgs/by-name/wa/waypaper/package.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - meta = with lib; { + meta = { changelog = "https://github.com/anufrievroman/waypaper/releases/tag/${version}"; description = "GUI wallpaper setter for Wayland-based window managers"; mainProgram = "waypaper"; @@ -56,11 +56,11 @@ python3Packages.buildPythonApplication rec { If wallpaper does not change, make sure that swaybg or swww is installed. ''; homepage = "https://github.com/anufrievroman/waypaper"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ prince213 totalchaos ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }