From 241ad9ec134ffad3260f51fa5745732aa63fb7b3 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:06:55 +1000 Subject: [PATCH 1/5] autotiling: modernize --- pkgs/misc/autotiling/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix index fa0e6373480e..2d412952bc22 100644 --- a/pkgs/misc/autotiling/default.nix +++ b/pkgs/misc/autotiling/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "nwg-piotr"; - repo = pname; + repo = "autotiling"; tag = "v${version}"; hash = "sha256-k+UiAGMB/fJiE+C737yGdyTpER1ciZrMkZezkcn/4yk="; }; @@ -24,12 +24,12 @@ buildPythonApplication rec { ]; doCheck = false; - meta = with lib; { + meta = { homepage = "https://github.com/nwg-piotr/autotiling"; description = "Script for sway and i3 to automatically switch the horizontal / vertical window split orientation"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ artturin ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ artturin ]; mainProgram = "autotiling"; }; } From 138ac3a28120ec45ca19a2edcc20ca58496d5d9d Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:07:39 +1000 Subject: [PATCH 2/5] jackett: modernize --- pkgs/shells/fish/plugins/sponge.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/fish/plugins/sponge.nix b/pkgs/shells/fish/plugins/sponge.nix index 9375079d7a53..ad6a9b088b58 100644 --- a/pkgs/shells/fish/plugins/sponge.nix +++ b/pkgs/shells/fish/plugins/sponge.nix @@ -10,15 +10,15 @@ buildFishPlugin rec { src = fetchFromGitHub { owner = "meaningful-ooo"; - repo = pname; + repo = "sponge"; rev = version; sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w="; }; - meta = with lib; { + meta = { description = "Keeps your fish shell history clean from typos, incorrectly used commands and everything you don't want to store due to privacy reasons"; homepage = "https://github.com/meaningful-ooo/sponge"; - license = licenses.mit; - maintainers = with maintainers; [ quantenzitrone ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ quantenzitrone ]; }; } From aa7ca28926a5ea114490f8f69e75a98b2422e323 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:09:00 +1000 Subject: [PATCH 3/5] jackett: modernize --- pkgs/servers/jackett/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 2d48051f999b..6c69af569fdb 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -14,9 +14,9 @@ buildDotnetModule rec { version = "0.22.2390"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; + owner = "jackett"; + repo = "jackett"; + tag = "v${version}"; hash = "sha512-Viz9gU16NG6nYeEwhar3OCSPnsHrM6ZehsOcNxteaGyvgrhbyWt5rNI54wCJ7OngHaZgIoQhMoNNkvIhX8JDUg=="; }; @@ -51,13 +51,13 @@ buildDotnetModule rec { passthru.tests = { inherit (nixosTests) jackett; }; - meta = with lib; { + meta = { description = "API Support for your favorite torrent trackers"; mainProgram = "jackett"; homepage = "https://github.com/Jackett/Jackett/"; changelog = "https://github.com/Jackett/Jackett/releases/tag/v${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ edwtjo nyanloutre purcell From ee1039297a3492a6e4d844971b5e0741a2776672 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:11:24 +1000 Subject: [PATCH 4/5] apulse: modernize, move to finalAttrs --- pkgs/misc/apulse/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index df2480f902e3..ac2ab9763b6f 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -14,15 +14,15 @@ let oz = x: if x then "1" else "0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "apulse"; version = "0.1.14"; src = fetchFromGitHub { owner = "i-rinat"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-SWvQvS9QBOevOSRpjY3XpyhzWoHAkXzkk8Mh4ovltNI="; + repo = "apulse"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SWvQvS9QBOevOSRpjY3XpyhzWoHAkXzkk8Mh4ovltNI="; }; nativeBuildInputs = [ @@ -40,12 +40,13 @@ stdenv.mkDerivation rec { "-DLOG_TO_STDERR=${oz logToStderr}" ]; - meta = with lib; { + meta = { description = "PulseAudio emulation for ALSA"; homepage = "https://github.com/i-rinat/apulse"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.jagajaga ]; + changelog = "https://github.com/i-rinat/apulse/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.jagajaga ]; mainProgram = "apulse"; }; -} +}) From a92c0fa8f6ea8d0ed3ac6cbc2a8b2fcdd77bdf57 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:13:40 +1000 Subject: [PATCH 5/5] lemmy-ui: modernize --- pkgs/servers/web-apps/lemmy/ui.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix index 85ce59d44ab6..298f1d8f3d4d 100644 --- a/pkgs/servers/web-apps/lemmy/ui.nix +++ b/pkgs/servers/web-apps/lemmy/ui.nix @@ -11,7 +11,6 @@ let pinData = lib.importJSON ./pin.json; - in stdenvNoCC.mkDerivation (finalAttrs: { @@ -23,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { with finalAttrs; fetchFromGitHub { owner = "LemmyNet"; - repo = pname; + repo = "lemmy-ui"; rev = version; fetchSubmodules = true; hash = pinData.uiHash; @@ -79,15 +78,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { distPhase = "true"; - passthru.updateScript = ./update.py; - passthru.tests.lemmy-ui = nixosTests.lemmy; - passthru.commit_sha = finalAttrs.src.rev; + passthru = { + updateScript = ./update.py; + tests.lemmy-ui = nixosTests.lemmy; + commit_sha = finalAttrs.src.rev; + }; - meta = with lib; { + meta = { description = "Building a federated alternative to reddit in rust"; homepage = "https://join-lemmy.org/"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ happysalada billewanick georgyo