From 1e2cdaf72e774fb30861378d853b58ebee5f2852 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 19 Jan 2026 11:48:18 +0000 Subject: [PATCH 1/8] cgt-calc: use finalAttrs --- pkgs/by-name/cg/cgt-calc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cg/cgt-calc/package.nix b/pkgs/by-name/cg/cgt-calc/package.nix index ee7aeb9813c3..60b4cb850550 100644 --- a/pkgs/by-name/cg/cgt-calc/package.nix +++ b/pkgs/by-name/cg/cgt-calc/package.nix @@ -5,7 +5,7 @@ withTeXLive ? true, texliveSmall, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "cgt-calc"; version = "1.13.0"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "KapJI"; repo = "capital-gains-calculator"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-y/Y05wG89nccXyxfjqazyPJhd8dOkfwRJre+Rzx97Hw="; }; @@ -45,4 +45,4 @@ python3Packages.buildPythonApplication rec { maintainers = with lib.maintainers; [ ambroisie ]; platforms = lib.platforms.unix; }; -} +}) From f1bfb40ed25887e4a447918fa87929de1eeddbd2 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 19 Jan 2026 11:48:49 +0000 Subject: [PATCH 2/8] cvehound: use finalAttrs --- pkgs/by-name/cv/cvehound/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cv/cvehound/package.nix b/pkgs/by-name/cv/cvehound/package.nix index 1cf11fbd1de1..b785fbfe9569 100644 --- a/pkgs/by-name/cv/cvehound/package.nix +++ b/pkgs/by-name/cv/cvehound/package.nix @@ -6,7 +6,7 @@ python3, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "cvehound"; version = "1.2.1"; pyproject = true; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "evdenis"; repo = "cvehound"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UvjmlAm/8B4KfE9grvvgn37Rui+ZRfs2oTLqYYgqcUQ="; }; @@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Tool to check linux kernel source dump for known CVEs"; homepage = "https://github.com/evdenis/cvehound"; - changelog = "https://github.com/evdenis/cvehound/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/evdenis/cvehound/blob/${finalAttrs.src.rev}/ChangeLog"; # See https://github.com/evdenis/cvehound/issues/22 license = with lib.licenses; [ gpl2Only @@ -56,4 +56,4 @@ python3.pkgs.buildPythonApplication rec { ]; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) From 5511a9d4f9b1f6698017b5fd795ea35c8d441cfd Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 19 Jan 2026 11:50:47 +0000 Subject: [PATCH 3/8] cvehound: allow overriding 'runtimeDeps' --- pkgs/by-name/cv/cvehound/package.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/cv/cvehound/package.nix b/pkgs/by-name/cv/cvehound/package.nix index b785fbfe9569..ef7c9402a587 100644 --- a/pkgs/by-name/cv/cvehound/package.nix +++ b/pkgs/by-name/cv/cvehound/package.nix @@ -5,7 +5,12 @@ gnugrep, python3, }: - +let + runtimeDeps = [ + coccinelle + gnugrep + ]; +in python3.pkgs.buildPythonApplication (finalAttrs: { pname = "cvehound"; version = "1.2.1"; @@ -18,15 +23,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { hash = "sha256-UvjmlAm/8B4KfE9grvvgn37Rui+ZRfs2oTLqYYgqcUQ="; }; - makeWrapperArgs = [ - "--prefix PATH : ${ - lib.makeBinPath [ - coccinelle - gnugrep - ] - }" - ]; - build-system = with python3.pkgs; [ setuptools ]; @@ -45,6 +41,17 @@ python3.pkgs.buildPythonApplication (finalAttrs: { # Tries to clone the kernel sources doCheck = false; + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath finalAttrs.passthru.runtimeDeps) + ]; + + passthru = { + inherit runtimeDeps; + }; + meta = { description = "Tool to check linux kernel source dump for known CVEs"; homepage = "https://github.com/evdenis/cvehound"; From a7e5384a1b09af37632bca4f2051440576d71eba Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 19 Jan 2026 11:51:52 +0000 Subject: [PATCH 4/8] fertilizer: use finalAttrs --- pkgs/by-name/fe/fertilizer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fe/fertilizer/package.nix b/pkgs/by-name/fe/fertilizer/package.nix index 1f5a01d80666..1a3f8608e588 100644 --- a/pkgs/by-name/fe/fertilizer/package.nix +++ b/pkgs/by-name/fe/fertilizer/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "fertilizer"; version = "0.3.0"; pyproject = true; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "moleculekayak"; repo = "fertilizer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sDoAjEiKxHf+HtFLZr6RwuXN+rl0ZQnFUoQ09QiE6Xc="; }; @@ -40,4 +40,4 @@ python3.pkgs.buildPythonApplication rec { maintainers = with lib.maintainers; [ ambroisie ]; mainProgram = "fertilizer"; }; -} +}) From 22c78c391012bcb7deef30e6460521694fbea3c5 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 19 Jan 2026 11:52:10 +0000 Subject: [PATCH 5/8] nemorosa: use finalAttrs --- pkgs/by-name/ne/nemorosa/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nemorosa/package.nix b/pkgs/by-name/ne/nemorosa/package.nix index b5c281c146a7..2e86c2076505 100644 --- a/pkgs/by-name/ne/nemorosa/package.nix +++ b/pkgs/by-name/ne/nemorosa/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "nemorosa"; version = "0.4.1"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "KyokoMiki"; repo = "nemorosa"; - tag = version; + tag = finalAttrs.version; hash = "sha256-AqFjpEakEZ21iXmIIxhX+ez2aI/RMsLaUoECipQcaM4="; }; @@ -62,4 +62,4 @@ python3Packages.buildPythonApplication rec { maintainers = with lib.maintainers; [ ambroisie ]; mainProgram = "nemorosa"; }; -} +}) From c726674ac081caa1a35dd76e7818a0726f148182 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 19 Jan 2026 11:52:18 +0000 Subject: [PATCH 6/8] smoked-salmon: use finalAttrs --- pkgs/by-name/sm/smoked-salmon/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sm/smoked-salmon/package.nix b/pkgs/by-name/sm/smoked-salmon/package.nix index 9c38d4fbd84c..56a8174bba68 100644 --- a/pkgs/by-name/sm/smoked-salmon/package.nix +++ b/pkgs/by-name/sm/smoked-salmon/package.nix @@ -17,7 +17,7 @@ let sox ]; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "smoked-salmon"; version = "0.9.7.4"; pyproject = true; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "smokin-salmon"; repo = "smoked-salmon"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JOwqu/Hu7BjYLo3DdL6o+9TI/OQvlgj5Xu8WQ0cujwo="; }; @@ -74,7 +74,7 @@ python3Packages.buildPythonApplication rec { "--suffix" "PATH" ":" - (lib.makeBinPath runtimeDeps) + (lib.makeBinPath finalAttrs.passthru.runtimeDeps) ]; passthru = { @@ -91,4 +91,4 @@ python3Packages.buildPythonApplication rec { undefined-landmark ]; }; -} +}) From 032a769278c222d8d37108cd5e810e500fd1b563 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 19 Jan 2026 11:52:52 +0000 Subject: [PATCH 7/8] upsies: use finalAttrs --- pkgs/by-name/up/upsies/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/up/upsies/package.nix b/pkgs/by-name/up/upsies/package.nix index 5d9d0a001196..7deb4ca9ccd8 100644 --- a/pkgs/by-name/up/upsies/package.nix +++ b/pkgs/by-name/up/upsies/package.nix @@ -16,7 +16,7 @@ let oxipng ]; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "upsies"; version = "2026.01.03"; pyproject = true; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { domain = "codeberg.org"; owner = "plotski"; repo = "upsies"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Ya1v0DR5a4fPsFVJKVSDbgy+hWE136aRV3pFMExlRhU="; }; @@ -122,4 +122,4 @@ python3Packages.buildPythonApplication rec { mainProgram = "upsies"; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) From d890b78da778b73e0df8bfb81f3e3b1126cce92f Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 19 Jan 2026 11:53:05 +0000 Subject: [PATCH 8/8] upsies: allow overriding 'runtimeDeps' --- pkgs/by-name/up/upsies/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/up/upsies/package.nix b/pkgs/by-name/up/upsies/package.nix index 7deb4ca9ccd8..e210cc4253db 100644 --- a/pkgs/by-name/up/upsies/package.nix +++ b/pkgs/by-name/up/upsies/package.nix @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pytestCheckHook trustme ] - ++ runtimeDeps; + ++ finalAttrs.passthru.runtimeDeps; disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Fail during object comparisons on Darwin @@ -110,11 +110,15 @@ python3Packages.buildPythonApplication (finalAttrs: { "--suffix" "PATH" ":" - (lib.makeBinPath runtimeDeps) + (lib.makeBinPath finalAttrs.passthru.runtimeDeps) ]; __darwinAllowLocalNetworking = true; + passthru = { + inherit runtimeDeps; + }; + meta = { description = "Toolkit for collecting, generating, normalizing and sharing video metadata"; homepage = "https://upsies.readthedocs.io/";