diff --git a/pkgs/by-name/gr/gramps/package.nix b/pkgs/by-name/gr/gramps/package.nix index 590c54b9e41f..290f80bfd269 100644 --- a/pkgs/by-name/gr/gramps/package.nix +++ b/pkgs/by-name/gr/gramps/package.nix @@ -22,7 +22,7 @@ ghostscript, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { version = "6.0.6"; pname = "gramps"; pyproject = true; @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "gramps-project"; repo = "gramps"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+sWO+c7haKXH42JVT6Zpz70cHdGC/TPgBUMSD+0+/JI="; }; @@ -113,7 +113,7 @@ python3Packages.buildPythonApplication rec { pinpox tomasajt ]; - changelog = "https://github.com/gramps-project/gramps/blob/${src.tag}/ChangeLog"; + changelog = "https://github.com/gramps-project/gramps/blob/${finalAttrs.src.rev}/ChangeLog"; longDescription = '' Every person has their own story but they are also part of a collective family history. Gramps gives you the ability to record the many details of @@ -123,4 +123,4 @@ python3Packages.buildPythonApplication rec { ''; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/ma/makejinja/package.nix b/pkgs/by-name/ma/makejinja/package.nix index 22064b74b2ab..2cbf26937e78 100644 --- a/pkgs/by-name/ma/makejinja/package.nix +++ b/pkgs/by-name/ma/makejinja/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "makejinja"; version = "2.8.2"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mirkolenz"; repo = "makejinja"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TH4pgohh6yIgsPtsHnYSUr17Apk8C02KD+8sNO5GOf8="; }; @@ -46,6 +46,6 @@ python3Packages.buildPythonApplication rec { mirkolenz ]; platforms = lib.platforms.darwin ++ lib.platforms.linux; - changelog = "https://github.com/mirkolenz/makejinja/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/mirkolenz/makejinja/blob/${finalAttrs.src.rev}/CHANGELOG.md"; }; -} +}) diff --git a/pkgs/by-name/mo/mokuro/package.nix b/pkgs/by-name/mo/mokuro/package.nix index 139f1ad7e06f..9d996817449e 100644 --- a/pkgs/by-name/mo/mokuro/package.nix +++ b/pkgs/by-name/mo/mokuro/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "mokuro"; version = "0.2.2"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "kha-white"; repo = "mokuro"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cdbkculYPPWCSqBufpgt4EU3ne6KU2Dxk0xsvkdMZHA="; fetchSubmodules = true; }; @@ -43,11 +43,11 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = { - changelog = "https://github.com/kha-white/mokuro/releases/tag/v${version}"; + changelog = "https://github.com/kha-white/mokuro/releases/tag/${finalAttrs.src.tag}"; description = "Read Japanese manga inside browser with selectable text"; homepage = "https://github.com/kha-white/mokuro"; license = lib.licenses.gpl3Only; mainProgram = "mokuro"; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix index 6f94c7abc528..d2c8d33fc4cf 100644 --- a/pkgs/by-name/po/portablemc/package.nix +++ b/pkgs/by-name/po/portablemc/package.nix @@ -45,7 +45,7 @@ let ] ++ lib.optional textToSpeechSupport flite; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "portablemc"; version = "4.4.1"; pyproject = true; @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mindstorm38"; repo = "portablemc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KE1qf6aIcDjwKzrdKDUmriWfAt+vuriew6ixHKm0xs8="; }; @@ -93,9 +93,9 @@ python3Packages.buildPythonApplication rec { Including fast and easy installation of common mod loaders such as Fabric, Forge, NeoForge and Quilt. This launcher is compatible with the standard Minecraft directories. ''; - changelog = "https://github.com/mindstorm38/portablemc/releases/tag/v${version}"; + changelog = "https://github.com/mindstorm38/portablemc/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; mainProgram = "portablemc"; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/by-name/py/pyxel/package.nix b/pkgs/by-name/py/pyxel/package.nix index 507d91963156..3770dd9aea92 100644 --- a/pkgs/by-name/py/pyxel/package.nix +++ b/pkgs/by-name/py/pyxel/package.nix @@ -6,7 +6,7 @@ SDL2, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "pyxel"; version = "2.3.18"; pyproject = true; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "kitao"; repo = "pyxel"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pw1ZDmQ7zGwfM98jjym34RbLmUbjuuUnCoPGczxdai8="; }; @@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec { ]; meta = { - changelog = "https://github.com/kitao/pyxel/tree/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/kitao/pyxel/tree/${finalAttrs.src.rev}/CHANGELOG.md"; description = "Retro game engine for Python"; homepage = "https://github.com/kitao/pyxel"; license = lib.licenses.mit; @@ -60,4 +60,4 @@ python3.pkgs.buildPythonApplication rec { maintainers = with lib.maintainers; [ tomasajt ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/so/sourcery/package.nix b/pkgs/by-name/so/sourcery/package.nix index 45348e09a4af..0d6a4894a706 100644 --- a/pkgs/by-name/so/sourcery/package.nix +++ b/pkgs/by-name/so/sourcery/package.nix @@ -22,13 +22,13 @@ let inherit (stdenv.hostPlatform) system; platformInfo = platformInfos.${system} or (throw "Unsupported platform ${system}"); in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "sourcery"; version = "1.37.0"; format = "wheel"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; format = "wheel"; inherit (platformInfo) platform hash; }; @@ -50,4 +50,4 @@ python3Packages.buildPythonApplication rec { "x86_64-darwin" ]; }; -} +}) diff --git a/pkgs/by-name/vo/voicevox-engine/package.nix b/pkgs/by-name/vo/voicevox-engine/package.nix index f15ff0a8bc8e..7934fee85c7d 100644 --- a/pkgs/by-name/vo/voicevox-engine/package.nix +++ b/pkgs/by-name/vo/voicevox-engine/package.nix @@ -5,7 +5,7 @@ voicevox-core, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "voicevox-engine"; version = "0.25.1"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "VOICEVOX"; repo = "voicevox_engine"; - tag = version; + tag = finalAttrs.version; hash = "sha256-4pZs5f6Fe4kHIKcyww1eq9uRTf7rk5KAr/00H8aH9qA="; }; @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { ]; dependencies = [ - passthru.pyopenjtalk + finalAttrs.passthru.pyopenjtalk ] ++ (with python3Packages; [ fastapi @@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec { mv resources/character_info test_character_info # populate the `character_info` directory with the actual model metadata instead of the demo metadata - cp -r --no-preserve=all ${passthru.resources}/character_info resources/character_info + cp -r --no-preserve=all ${finalAttrs.passthru.resources}/character_info resources/character_info # the `character_info` directory copied from `resources` doesn't exactly have the expected format, # so we transform them to be acceptable by `voicevox-engine` @@ -99,10 +99,10 @@ python3Packages.buildPythonApplication rec { passthru = { resources = fetchFromGitHub { - name = "voicevox-resource-${version}"; # this contains ${version} to invalidate the hash upon updating the package + name = "voicevox-resource-${finalAttrs.version}"; # this contains ${version} to invalidate the hash upon updating the package owner = "VOICEVOX"; repo = "voicevox_resource"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YaUVlZnpxu/IhLrp1XdcxDyus7DRhyzu4VKfabTsPUY="; }; @@ -110,7 +110,7 @@ python3Packages.buildPythonApplication rec { }; meta = { - changelog = "https://github.com/VOICEVOX/voicevox_engine/releases/tag/${src.tag}"; + changelog = "https://github.com/VOICEVOX/voicevox_engine/releases/tag/${finalAttrs.src.tag}"; description = "Engine for the VOICEVOX speech synthesis software"; homepage = "https://github.com/VOICEVOX/voicevox_engine"; license = lib.licenses.lgpl3Only; @@ -121,4 +121,4 @@ python3Packages.buildPythonApplication rec { ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 38991163e868..8be34e9c8af6 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -50,7 +50,7 @@ boto3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "arelle${lib.optionalString (!gui) "-headless"}"; version = "2.38.4"; pyproject = true; @@ -58,7 +58,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Arelle"; repo = "Arelle"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ngFhY6yngr2OVQ6gsdpk5UAhzIpIrwiw+S+HK3oqfec="; }; @@ -145,7 +145,7 @@ buildPythonPackage rec { pytestCheckHook boto3 ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; disabledTestPaths = [ "tests/integration_tests" @@ -171,4 +171,4 @@ buildPythonPackage rec { roberth ]; }; -} +}) diff --git a/pkgs/development/python-modules/biom-format/default.nix b/pkgs/development/python-modules/biom-format/default.nix index ed8986c1ef74..cb608eeb1d95 100644 --- a/pkgs/development/python-modules/biom-format/default.nix +++ b/pkgs/development/python-modules/biom-format/default.nix @@ -12,7 +12,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "biom-format"; version = "2.1.17"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "biocore"; repo = "biom-format"; - tag = version; + tag = finalAttrs.version; hash = "sha256-FjIC21LoqltixBstbbANByjTNxVm/3YCxdWaD9KbOQ0="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/catppuccin/default.nix b/pkgs/development/python-modules/catppuccin/default.nix index 2e588e3bbb8a..87a1e7b6f592 100644 --- a/pkgs/development/python-modules/catppuccin/default.nix +++ b/pkgs/development/python-modules/catppuccin/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "catppuccin"; version = "2.5.0"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "catppuccin"; repo = "python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wumJ8kpr+C2pdw8jYf+IqYTdSB6Iy37yZqPKycYmOSs="; }; @@ -30,7 +30,10 @@ buildPythonPackage rec { rich = [ rich ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies; + nativeCheckInputs = [ + pytestCheckHook + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; pythonImportsCheck = [ "catppuccin" ]; @@ -43,4 +46,4 @@ buildPythonPackage rec { ]; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix index 2ac12e0e0196..feda60658931 100644 --- a/pkgs/development/python-modules/cmdstanpy/default.nix +++ b/pkgs/development/python-modules/cmdstanpy/default.nix @@ -14,7 +14,7 @@ stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cmdstanpy"; version = "1.3.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stan-dev"; repo = "cmdstanpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XVviGdJ41mcjCscL3jvcpHi6zMREHsuShGHpnMQX6V8="; }; @@ -58,7 +58,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ finalAttrs.passthru.optional-dependencies.all; disabledTestPaths = [ # No need to test these when using Nix @@ -84,8 +84,8 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/stan-dev/cmdstanpy"; description = "Lightweight interface to Stan for Python users"; - changelog = "https://github.com/stan-dev/cmdstanpy/releases/tag/v${version}"; + changelog = "https://github.com/stan-dev/cmdstanpy/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 44bc845ce39a..cdf1c244e160 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -37,7 +37,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dash"; version = "3.3.0"; pyproject = true; @@ -45,7 +45,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "plotly"; repo = "dash"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8Vt109x4T+DhBXfQf7MKoexmWFc23uuU0Nn3Ia/Xm5I="; }; @@ -55,7 +55,7 @@ buildPythonPackage rec { ]; yarnOfflineCache = fetchYarnDeps { - yarnLock = "${src}/@plotly/dash-jupyterlab/yarn.lock"; + yarnLock = "${finalAttrs.src}/@plotly/dash-jupyterlab/yarn.lock"; hash = "sha256-Nvm9BS55q/HW9ArpHD01F5Rmx8PLS3yqaz1yDK8Sg68="; }; @@ -134,7 +134,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dash" ]; meta = { - changelog = "https://github.com/plotly/dash/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/plotly/dash/blob/${finalAttrs.src.rev}/CHANGELOG.md"; description = "Python framework for building analytical web applications"; homepage = "https://dash.plot.ly/"; license = lib.licenses.mit; @@ -143,4 +143,4 @@ buildPythonPackage rec { tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix index 9be6c5355512..19d26cc62795 100644 --- a/pkgs/development/python-modules/dep-logic/default.nix +++ b/pkgs/development/python-modules/dep-logic/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dep-logic"; version = "0.5.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pdm-project"; repo = "dep-logic"; - tag = version; + tag = finalAttrs.version; hash = "sha256-BjqPtfYsHSDQoaYs+hB0r/mRuONqBHOb6goi1dxkFWo="; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dep_logic" ]; meta = { - changelog = "https://github.com/pdm-project/dep-logic/releases/tag/${src.tag}"; + changelog = "https://github.com/pdm-project/dep-logic/releases/tag/${finalAttrs.src.tag}"; description = "Python dependency specifications supporting logical operations"; homepage = "https://github.com/pdm-project/dep-logic"; license = lib.licenses.asl20; @@ -37,4 +37,4 @@ buildPythonPackage rec { misilelab ]; }; -} +}) diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index f4d69e81d46d..10dac7a8050a 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -15,7 +15,7 @@ replaceVars, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "glymur"; version = "0.13.6"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "quintusdias"; repo = "glymur"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tIvDhlFPpDxC3CgBDT0RN9MM8ycY+J1hjcLXzx14Zhs="; }; @@ -74,8 +74,8 @@ buildPythonPackage rec { meta = { description = "Tools for accessing JPEG2000 files"; homepage = "https://github.com/quintusdias/glymur"; - changelog = "https://github.com/quintusdias/glymur/blob/${src.rev}/CHANGES.txt"; + changelog = "https://github.com/quintusdias/glymur/blob/${finalAttrs.src.rev}/CHANGES.txt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index 33712b519afc..bf1e2ee92f78 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -17,7 +17,7 @@ sage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gmpy2"; version = "2.2.1"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aleaxit"; repo = "gmpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wrMN3kqLnjItoybKYeo4Pp2M0uma7Kg0JEQM8lr6OI0="; }; @@ -66,10 +66,10 @@ buildPythonPackage rec { }; meta = { - changelog = "https://github.com/aleaxit/gmpy/blob/${src.rev}/docs/history.rst"; + changelog = "https://github.com/aleaxit/gmpy/blob/${finalAttrs.src.rev}/docs/history.rst"; description = "Interface to GMP, MPFR, and MPC for Python 3.7+"; homepage = "https://github.com/aleaxit/gmpy/"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index c748d527a554..2ab11955dceb 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -18,7 +18,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "islpy"; version = "2025.2.5"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-E3DRj1WpMr79BVFUeJftp1JZafP2+Zn6yyf9ClfdWqI="; }; @@ -64,8 +64,8 @@ buildPythonPackage rec { meta = { description = "Python wrapper around isl, an integer set library"; homepage = "https://github.com/inducer/islpy"; - changelog = "https://github.com/inducer/islpy/releases/tag/v${version}"; + changelog = "https://github.com/inducer/islpy/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/kanalizer/default.nix b/pkgs/development/python-modules/kanalizer/default.nix index 06965e2120ab..5c2a696f3b1c 100644 --- a/pkgs/development/python-modules/kanalizer/default.nix +++ b/pkgs/development/python-modules/kanalizer/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kanalizer"; version = "0.1.1"; pyproject = true; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "VOICEVOX"; repo = "kanalizer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-6GxTVlc0Ec80LYQoGgLVRVoi05u6vwt5WGkd4UYX2Lg="; }; - sourceRoot = "${src.name}/infer"; + sourceRoot = "${finalAttrs.src.name}/infer"; model = let @@ -32,13 +32,13 @@ buildPythonPackage rec { prePatch = '' substituteInPlace Cargo.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ln -s "$model" crates/kanalizer-rs/models/model-c2k.safetensors ''; cargoDeps = rustPlatform.fetchCargoVendor { - inherit + inherit (finalAttrs) pname version src @@ -68,4 +68,4 @@ buildPythonPackage rec { binaryNativeCode # the model file ]; }; -} +}) diff --git a/pkgs/development/python-modules/loopy/default.nix b/pkgs/development/python-modules/loopy/default.nix index 0714ff2f3f24..e8b93f150d03 100644 --- a/pkgs/development/python-modules/loopy/default.nix +++ b/pkgs/development/python-modules/loopy/default.nix @@ -27,7 +27,7 @@ ply, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "loopy"; version = "2025.2"; pyproject = true; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "inducer"; repo = "loopy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VgsUOMCIg61mYNDMcGpMs5I1CkobhUFVjoQFdD8Vchs="; fetchSubmodules = true; # submodule at `loopy/target/c/compyte` }; @@ -76,8 +76,8 @@ buildPythonPackage rec { meta = { description = "Code generator for array-based code on CPUs and GPUs"; homepage = "https://github.com/inducer/loopy"; - changelog = "https://github.com/inducer/loopy/releases/tag/${src.tag}"; + changelog = "https://github.com/inducer/loopy/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/materialyoucolor/default.nix b/pkgs/development/python-modules/materialyoucolor/default.nix index 0e2fea505303..77ce6e11ab5c 100644 --- a/pkgs/development/python-modules/materialyoucolor/default.nix +++ b/pkgs/development/python-modules/materialyoucolor/default.nix @@ -17,14 +17,14 @@ let hash = "sha256-shGNdgOOydgGBtl/JCbTJ0AYgl+2xWvCgHBL+bEoTaE="; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "materialyoucolor"; version = "2.0.10"; pyproject = true; # PyPI sources contain additional vendored sources src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-MbTUB7mk/UtUswVZsNAxP21tofnRm3VUbtZdpSZx6nY="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/nutils-poly/default.nix b/pkgs/development/python-modules/nutils-poly/default.nix index f1ea044e2f85..839fdc90fec8 100644 --- a/pkgs/development/python-modules/nutils-poly/default.nix +++ b/pkgs/development/python-modules/nutils-poly/default.nix @@ -9,7 +9,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nutils-poly"; version = "1.0.1"; pyproject = true; @@ -17,12 +17,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nutils"; repo = "poly-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dxFv4Az3uz6Du5dk5KZJ+unVbt3aZjxXliAQZhmBWDM="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-3UBQJfMPVo37V7mJnN9loF1+vKh3JxFJWgynwsOnAg4="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix index aea25b378ea3..5c3e4e2a345d 100644 --- a/pkgs/development/python-modules/phe/default.nix +++ b/pkgs/development/python-modules/phe/default.nix @@ -11,7 +11,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "phe"; version = "1.5.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "data61"; repo = "python-paillier"; - tag = version; + tag = finalAttrs.version; hash = "sha256-P//4ZL4+2zcB5sWvujs2N0CHFz+EBLERWrPGLLHj6CY="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix index 269dfb8a122f..e557f03774ed 100644 --- a/pkgs/development/python-modules/prophet/default.nix +++ b/pkgs/development/python-modules/prophet/default.nix @@ -18,7 +18,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "prophet"; version = "1.2.1"; pyproject = true; @@ -26,11 +26,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "facebook"; repo = "prophet"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rG21Q4V0XQjReIHd7vV/aFOUvnLEw/dm8AobXRDUfuA="; }; - sourceRoot = "${src.name}/python"; + sourceRoot = "${finalAttrs.src.name}/python"; env.PROPHET_REPACKAGE_CMDSTAN = "false"; @@ -63,10 +63,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "prophet" ]; meta = { - changelog = "https://github.com/facebook/prophet/releases/tag/${src.tag}"; + changelog = "https://github.com/facebook/prophet/releases/tag/${finalAttrs.src.tag}"; description = "Tool for producing high quality forecasts for time series data that has multiple seasonality with linear or non-linear growth"; homepage = "https://facebook.github.io/prophet/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/py65/default.nix b/pkgs/development/python-modules/py65/default.nix index a6dc3e89fbb8..b6da376554b1 100644 --- a/pkgs/development/python-modules/py65/default.nix +++ b/pkgs/development/python-modules/py65/default.nix @@ -6,7 +6,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py65"; version = "1.2.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mnaberez"; repo = "py65"; - tag = version; + tag = finalAttrs.version; hash = "sha256-BMX+sMPx/YBFA4NFkaY0rl0EPicGHgb6xXVvLEIdllA="; }; @@ -31,11 +31,11 @@ buildPythonPackage rec { debugger. Py65Mon provides a command line with many convenient commands for interacting with the simulated 6502-based system. ''; - changelog = "https://github.com/mnaberez/py65/blob/${src.rev}/CHANGES.txt"; + changelog = "https://github.com/mnaberez/py65/blob/${finalAttrs.src.rev}/CHANGES.txt"; license = lib.licenses.bsd3; mainProgram = "py65mon"; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyopenjtalk/default.nix b/pkgs/development/python-modules/pyopenjtalk/default.nix index efc59b4b952e..a6397785966b 100644 --- a/pkgs/development/python-modules/pyopenjtalk/default.nix +++ b/pkgs/development/python-modules/pyopenjtalk/default.nix @@ -24,7 +24,7 @@ let hash = "sha256-+6cHKujNEzmJbpN9Uan6kZKsPdwxRRzT3ZazDnCNi3s="; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyopenjtalk"; version = "0.4.1"; pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "r9y9"; repo = "pyopenjtalk"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-f0JNiMCeKpTY+jH3/9LuCkX2DRb9U8sN0SezT6OTm/E="; fetchSubmodules = true; }; @@ -70,10 +70,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyopenjtalk" ]; meta = { - changelog = "https://github.com/r9y9/pyopenjtalk/releases/tag/${src.tag}"; + changelog = "https://github.com/r9y9/pyopenjtalk/releases/tag/${finalAttrs.src.tag}"; description = "Python wrapper for OpenJTalk"; homepage = "https://github.com/r9y9/pyopenjtalk"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-spec/default.nix b/pkgs/development/python-modules/pytest-spec/default.nix index 950449d1c652..6167d0d40974 100644 --- a/pkgs/development/python-modules/pytest-spec/default.nix +++ b/pkgs/development/python-modules/pytest-spec/default.nix @@ -9,7 +9,7 @@ pytest-describe, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-spec"; version = "5.2.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pchomik"; repo = "pytest-spec"; - tag = version; + tag = finalAttrs.version; hash = "sha256-nKBzQrosgTKHoID43u6G31fphsDyCVZhsNQuYIHiLfA="; }; @@ -36,10 +36,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_spec" ]; meta = { - changelog = "https://github.com/pchomik/pytest-spec/blob/${src.tag}/CHANGES.txt"; + changelog = "https://github.com/pchomik/pytest-spec/blob/${finalAttrs.src.rev}/CHANGES.txt"; description = "Pytest plugin to display test execution output like a SPECIFICATION"; homepage = "https://github.com/pchomik/pytest-spec"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-escpos/default.nix b/pkgs/development/python-modules/python-escpos/default.nix index 257870f5b6aa..a22e446e8f95 100644 --- a/pkgs/development/python-modules/python-escpos/default.nix +++ b/pkgs/development/python-modules/python-escpos/default.nix @@ -28,7 +28,7 @@ hypothesis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-escpos"; version = "3.1"; pyproject = true; @@ -36,7 +36,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-escpos"; repo = "python-escpos"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-f7qA1+8PwnXS526jjULEoyn0ejnvsneuWDt863p4J2g="; fetchSubmodules = true; }; @@ -85,16 +85,16 @@ buildPythonPackage rec { mock hypothesis ] - ++ optional-dependencies.all; + ++ finalAttrs.passthru.optional-dependencies.all; pythonImportsCheck = [ "escpos" ]; meta = { - changelog = "https://github.com/python-escpos/python-escpos/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/python-escpos/python-escpos/blob/${finalAttrs.src.rev}/CHANGELOG.rst"; description = "Python library to manipulate ESC/POS printers"; homepage = "https://python-escpos.readthedocs.io/"; license = lib.licenses.mit; mainProgram = "python-escpos"; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 151ae1f21f42..c8e1cba068b1 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -27,7 +27,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scikit-bio"; version = "0.7.0"; pyproject = true; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-bio"; repo = "scikit-bio"; - tag = version; + tag = finalAttrs.version; hash = "sha256-M0P5DUAMlRTkaIPbxSvO99N3y5eTrkg4NMlkIpGr4/g="; }; @@ -76,8 +76,8 @@ buildPythonPackage rec { description = "Data structures, algorithms and educational resources for bioinformatics"; homepage = "http://scikit-bio.org/"; downloadPage = "https://github.com/scikit-bio/scikit-bio"; - changelog = "https://github.com/scikit-bio/scikit-bio/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/scikit-bio/scikit-bio/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/setuptools-gettext/default.nix b/pkgs/development/python-modules/setuptools-gettext/default.nix index 14af007c4045..40b7d7b00c52 100644 --- a/pkgs/development/python-modules/setuptools-gettext/default.nix +++ b/pkgs/development/python-modules/setuptools-gettext/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "setuptools-gettext"; version = "0.1.16"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "breezy-team"; repo = "setuptools-gettext"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-N59Hx6CyOzAin8KcMTAD++HFLDdJnJbql/U3fO2F3DU="; }; @@ -31,10 +31,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/breezy-team/setuptools-gettext/releases/tag/${src.tag}"; + changelog = "https://github.com/breezy-team/setuptools-gettext/releases/tag/${finalAttrs.src.tag}"; description = "Setuptools plugin for building mo files"; homepage = "https://github.com/breezy-team/setuptools-gettext"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/sphinx-autodoc2/default.nix b/pkgs/development/python-modules/sphinx-autodoc2/default.nix index 05745a31b13e..a0cf4db57cab 100644 --- a/pkgs/development/python-modules/sphinx-autodoc2/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc2/default.nix @@ -16,7 +16,7 @@ defusedxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-autodoc2"; version = "0.5.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-extensions2"; repo = "sphinx-autodoc2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Wu079THK1mHVilD2Fx9dIzuIOOYOXpo/EMxVczNutCI="; }; @@ -32,7 +32,7 @@ buildPythonPackage rec { # compatibility with astroid 4, see: https://github.com/sphinx-extensions2/sphinx-autodoc2/pull/93 (fetchDebianPatch { pname = "python-sphinx-autodoc2"; - inherit version; + inherit (finalAttrs) version; debianRevision = "9"; patch = "astroid-4.patch"; hash = "sha256-tRWDee30GSQ+AobCAHdtw65B6YyRpzn7kW5rzK7/QOk="; @@ -72,11 +72,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "autodoc2" ]; meta = { - changelog = "https://github.com/sphinx-extensions2/sphinx-autodoc2/releases/tag/v${version}"; + changelog = "https://github.com/sphinx-extensions2/sphinx-autodoc2/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/sphinx-extensions2/sphinx-autodoc2"; description = "Sphinx extension that automatically generates API documentation for your Python packages"; license = lib.licenses.mit; mainProgram = "autodoc2"; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +}) diff --git a/pkgs/development/python-modules/torchsummary/default.nix b/pkgs/development/python-modules/torchsummary/default.nix index 8805e8fa2117..a3465370d5e2 100644 --- a/pkgs/development/python-modules/torchsummary/default.nix +++ b/pkgs/development/python-modules/torchsummary/default.nix @@ -6,13 +6,13 @@ torch, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "torchsummary"; version = "1.5.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-mBv2ieIuDPf5XHRgAvIKJK0mqmudhhE0oUvGzpIjBZA="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; }; -} +})