From 4d68d79bd0a28b133b7aa7d7e40702652395e0f8 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 16 Nov 2024 16:38:16 +0100 Subject: [PATCH 1/3] swayimg: 3.4 -> 3.5 --- pkgs/by-name/sw/swayimg/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index 3a347ce9580f..d11917e3c84c 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -27,13 +27,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "3.4"; + version = "3.5"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; - rev = "v${finalAttrs.version}"; - hash = "sha256-bUU4s7nlN48rYMX4SleUDAOCVz2fowGctEfP6KhMdoA="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-qI5M7ZC7GaVtVNh+MWPNdjXukk135IQ1gPHxdefBEyo="; }; strictDeps = true; From 6936e23b05cd015e9661ed0930cbf2fb18987409 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 16 Nov 2024 16:44:17 +0100 Subject: [PATCH 2/3] swayimg: add nix-update-script --- pkgs/by-name/sw/swayimg/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index d11917e3c84c..3002deea0e31 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -24,6 +24,7 @@ openexr_3, bash-completion, testers, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; @@ -73,8 +74,12 @@ stdenv.mkDerivation (finalAttrs: { openexr_3 ]; - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + + updateScript = nix-update-script { }; }; meta = with lib; { From 585f64a15b5222a458b2e10e06baee64eb8417f6 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 16 Nov 2024 16:46:18 +0100 Subject: [PATCH 3/3] swayimg: avoid `with lib;` --- pkgs/by-name/sw/swayimg/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index 3002deea0e31..8b654cd56a09 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -82,13 +82,13 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { homepage = "https://github.com/artemsen/swayimg"; description = "Image viewer for Sway/Wayland"; changelog = "https://github.com/artemsen/swayimg/releases/tag/v${finalAttrs.version}"; - license = licenses.mit; - maintainers = with maintainers; [ matthewcroughan ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ matthewcroughan ]; + platforms = lib.platforms.linux; mainProgram = "swayimg"; }; })