diff --git a/pkgs/by-name/au/autotrash/package.nix b/pkgs/by-name/au/autotrash/package.nix index ff11b549a12c4..7f0cf37c2b893 100644 --- a/pkgs/by-name/au/autotrash/package.nix +++ b/pkgs/by-name/au/autotrash/package.nix @@ -6,7 +6,7 @@ installShellFiles, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "autotrash"; version = "0.4.7"; pyproject = true; @@ -14,13 +14,13 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "bneijt"; repo = "autotrash"; - tag = version; + tag = finalAttrs.version; hash = "sha256-qMU3jjBL5+fd9vKX5BIqES5AM8D/54aBOmdHFiBtfEo="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ python3Packages.poetry-core ]; @@ -41,11 +41,11 @@ python3Packages.buildPythonPackage rec { description = "Tool to automatically purge old trashed files"; license = lib.licenses.gpl3Plus; homepage = "https://bneijt.nl/pr/autotrash"; - changelog = "https://github.com/bneijt/autotrash/releases/tag/${version}"; + changelog = "https://github.com/bneijt/autotrash/releases/tag/${finalAttrs.src.tag}"; maintainers = with lib.maintainers; [ sigmanificient mithicspirit ]; mainProgram = "autotrash"; }; -} +}) diff --git a/pkgs/by-name/ca/cavalcade/package.nix b/pkgs/by-name/ca/cavalcade/package.nix index 368c0256b850e..409572deb6a70 100644 --- a/pkgs/by-name/ca/cavalcade/package.nix +++ b/pkgs/by-name/ca/cavalcade/package.nix @@ -12,7 +12,7 @@ fetchurl, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "cavalcade"; version = "0.8"; pyproject = true; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "worron"; repo = "cavalcade"; - tag = version; + tag = finalAttrs.version; hash = "sha256-VyWOPNidN0+pfuxsgPWq6lI5gXQsiRpmYjQYjZW6i9w="; }; @@ -71,4 +71,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/by-name/cb/cbeams/package.nix b/pkgs/by-name/cb/cbeams/package.nix index c5278cdbf897f..0c779faef23fa 100644 --- a/pkgs/by-name/cb/cbeams/package.nix +++ b/pkgs/by-name/cb/cbeams/package.nix @@ -4,7 +4,7 @@ fetchPypi, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "cbeams"; version = "1.0.3"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { disabled = !python3Packages.isPy3k; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8Q2sWsAc39Mu34K1wWOKOJERKzBStE4GmtuzOs2T7Kk="; }; @@ -41,4 +41,4 @@ python3Packages.buildPythonApplication rec { sigmanificient ]; }; -} +}) diff --git a/pkgs/by-name/co/compiledb/package.nix b/pkgs/by-name/co/compiledb/package.nix index e2758b001ecb9..a481731b75d26 100644 --- a/pkgs/by-name/co/compiledb/package.nix +++ b/pkgs/by-name/co/compiledb/package.nix @@ -5,7 +5,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "compiledb"; version = "0.10.7"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "nickdiego"; repo = "compiledb"; - tag = version; + tag = finalAttrs.version; hash = "sha256-toqBf5q1EfZVhZN5DAtxkyFF7UlyNbqxWAIWFMwacxw="; }; @@ -44,4 +44,4 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/nickdiego/compiledb"; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/by-name/di/diagrams-as-code/package.nix b/pkgs/by-name/di/diagrams-as-code/package.nix index e550e281f527d..dc2b47cb675d5 100644 --- a/pkgs/by-name/di/diagrams-as-code/package.nix +++ b/pkgs/by-name/di/diagrams-as-code/package.nix @@ -6,7 +6,7 @@ diagrams-as-code, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "diagrams-as-code"; version = "0.0.4"; pyproject = true; @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "dmytrostriletskyi"; repo = "diagrams-as-code"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cd602eQvNCUQuCdn/RpcfURcDHjXLZ0gAG+SObB++Q0="; }; @@ -55,4 +55,4 @@ python3Packages.buildPythonPackage rec { maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "diagrams-as-code"; }; -} +}) diff --git a/pkgs/by-name/gc/gcovr/package.nix b/pkgs/by-name/gc/gcovr/package.nix index d7efae7c45560..ff3c8f6789d52 100644 --- a/pkgs/by-name/gc/gcovr/package.nix +++ b/pkgs/by-name/gc/gcovr/package.nix @@ -7,7 +7,7 @@ gitMinimal, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "gcovr"; version = "8.4"; pyproject = true; @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "gcovr"; repo = "gcovr"; - tag = version; + tag = finalAttrs.version; hash = "sha256-v3jNODYD9qa3mwttfuldhhIHrfR5LcsZ+WNWiOWb35E="; }; @@ -82,9 +82,9 @@ python3Packages.buildPythonPackage rec { meta = { description = "Python script for summarizing gcov data"; homepage = "https://www.gcovr.com/"; - changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/gcovr/gcovr/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.bsd0; maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "gcovr"; }; -} +}) diff --git a/pkgs/by-name/im/imapdedup/package.nix b/pkgs/by-name/im/imapdedup/package.nix index 0e66b83b5c11b..b275569cb47d4 100644 --- a/pkgs/by-name/im/imapdedup/package.nix +++ b/pkgs/by-name/im/imapdedup/package.nix @@ -3,7 +3,7 @@ python3Packages, fetchFromGitHub, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "imapdedup"; version = "1.2"; pyproject = true; @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "quentinsf"; repo = "IMAPdedup"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CmWkLz9hdmedUxcojmUVTkPjqpaMmtEeHnF7aglKR+s="; }; @@ -28,4 +28,4 @@ python3Packages.buildPythonApplication rec { license = with lib.licenses; [ gpl2Only ]; mainProgram = "imapdedup"; }; -} +}) diff --git a/pkgs/by-name/ps/ps_mem/package.nix b/pkgs/by-name/ps/ps_mem/package.nix index 566b4580bdf74..1c012cc6aff79 100644 --- a/pkgs/by-name/ps/ps_mem/package.nix +++ b/pkgs/by-name/ps/ps_mem/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "ps_mem"; version = "3.14"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "pixelb"; repo = "ps_mem"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jCfPtPSky/QFk9Xo/tq3W7609Pie1yLC4iS4dqjCa+E="; }; @@ -28,4 +28,4 @@ python3Packages.buildPythonApplication rec { platforms = lib.platforms.linux; mainProgram = "ps_mem"; }; -} +}) diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix index 406bae909c10e..277af3218b82a 100644 --- a/pkgs/by-name/tu/tuifimanager/package.nix +++ b/pkgs/by-name/tu/tuifimanager/package.nix @@ -19,7 +19,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport) "Drag and drop support is only available for linux with xorg." python3Packages.buildPythonApplication - rec { + (finalAttrs: { pname = "tuifimanager"; version = "5.1.5"; @@ -28,7 +28,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport) src = fetchFromGitHub { owner = "GiorgosXou"; repo = "TUIFIManager"; - tag = "v.${version}"; + tag = "v.${finalAttrs.version}"; hash = "sha256-5ShrmjEFKGdmaGBFjMnIfcM6p8AZd13uIEFwDVAkU/8="; }; @@ -86,4 +86,4 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport) ]; mainProgram = "tuifi"; }; - } + }) diff --git a/pkgs/development/python-modules/aerosandbox/default.nix b/pkgs/development/python-modules/aerosandbox/default.nix index 4171664f735c5..b8e0122fe1c4b 100644 --- a/pkgs/development/python-modules/aerosandbox/default.nix +++ b/pkgs/development/python-modules/aerosandbox/default.nix @@ -14,14 +14,15 @@ casadi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aerosandbox"; version = "4.2.8"; format = "wheel"; src = fetchPypi { pname = "AeroSandbox"; - inherit version format; + inherit (finalAttrs) version; + format = "wheel"; python = "py3"; dist = "py3"; @@ -49,4 +50,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/atopile-easyeda2kicad/default.nix b/pkgs/development/python-modules/atopile-easyeda2kicad/default.nix index 07c71a87ff39c..1ce95caf891f9 100644 --- a/pkgs/development/python-modules/atopile-easyeda2kicad/default.nix +++ b/pkgs/development/python-modules/atopile-easyeda2kicad/default.nix @@ -13,7 +13,7 @@ truststore, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "atopile-easyeda2kicad"; version = "0.9.7"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "atopile"; repo = "easyeda2kicad.py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-l5ecNNu9vu073aK85F+tOSodEHk2wso95RYXk9DyTFo="; }; @@ -43,9 +43,9 @@ buildPythonPackage rec { meta = { description = "Convert any LCSC components (including EasyEDA) to KiCad library"; homepage = "https://github.com/atopile/easyeda2kicad.py"; - changelog = "https://github.com/atopile/easyeda2kicad.py/releases/tag/${src.tag}"; + changelog = "https://github.com/atopile/easyeda2kicad.py/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "easyeda2kicad"; }; -} +}) diff --git a/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix b/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix index fd508eb915fad..6d01ee1c78e41 100644 --- a/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix +++ b/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-ai-vision-imageanalysis"; version = "39.0.0"; pyproject = true; @@ -16,11 +16,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-python"; - tag = "azure-mgmt-containerservice_${version}"; + tag = "azure-mgmt-containerservice_${finalAttrs.version}"; hash = "sha256-zufXc8LR4STHi/jjV0bcLsifcHIif2m+3Q/KZlsSkRw="; }; - sourceRoot = "${src.name}/sdk/vision/azure-ai-vision-imageanalysis"; + sourceRoot = "${finalAttrs.src.name}/sdk/vision/azure-ai-vision-imageanalysis"; build-system = [ setuptools ]; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/case-converter/default.nix b/pkgs/development/python-modules/case-converter/default.nix index b3795d39494c6..77f738eaacbf1 100644 --- a/pkgs/development/python-modules/case-converter/default.nix +++ b/pkgs/development/python-modules/case-converter/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "case-converter"; version = "1.2.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chrisdoherty4"; repo = "python-case-converter"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PS/9Ndl3oD9zimEf819dNoSAeNJPndVjT+dkfW7FIJs="; }; @@ -29,8 +29,8 @@ buildPythonPackage rec { meta = { description = "Case conversion library for Python"; homepage = "https://github.com/chrisdoherty4/python-case-converter"; - changelog = "https://github.com/chrisdoherty4/python-case-converter/releases/tag/${src.tag}"; + changelog = "https://github.com/chrisdoherty4/python-case-converter/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix index 0821e5fc84adf..453de0280a5bf 100644 --- a/pkgs/development/python-modules/cgen/default.nix +++ b/pkgs/development/python-modules/cgen/default.nix @@ -9,13 +9,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cgen"; version = "2025.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-efAeAQ1JwT5YtMqPLUmWprcXiWj18tkGJiczSArnotQ="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/crossandra/default.nix b/pkgs/development/python-modules/crossandra/default.nix index 58c00243aaa4f..6c32ad9242761 100644 --- a/pkgs/development/python-modules/crossandra/default.nix +++ b/pkgs/development/python-modules/crossandra/default.nix @@ -7,7 +7,7 @@ mypy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crossandra"; version = "2.2.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "trag1c"; repo = "crossandra"; - tag = version; + tag = finalAttrs.version; hash = "sha256-/JhrjXRH7Rs2bUil9HRneBC9wlVYEyfwivjzb+eyRv8="; }; @@ -33,10 +33,10 @@ buildPythonPackage rec { ''; meta = { - changelog = "https://github.com/trag1c/crossandra/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/trag1c/crossandra/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Fast and simple enum/regex-based tokenizer with decent configurability"; license = lib.licenses.mit; homepage = "https://trag1c.github.io/crossandra"; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/dahlia/default.nix b/pkgs/development/python-modules/dahlia/default.nix index 81df1463cf255..b472f77f21ba8 100644 --- a/pkgs/development/python-modules/dahlia/default.nix +++ b/pkgs/development/python-modules/dahlia/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dahlia"; version = "3.1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dahlia-lib"; repo = "dahlia"; - tag = version; + tag = finalAttrs.version; hash = "sha256-489wI0SoC6EU9lC2ISYsLOJUC8g+kLA7UpOrDiBCBmo="; }; @@ -24,11 +24,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { - changelog = "https://github.com/dahlia-lib/dahlia/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/dahlia-lib/dahlia/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Simple text formatting package, inspired by the game Minecraft"; license = lib.licenses.mit; homepage = "https://github.com/dahlia-lib/dahlia"; maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "dahlia"; }; -} +}) diff --git a/pkgs/development/python-modules/esper/default.nix b/pkgs/development/python-modules/esper/default.nix index de27eee121b2f..b6e16816a8f70 100644 --- a/pkgs/development/python-modules/esper/default.nix +++ b/pkgs/development/python-modules/esper/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "esper"; version = "3.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "benmoran56"; repo = "esper"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DZAF2B40ulSn2MQadklT32Svcm1j0e/hIxrxISO07TI="; }; @@ -26,8 +26,8 @@ buildPythonPackage rec { meta = { description = "ECS (Entity Component System) for Python"; homepage = "https://github.com/benmoran56/esper"; - changelog = "https://github.com/benmoran56/esper/blob/${src.rev}/RELEASE_NOTES"; + changelog = "https://github.com/benmoran56/esper/blob/${finalAttrs.src.tag}/RELEASE_NOTES"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/ewmhlib/default.nix b/pkgs/development/python-modules/ewmhlib/default.nix index 378aff81da0f9..23820d8c13838 100644 --- a/pkgs/development/python-modules/ewmhlib/default.nix +++ b/pkgs/development/python-modules/ewmhlib/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.2"; pname = "ewmhlib"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Kalmat"; repo = "EWMHlib"; - rev = "refs/tags/v${version}"; + tag = "refs/tags/v${finalAttrs.version}"; hash = "sha256-NELOgUV8KuN+CqmoSbLYImguHlp8dyhGmJtoxJjOBkA="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { description = "Extended Window Manager Hints implementation in Python 3"; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/fastapi-github-oidc/default.nix b/pkgs/development/python-modules/fastapi-github-oidc/default.nix index 75614652e872c..288c55482cdc7 100644 --- a/pkgs/development/python-modules/fastapi-github-oidc/default.nix +++ b/pkgs/development/python-modules/fastapi-github-oidc/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastapi-github-oidc"; version = "0.3.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "atopile"; repo = "fastapi-github-oidc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-FS50++Hy9h0RFrSnc4PbXFPh/1OO0JOaFdIZwoXa86A="; }; @@ -48,8 +48,8 @@ buildPythonPackage rec { meta = { description = "FastAPI compatible middleware to authenticate Github OIDC Tokens"; homepage = "https://github.com/atopile/fastapi-github-oidc"; - changelog = "https://github.com/atopile/fastapi-github-oidc/releases/tag/${src.tag}"; + changelog = "https://github.com/atopile/fastapi-github-oidc/releases/tag/${finalAttrs.src.tag}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/feather-format/default.nix b/pkgs/development/python-modules/feather-format/default.nix index 956b107695ada..8faa405a746a0 100644 --- a/pkgs/development/python-modules/feather-format/default.nix +++ b/pkgs/development/python-modules/feather-format/default.nix @@ -6,13 +6,13 @@ pyarrow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "feather-format"; version = "0.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RfZ+N0XTlNTxYMptY2u/1Pi2jQEZncFkm25IfT6HiQM="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/glob2/default.nix b/pkgs/development/python-modules/glob2/default.nix index 6ceaca44406b4..f72a9f2977b2e 100644 --- a/pkgs/development/python-modules/glob2/default.nix +++ b/pkgs/development/python-modules/glob2/default.nix @@ -5,13 +5,13 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "glob2"; version = "0.7"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "135bj8gm6vn45vv0phrvhyir36kfm17y7kmasxinv8lagk8dphw5"; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/gstools/default.nix b/pkgs/development/python-modules/gstools/default.nix index d3f5d03de1645..6d5c48df9bb2a 100644 --- a/pkgs/development/python-modules/gstools/default.nix +++ b/pkgs/development/python-modules/gstools/default.nix @@ -26,7 +26,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gstools"; version = "1.7.0"; pyproject = true; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GeoStat-Framework"; repo = "GSTools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rQ7mSa1BWAaRiiE6aQD6jl8BktihY9bjFJV+5eT9n/M="; }; @@ -65,13 +65,13 @@ buildPythonPackage rec { pytestCheckHook pytest-cov-stub ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; meta = { description = "Geostatistical toolbox"; homepage = "https://github.com/GeoStat-Framework/GSTools"; - changelog = "https://github.com/GeoStat-Framework/GSTools/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/GeoStat-Framework/GSTools/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/hankel/default.nix b/pkgs/development/python-modules/hankel/default.nix index b46264f190bdc..af08be4e4345e 100644 --- a/pkgs/development/python-modules/hankel/default.nix +++ b/pkgs/development/python-modules/hankel/default.nix @@ -17,7 +17,7 @@ pytest-xdist, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hankel"; version = "1.2.2"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "steven-murray"; repo = "hankel"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/5PvbH8zz2siLS1YJYRSrl/Cpi0WToBu1TJhlek8VEE="; }; @@ -55,8 +55,8 @@ buildPythonPackage rec { meta = { description = "Implementation of Ogata's (2005) method for Hankel transforms"; homepage = "https://github.com/steven-murray/hankel"; - changelog = "https://github.com/steven-murray/hankel/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/steven-murray/hankel/v${finalAttrs.version}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/hikari-crescent/default.nix b/pkgs/development/python-modules/hikari-crescent/default.nix index 6cf3a71cdac1e..2f876df339659 100644 --- a/pkgs/development/python-modules/hikari-crescent/default.nix +++ b/pkgs/development/python-modules/hikari-crescent/default.nix @@ -12,7 +12,7 @@ pynacl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hikari-crescent"; version = "1.4.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hikari-crescent"; repo = "hikari-crescent"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-86NCAlN5/JGrxPVIMs6ARr6H4G3shPcgxASwukptyJo="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "hikari-crescent"; }; -} +}) diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index 1837ba8bbc6b0..ab94ad2a1905a 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -16,7 +16,7 @@ pytest-asyncio, mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hikari"; version = "2.4.1"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hikari-py"; repo = "hikari"; - tag = version; + tag = finalAttrs.version; hash = "sha256-lkJICN5uXFIKUZwxZI82FSYZLWFa7Cb6tDs6wV9DsY0="; # The git commit is part of the `hikari.__git_sha1__` original output; # leave that output the same in nixpkgs. Use the `.git` directory @@ -77,11 +77,11 @@ buildPythonPackage rec { meta = { description = "Discord API wrapper for Python written with asyncio"; homepage = "https://www.hikari-py.dev/"; - changelog = "https://github.com/hikari-py/hikari/releases/tag/${src.tag}"; + changelog = "https://github.com/hikari-py/hikari/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomodachi94 sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index c4b7e3ab708aa..41c0220016aff 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "intbitset"; version = "4.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cxRf8F5CJ8dlhf+FUGOLagg80TABC3gQRdga9Y97aSA="; }; @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "C-based extension implementing fast integer bit sets"; homepage = "https://github.com/inveniosoftware/intbitset"; - changelog = "https://github.com/inveniosoftware-contrib/intbitset/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/inveniosoftware-contrib/intbitset/blob/v${finalAttrs.version}/CHANGELOG.rst"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/ixia/default.nix b/pkgs/development/python-modules/ixia/default.nix index 0e0493f919580..7d269190b9089 100644 --- a/pkgs/development/python-modules/ixia/default.nix +++ b/pkgs/development/python-modules/ixia/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ixia"; version = "2.0.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "trag1c"; repo = "ixia"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8STtLL63V+XnDqDNZOx7X9mkjUu176SSyQOL55LXFz0="; }; @@ -24,10 +24,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "ixia" ]; meta = { - changelog = "https://github.com/trag1c/ixia/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/trag1c/ixia/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Connecting secrets' security with random's versatility"; license = lib.licenses.mit; homepage = "https://trag1c.github.io/ixia"; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/kde-material-you-colors/default.nix b/pkgs/development/python-modules/kde-material-you-colors/default.nix index 792ebaffaf32e..cd49235e4274f 100644 --- a/pkgs/development/python-modules/kde-material-you-colors/default.nix +++ b/pkgs/development/python-modules/kde-material-you-colors/default.nix @@ -10,7 +10,7 @@ materialyoucolor, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kde-material-you-colors"; version = "1.10.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "luisbocanegra"; repo = "kde-material-you-colors"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qiaFHu4eyX73cAbMdoP46SiiFjNWx2vXWVzEbCsTNBI="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "kde-material-you-colors"; }; -} +}) diff --git a/pkgs/development/python-modules/kicad-python/default.nix b/pkgs/development/python-modules/kicad-python/default.nix index 3344a073b4485..b0c3eb382e73a 100644 --- a/pkgs/development/python-modules/kicad-python/default.nix +++ b/pkgs/development/python-modules/kicad-python/default.nix @@ -13,7 +13,7 @@ pythonOlder, typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kicad-python"; version = "0.4.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "kicad/code"; repo = "kicad-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-M2vJ/lSwc1XjrG661ayNIOZKJitmy/UPM2SesQI1xYE="; fetchSubmodules = true; }; @@ -67,4 +67,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/kicadcliwrapper/default.nix b/pkgs/development/python-modules/kicadcliwrapper/default.nix index c7f6d5b341e86..32cbdb773c4d6 100644 --- a/pkgs/development/python-modules/kicadcliwrapper/default.nix +++ b/pkgs/development/python-modules/kicadcliwrapper/default.nix @@ -9,7 +9,7 @@ kicad, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kicadcliwrapper"; version = "1.1.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "atopile"; repo = "kicadcliwrapper"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-s1j0k6SvZiIHu8PKGTR+GaYUZIlFq5TKYuxoCsvsvUY="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/libsass/default.nix b/pkgs/development/python-modules/libsass/default.nix index b5baa5d109229..348014d5fca44 100644 --- a/pkgs/development/python-modules/libsass/default.nix +++ b/pkgs/development/python-modules/libsass/default.nix @@ -8,7 +8,7 @@ werkzeug, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libsass"; version = "0.23.0"; format = "setuptools"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sass"; repo = "libsass-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CiSr9/3EDwpDEzu6VcMBAlm3CtKTmGYbZMnMEjyZVxI="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/loguru-logging-intercept/default.nix b/pkgs/development/python-modules/loguru-logging-intercept/default.nix index 94b3011206453..f7176f2ad558e 100644 --- a/pkgs/development/python-modules/loguru-logging-intercept/default.nix +++ b/pkgs/development/python-modules/loguru-logging-intercept/default.nix @@ -6,7 +6,7 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "loguru-logging-intercept"; version = "0.1.5"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { # no tags on git src = fetchPypi { pname = "loguru_logging_intercept"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-WBA4vxMQ+7Bs2kivvTc+crvAHVHE3wWPSQgat6fF+YQ="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ sigmanificient ]; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix b/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix index 3a997e5e421be..9b46ebf11a6f3 100644 --- a/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix +++ b/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mdformat-gfm-alerts"; version = "2.0.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KyleKing"; repo = "mdformat-gfm-alerts"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Hfi4Ek91G8WHAWjv7m52ZnT5Je9QyZT4yWSecaeTcvA="; }; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Format 'GitHub Markdown Alerts', which use blockquotes to render admonitions"; homepage = "https://github.com/KyleKing/mdformat-gfm-alerts"; - changelog = "https://github.com/KyleKing/mdformat-gfm-alerts/releases/tag/${src.tag}"; + changelog = "https://github.com/KyleKing/mdformat-gfm-alerts/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/nemosis/default.nix b/pkgs/development/python-modules/nemosis/default.nix index 9bd6ee6977cd7..614413d30e8d8 100644 --- a/pkgs/development/python-modules/nemosis/default.nix +++ b/pkgs/development/python-modules/nemosis/default.nix @@ -13,7 +13,7 @@ xlrd, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nemosis"; version = "3.8.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "UNSW-CEEM"; repo = "NEMOSIS"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4Bb9yZUfwkFQVNSVGtg3APXPovos23oHAx4v+6aa7MM="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix index 5ac649a7fc5a2..7ef80d8e9cdba 100644 --- a/pkgs/development/python-modules/normality/default.nix +++ b/pkgs/development/python-modules/normality/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "normality"; version = "3.0.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pudo"; repo = "normality"; - tag = version; + tag = finalAttrs.version; hash = "sha256-X8ssSURC3NiQ1uf2qv1PgCBIYQnmoYVKPn5YPdJG71o="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/oddsprout/default.nix b/pkgs/development/python-modules/oddsprout/default.nix index 3c02f24b63381..708d80780fb51 100644 --- a/pkgs/development/python-modules/oddsprout/default.nix +++ b/pkgs/development/python-modules/oddsprout/default.nix @@ -9,7 +9,7 @@ ixia, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oddsprout"; version = "0.1.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "trag1c"; repo = "oddsprout"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RfAU3/Je3aC8JjQ51DqRCSAIfW2tQmQPP6G0/bfa1ZE="; }; @@ -35,7 +35,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "oddsprout" ]; meta = { - changelog = "https://github.com/trag1c/oddsprout/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/trag1c/oddsprout/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Generate random JSON with no schemas involved"; license = lib.licenses.mit; homepage = "https://trag1c.github.io/oddsprout"; @@ -45,4 +45,4 @@ buildPythonPackage rec { ]; mainProgram = "oddsprout"; }; -} +}) diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix index 24fa52247d5d9..b6a6d124d7c56 100644 --- a/pkgs/development/python-modules/osxphotos/default.nix +++ b/pkgs/development/python-modules/osxphotos/default.nix @@ -39,7 +39,7 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "osxphotos"; version = "0.74.2"; pyproject = true; @@ -47,7 +47,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RhetTbull"; repo = "osxphotos"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dvY6ShScIpJ+HcTJFPOBSETibzfiV8meILI4WrQLsaU="; }; @@ -111,10 +111,10 @@ buildPythonPackage rec { meta = { description = "Export photos from Apple's macOS Photos app and query the Photos library database to access metadata about images"; homepage = "https://github.com/RhetTbull/osxphotos"; - changelog = "https://github.com/RhetTbull/osxphotos/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/RhetTbull/osxphotos/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; # missing utitools dependency broken = true && stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/development/python-modules/outspin/default.nix b/pkgs/development/python-modules/outspin/default.nix index 6785689cc7ed4..bddf1efb92ca3 100644 --- a/pkgs/development/python-modules/outspin/default.nix +++ b/pkgs/development/python-modules/outspin/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finaAttrs: { pname = "outspin"; version = "0.3.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "trag1c"; repo = "outspin"; - tag = "v${version}"; + tag = "v${finaAttrs.version}"; hash = "sha256-j+J3n/p+DcfnhGfC4/NDBDl5bF39L5kIPeGJW0Zm7ls="; }; @@ -24,9 +24,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { - changelog = "https://github.com/trag1c/outspin/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/trag1c/outspin/blob/${finaAttrs.src.tag}/CHANGELOG.md"; description = "Conveniently read single char inputs in the console"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/pandoc-latex-environment/default.nix b/pkgs/development/python-modules/pandoc-latex-environment/default.nix index a34e86148dbf5..aff7e87803576 100644 --- a/pkgs/development/python-modules/pandoc-latex-environment/default.nix +++ b/pkgs/development/python-modules/pandoc-latex-environment/default.nix @@ -9,7 +9,7 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pandoc-latex-environment"; version = "1.2.1.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chdemko"; repo = "pandoc-latex-environment"; - tag = version; + tag = finalAttrs.version; hash = "sha256-uyOqw8YnTljgXkwZOXTXAsnobVSV65EVicohREBNMCY="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/paperbush/default.nix b/pkgs/development/python-modules/paperbush/default.nix index 6a1fc911a5b6a..b7e7331c3495b 100644 --- a/pkgs/development/python-modules/paperbush/default.nix +++ b/pkgs/development/python-modules/paperbush/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "paperbush"; version = "0.2.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "trag1c"; repo = "paperbush"; - tag = version; + tag = finalAttrs.version; hash = "sha256-wJV+2aGK9eSw2iToiHh0I7vYAuND2pRYGhnf7CB1a+0="; }; @@ -21,9 +21,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "paperbush" ]; meta = { - changelog = "https://github.com/trag1c/paperbush/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/trag1c/paperbush/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Super concise argument parsing tool for Python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/patchpy/default.nix b/pkgs/development/python-modules/patchpy/default.nix index e66fb6169c74e..5f7a153f3041c 100644 --- a/pkgs/development/python-modules/patchpy/default.nix +++ b/pkgs/development/python-modules/patchpy/default.nix @@ -7,13 +7,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "patchpy"; version = "2.0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-q+k9vYz5crCsBjI5QH7Xz3QVpntzrIXeO456dyrzf4I="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "patchpy"; }; -} +}) diff --git a/pkgs/development/python-modules/pbar/default.nix b/pkgs/development/python-modules/pbar/default.nix index c4dc1393e63fe..4cb1afe1c3690 100644 --- a/pkgs/development/python-modules/pbar/default.nix +++ b/pkgs/development/python-modules/pbar/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pbar"; version = "2.2.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "darvil82"; repo = "PBar"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FsEjfusk8isOD52xkjndGQdVC8Vc7N3spLLWQTi3Svc="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://darvil82.github.io/PBar"; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/protoletariat/default.nix b/pkgs/development/python-modules/protoletariat/default.nix index 721f90d3c927b..034dc8a0784f5 100644 --- a/pkgs/development/python-modules/protoletariat/default.nix +++ b/pkgs/development/python-modules/protoletariat/default.nix @@ -12,7 +12,7 @@ pytestCheckHook, writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "protoletariat"; version = "3.3.10"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cpcloud"; repo = "protoletariat"; - tag = version; + tag = finalAttrs.version; hash = "sha256-oaZmgen/7WkX+nNuphrcyniL7Z/OaeqlcnbCnqR5h0w="; }; @@ -52,8 +52,8 @@ buildPythonPackage rec { meta = { description = "Python protocol buffers for the rest of us"; - changelog = "https://github.com/cpcloud/protoletariat/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/cpcloud/protoletariat/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix index fe191d948abd8..3217824701b8b 100644 --- a/pkgs/development/python-modules/pycdio/default.nix +++ b/pkgs/development/python-modules/pycdio/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycdio"; version = "2.1.1-unstable-2024-02-26"; pyproject = true; @@ -49,9 +49,9 @@ buildPythonPackage rec { meta = { homepage = "https://www.gnu.org/software/libcdio/"; - changelog = "https://github.com/rocky/pycdio/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/rocky/pycdio/blob/${finalAttrs.src.rev}/ChangeLog"; description = "Wrapper around libcdio (CD Input and Control library)"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix index 67666c4fb32dd..894eda90b2244 100644 --- a/pkgs/development/python-modules/pydy/default.nix +++ b/pkgs/development/python-modules/pydy/default.nix @@ -11,13 +11,13 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydy"; version = "0.8.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-G3iqMzy/W3ctz/c4T3LqYyTTMVbly1GMkmMLi96mzMc="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyevtk/default.nix b/pkgs/development/python-modules/pyevtk/default.nix index 1e84651b6de39..e2730ab8b54bd 100644 --- a/pkgs/development/python-modules/pyevtk/default.nix +++ b/pkgs/development/python-modules/pyevtk/default.nix @@ -8,13 +8,13 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyevtk"; version = "1.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-H2vnh2o6AFyCWIYVUdpP5+RP8aLn/yqT1txR3u39pfQ="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index 7966f6ebd742d..c3552daa7e200 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -13,13 +13,13 @@ }: let - pygments = buildPythonPackage rec { + pygments = buildPythonPackage (finalAttrs: { pname = "pygments"; version = "2.19.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Y2yyR3zsf4lSU2lwvFM7xDdDVC9wOSrgJjdGAK3VuIc="; }; @@ -47,7 +47,7 @@ let }; meta = { - changelog = "https://github.com/pygments/pygments/releases/tag/${version}"; + changelog = "https://github.com/pygments/pygments/releases/tag/${finalAttrs.version}"; homepage = "https://pygments.org/"; description = "Generic syntax highlighter"; mainProgram = "pygmentize"; @@ -57,6 +57,6 @@ let ryand56 ]; }; - }; + }); in pygments diff --git a/pkgs/development/python-modules/pymee/default.nix b/pkgs/development/python-modules/pymee/default.nix index c32db9a2ddfb6..6d356ac33a0f5 100644 --- a/pkgs/development/python-modules/pymee/default.nix +++ b/pkgs/development/python-modules/pymee/default.nix @@ -8,7 +8,7 @@ regex, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymee"; version = "2.3.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "FreshlyBrewedCode"; repo = "pymee"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VNKIA/1juhkn11nkW52htvE4daXJoySeEyevWbboUek="; }; @@ -35,8 +35,8 @@ buildPythonPackage rec { meta = { description = "Python library to interact with homee"; homepage = "https://github.com/FreshlyBrewedCode/pymee"; - changelog = "https://github.com/FreshlyBrewedCode/pymee/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/FreshlyBrewedCode/pymee/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/pymonctl/default.nix b/pkgs/development/python-modules/pymonctl/default.nix index ec4ee4fb1073a..643e56257c1ec 100644 --- a/pkgs/development/python-modules/pymonctl/default.nix +++ b/pkgs/development/python-modules/pymonctl/default.nix @@ -10,7 +10,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymonctl"; version = "0.92"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Kalmat"; repo = "PyMonCtl"; - rev = "refs/tags/v${version}"; + tag = "refs/tags/v${finalAttrs.version}"; hash = "sha256-eFB+HqYBud836VNEA8q8o1KQKA+GHwSC0YfU1KCbDXw="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ sigmanificient ]; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/development/python-modules/pyopengltk/default.nix b/pkgs/development/python-modules/pyopengltk/default.nix index b50780336e508..2382815bc2742 100644 --- a/pkgs/development/python-modules/pyopengltk/default.nix +++ b/pkgs/development/python-modules/pyopengltk/default.nix @@ -7,10 +7,9 @@ pyopengl, writers, tkinter, - pyopengltk, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyopengltk"; version = "0.0.4"; pyproject = true; @@ -35,9 +34,9 @@ buildPythonPackage rec { passthru.tests = { cube = writers.writePython3 "cube" { - libraries = [ pyopengltk ]; + libraries = [ finalAttrs.finalPackage ]; doCheck = false; - } (builtins.readFile "${src}/examples/cube.py"); + } (builtins.readFile "${finalAttrs.src}/examples/cube.py"); }; meta = { @@ -48,4 +47,4 @@ buildPythonPackage rec { # not supported yet, see: https://github.com/jonwright/pyopengltk/issues/12 broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index bdda80f446b60..ffa787e2043d9 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -10,14 +10,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-mypy"; version = "1.0.1"; pyproject = true; src = fetchPypi { pname = "pytest_mypy"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-P1/K/3XIDczGtoz17MKOG75x6VMJRp63oov0CM5VwHQ="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/pywinbox/default.nix b/pkgs/development/python-modules/pywinbox/default.nix index 29d87942bd176..a6dfccf327c1c 100644 --- a/pkgs/development/python-modules/pywinbox/default.nix +++ b/pkgs/development/python-modules/pywinbox/default.nix @@ -12,7 +12,7 @@ pyobjc-framework-Cocoa, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pywinbox"; version = "0.7"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Kalmat"; repo = "PyWinBox"; - rev = "refs/tags/v${version}"; + tag = "refs/tags/v${finalAttrs.version}"; hash = "sha256-Z/gedrIFNpQvzRWqGxMEl5MoEIo9znZz/FZLMVl0Eb4="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { description = "Cross-Platform and multi-monitor toolkit to handle rectangular areas and windows box"; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/pywinctl/default.nix b/pkgs/development/python-modules/pywinctl/default.nix index fa3bc56b0f591..7fd8b154652fe 100644 --- a/pkgs/development/python-modules/pywinctl/default.nix +++ b/pkgs/development/python-modules/pywinctl/default.nix @@ -10,7 +10,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.4.01"; pname = "pywinctl"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Kalmat"; repo = "pywinctl"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-l9wUnEjOpKrjulruUX+AqQIjduDfX+iMmSv/V32jpdc="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { description = "Cross-Platform module to get info on and control windows on screen"; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/qtile-bonsai/default.nix b/pkgs/development/python-modules/qtile-bonsai/default.nix index f632fcceaae35..8c2310f0530e8 100644 --- a/pkgs/development/python-modules/qtile-bonsai/default.nix +++ b/pkgs/development/python-modules/qtile-bonsai/default.nix @@ -12,7 +12,7 @@ pytestCheckHook, qtile, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qtile-bonsai"; version = "0.6.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aravinda0"; repo = "qtile-bonsai"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JCElI4Ymr99p9dj++N9lyTFNmikntBwwImYREXFsUo0="; }; @@ -60,7 +60,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "qtile_bonsai" ]; meta = { - changelog = "https://github.com/aravinda0/qtile-bonsai/releases/tag/${version}"; + changelog = "https://github.com/aravinda0/qtile-bonsai/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/aravinda0/qtile-bonsai"; description = "Flexible layout for the qtile tiling window manager"; license = lib.licenses.mit; @@ -69,4 +69,4 @@ buildPythonPackage rec { sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 9862cf8a41458..4ceebac894e43 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -36,7 +36,7 @@ extraPackages ? [ ], }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qtile"; version = "0.34.1"; pyproject = true; @@ -44,7 +44,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PPyI+IGvHBQusVmU3D26VjYjLaa9+94KUqNwbQSzeaI="; }; @@ -142,4 +142,4 @@ buildPythonPackage rec { doronbehar ]; }; -} +}) diff --git a/pkgs/development/python-modules/quart-schema/default.nix b/pkgs/development/python-modules/quart-schema/default.nix index b81d59f41a793..cdd5bf8c26623 100644 --- a/pkgs/development/python-modules/quart-schema/default.nix +++ b/pkgs/development/python-modules/quart-schema/default.nix @@ -13,7 +13,7 @@ hypothesis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "quart-schema"; version = "0.22.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pgjones"; repo = "quart-schema"; - tag = version; + tag = finalAttrs.version; hash = "sha256-saKV8iasc9ZynmUQI4bAYS9h8nGXgXR0Vm5oIDHedB4="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/raylib-python-cffi/default.nix b/pkgs/development/python-modules/raylib-python-cffi/default.nix index c7d49044215c9..3f4160960c297 100644 --- a/pkgs/development/python-modules/raylib-python-cffi/default.nix +++ b/pkgs/development/python-modules/raylib-python-cffi/default.nix @@ -12,10 +12,9 @@ raygui, lib, writers, - raylib-python-cffi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "raylib-python-cffi"; version = "5.5.0.4"; pyproject = true; @@ -23,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "electronstudio"; repo = "raylib-python-cffi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MKyTpGnup4QmRui2OVBpnyn9KENATWcwYcikOmYX4c8="; }; @@ -51,7 +50,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyray" ]; passthru.tests = import ./passthru-tests.nix { - inherit src raylib-python-cffi writers; + inherit writers; + raylib-python-cffi = finalAttrs.finalPackage; }; meta = { @@ -60,4 +60,4 @@ buildPythonPackage rec { license = lib.licenses.epl20; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/rich-theme-manager/default.nix b/pkgs/development/python-modules/rich-theme-manager/default.nix index b296713afb191..72a587793d71e 100644 --- a/pkgs/development/python-modules/rich-theme-manager/default.nix +++ b/pkgs/development/python-modules/rich-theme-manager/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rich-theme-manager"; version = "0.11.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RhetTbull"; repo = "rich_theme_manager"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nSNG+lWOPmh66I9EmPvWqbeceY/cu+zBpgVlDTNuHc0="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/RhetTbull/rich_theme_manager"; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/samarium/default.nix b/pkgs/development/python-modules/samarium/default.nix index b175dc29708c6..e75224ada3b30 100644 --- a/pkgs/development/python-modules/samarium/default.nix +++ b/pkgs/development/python-modules/samarium/default.nix @@ -7,7 +7,7 @@ dahlia, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "samarium"; version = "0.6.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "samarium-lang"; repo = "samarium"; - tag = version; + tag = finalAttrs.version; hash = "sha256-sOkJ67B8LaIA2cwCHaFnc16lMG8uaegBJCzF6Li77vk="; }; @@ -26,10 +26,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/samarium-lang/samarium/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/samarium-lang/samarium/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Samarium Programming Language"; license = lib.licenses.mit; homepage = "https://samarium-lang.github.io/Samarium"; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/shiny/default.nix b/pkgs/development/python-modules/shiny/default.nix index 212febd293b82..8e8d3a6765745 100644 --- a/pkgs/development/python-modules/shiny/default.nix +++ b/pkgs/development/python-modules/shiny/default.nix @@ -46,7 +46,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "shiny"; version = "1.5.0"; pyproject = true; @@ -54,7 +54,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "posit-dev"; repo = "py-shiny"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zRKfSY0rE+jzwYUcrRTIFW3OVmavhMDbAQEpry46zCI="; }; @@ -110,7 +110,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; pytestFlags = [ # ERROR: 'fixture' is not a valid asyncio_default_fixture_loop_scope. @@ -134,8 +134,8 @@ buildPythonPackage rec { meta = { description = "Build fast, beautiful web applications in Python"; homepage = "https://shiny.posit.co/py"; - changelog = "https://github.com/posit-dev/py-shiny/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/posit-dev/py-shiny/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/sigparse/default.nix b/pkgs/development/python-modules/sigparse/default.nix index 26c6e1f438dc3..b28237b12fa14 100644 --- a/pkgs/development/python-modules/sigparse/default.nix +++ b/pkgs/development/python-modules/sigparse/default.nix @@ -7,7 +7,7 @@ fetchpatch, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sigparse"; version = "3.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Lunarmagpie"; repo = "sigparse"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VzWDqplYgwrJXXd5IUzEIp0YRuofybqmGrNKPaGqQFM="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Lunarmagpie/sigparse"; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix b/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix index 066abf2449996..4b90a3c913a02 100644 --- a/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix +++ b/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix @@ -10,7 +10,7 @@ sphinx-pytest, pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-last-updated-by-git"; version = "0.3.8"; pyproject = true; @@ -55,10 +55,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/mgeier/sphinx-last-updated-by-git/blob/${version}/NEWS.rst"; + changelog = "https://github.com/mgeier/sphinx-last-updated-by-git/blob/${finalAttrs.version}/NEWS.rst"; description = "Get the last updated time for each Sphinx page from Git"; homepage = "https://github.com/mgeier/sphinx-last-updated-by-git"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/sphinxawesome-theme/default.nix b/pkgs/development/python-modules/sphinxawesome-theme/default.nix index 3ae9e424c57da..ee63498b59559 100644 --- a/pkgs/development/python-modules/sphinxawesome-theme/default.nix +++ b/pkgs/development/python-modules/sphinxawesome-theme/default.nix @@ -7,13 +7,13 @@ beautifulsoup4, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxawesome-theme"; version = "5.3.2"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "sphinxawesome_theme"; hash = "sha256-BinTi4Cu/CebEYbFOnpvryHnIbWy7NoU9IjKEHTiYx8="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/strpdatetime/default.nix b/pkgs/development/python-modules/strpdatetime/default.nix index 39322938e73f6..e41f18c130114 100644 --- a/pkgs/development/python-modules/strpdatetime/default.nix +++ b/pkgs/development/python-modules/strpdatetime/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "strpdatetime"; version = "0.4.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RhetTbull"; repo = "strpdatetime"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-p/iLq+x+dRW2QPva/VEA9emtxb0k3hnL91l1itTsYSc="; }; @@ -32,8 +32,8 @@ buildPythonPackage rec { meta = { description = "Parse strings into Python datetime objects"; license = lib.licenses.psfl; - changelog = "https://github.com/RhetTbull/strpdatetime/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/RhetTbull/strpdatetime/blob/${finalAttrs.src.tag}/CHANGELOG.md"; homepage = "https://github.com/RhetTbull/strpdatetime"; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index 8306a1a96a8fc..f7e5ea7382bd9 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -10,13 +10,13 @@ isPyPy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sure"; version = "2.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yPxvq8Dn9phO6ruUJUDkVkblvvC7mf5Z4C2mNOTUuco="; }; @@ -54,8 +54,8 @@ buildPythonPackage rec { description = "Utility belt for automated testing"; mainProgram = "sure"; homepage = "https://sure.readthedocs.io/"; - changelog = "https://github.com/gabrielfalcao/sure/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/gabrielfalcao/sure/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/tinytag/default.nix b/pkgs/development/python-modules/tinytag/default.nix index 22e4aa6e89a21..99d192d8dfb27 100644 --- a/pkgs/development/python-modules/tinytag/default.nix +++ b/pkgs/development/python-modules/tinytag/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tinytag"; version = "2.2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tinytag"; repo = "tinytag"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rvfObqAFcJwNpp9cUZv6QjffykajVR+Re1WUSdXkAvo="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/utitools/default.nix b/pkgs/development/python-modules/utitools/default.nix index 063a86a51c763..0a1b48894f289 100644 --- a/pkgs/development/python-modules/utitools/default.nix +++ b/pkgs/development/python-modules/utitools/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "utitools"; version = "0.4.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RhetTbull"; repo = "utitools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oI+a+sc9+qi7aFP0dLINAQekib/9pZm10A5jhVIHWvo="; }; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Utilities for working with Uniform Type Identifiers"; homepage = "https://github.com/RhetTbull/utitools"; - changelog = "https://github.com/RhetTbull/osxphotos/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/RhetTbull/osxphotos/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/wsme/default.nix b/pkgs/development/python-modules/wsme/default.nix index dff49eba099b9..160779366f00e 100644 --- a/pkgs/development/python-modules/wsme/default.nix +++ b/pkgs/development/python-modules/wsme/default.nix @@ -17,14 +17,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wsme"; version = "0.12.1"; pyproject = true; src = fetchPypi { pname = "WSME"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-m36yJErzxwSskUte0iGVS7aK3QqLKy84okSwZ7M3mS0="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +}) diff --git a/pkgs/development/python-modules/yaxmldiff/default.nix b/pkgs/development/python-modules/yaxmldiff/default.nix index f018e37851891..5ffae301df62d 100644 --- a/pkgs/development/python-modules/yaxmldiff/default.nix +++ b/pkgs/development/python-modules/yaxmldiff/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yaxmldiff"; version = "0.2.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "latk"; repo = "yaxmldiff.py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AOXnK1d+b/ae50ofBfgxiDS6Dj6TIeHMrE9ME95Yj1Q="; }; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Yet Another XML Differ"; homepage = "https://github.com/latk/yaxmldiff.py"; - changelog = "https://https://github.com/latk/yaxmldiff.py/blob/v${src.tag}/CHANGELOG.md"; + changelog = "https://https://github.com/latk/yaxmldiff.py/blob/v${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ sigmanificient ]; }; -} +})