commit 29c9abb3578093e57c60049554b727fd2176d617 parent 1d188b6e60801799332c2ded80b9689f418a3961 Author: Nikolay Korotkiy <sikmir@disroot.org> Date: Fri, 16 Jan 2026 01:35:28 +0400 Up Diffstat:
95 files changed, 294 insertions(+), 303 deletions(-)
diff --git a/flake.lock b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1768395095, + "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5", "type": "github" }, "original": { diff --git a/pkgs/by-name/ag/agunua/package.nix b/pkgs/by-name/ag/agunua/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "agunua"; version = "1.7.2"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { domain = "framagit.org"; owner = "bortzmeyer"; repo = "agunua"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-a/2906Hyr5rropuwxZQk1vXU0Ilaw1cPZjJlOdoJhsk="; }; @@ -39,4 +39,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/am/amqtt/package.nix b/pkgs/by-name/am/amqtt/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "amqtt"; version = "0.11.1"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "Yakifo"; repo = "amqtt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-l/YbfrjJsBA5a/IHH2p/B3irZF/z2xzNYxXOMOieV04="; }; @@ -57,4 +57,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ap/apibackuper/package.nix b/pkgs/by-name/ap/apibackuper/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "apibackuper"; version = "1.0.6"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "ruarxive"; repo = "apibackuper"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2vNuzQK6Wm6DBWRSLFuy6loCLAbcql3CqSktMjGE8JE="; }; @@ -34,4 +34,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ar/arcgis2geojson/package.nix b/pkgs/by-name/ar/arcgis2geojson/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "arcgis2geojson"; version = "3.0.2"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "chris48s"; repo = "arcgis2geojson"; - tag = version; + tag = finalAttrs.version; hash = "sha256-w3teY/CLNGF3h+8R6KoYCvjat8q6ellet1awEPOXpac="; }; @@ -30,4 +30,4 @@ python3Packages.buildPythonApplication rec { maintainers = [ lib.maintainers.sikmir ]; broken = true; }; -} +}) diff --git a/pkgs/by-name/c2/c2cwsgiutils/package.nix b/pkgs/by-name/c2/c2cwsgiutils/package.nix @@ -5,7 +5,7 @@ pipfile, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "c2cwsgiutils"; version = "5.1.5"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "camptocamp"; repo = "c2cwsgiutils"; - tag = version; + tag = finalAttrs.version; hash = "sha256-lPE21SLMgfnNu0qiM3e2qz6zJJ7u5YaNkqOSNTF1FVg="; }; @@ -37,4 +37,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ci/city2graph/package.nix b/pkgs/by-name/ci/city2graph/package.nix @@ -6,7 +6,7 @@ overturemaps, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "city2graph"; version = "0.1.6"; pyproject = true; @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "c2g-dev"; repo = "city2graph"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wjce9I1HBQklQUwVObhlPmXGOZeX1Jm+kGKC9dm4oEw="; }; @@ -45,4 +45,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/cm/cmocean/package.nix b/pkgs/by-name/cm/cmocean/package.nix @@ -5,7 +5,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "cmocean"; version = "4.0.3"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "matplotlib"; repo = "cmocean"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Vi+tK2cAwqkoe2CEFCYEqMp28IgeH1MSJ+u3t6D8Zu8="; }; @@ -34,4 +34,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/co/cogeo-mosaic/package.nix b/pkgs/by-name/co/cogeo-mosaic/package.nix @@ -5,7 +5,7 @@ supermorecado, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "cogeo-mosaic"; version = "8.2.0"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "developmentseed"; repo = "cogeo-mosaic"; - tag = version; + tag = finalAttrs.version; hash = "sha256-g5ZRdqs/nY1i2xB8UsJjKwdb0BhlR1Bfj4FSPBRJrss="; }; @@ -50,4 +50,4 @@ python3Packages.buildPythonPackage rec { maintainers = [ lib.maintainers.sikmir ]; inherit (python3Packages.rio-tiler.meta) broken; }; -} +}) diff --git a/pkgs/by-name/el/elevation/package.nix b/pkgs/by-name/el/elevation/package.nix @@ -9,10 +9,9 @@ gzip, gdal, testers, - elevation, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "elevation"; version = "1.1.3"; pyproject = true; @@ -20,13 +19,13 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "bopen"; repo = "elevation"; - tag = version; + tag = finalAttrs.version; hash = "sha256-sZStJgToQtWYrBH1BjqxCUwQUT5dcAlyZwnb4aYga+4="; }; build-system = with python3Packages; [ setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; dependencies = with python3Packages; [ fasteners @@ -61,7 +60,7 @@ python3Packages.buildPythonApplication rec { install -Dm644 elevation/datasource.mk -t $out/lib/${python3Packages.python.libPrefix}/site-packages/elevation ''; - passthru.tests.version = testers.testVersion { package = elevation; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { description = "Python script to download global terrain digital elevation models, SRTM 30m DEM and SRTM 90m DEM"; @@ -70,4 +69,4 @@ python3Packages.buildPythonApplication rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "eio"; }; -} +}) diff --git a/pkgs/by-name/fi/fitdecode/package.nix b/pkgs/by-name/fi/fitdecode/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "fitdecode"; version = "0.10.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "polyvertex"; repo = "fitdecode"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pW1PgJGqFL2reOYYfpGnQ4WoYFKGMNY8iQJzyHYOly8="; }; @@ -28,4 +28,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ga/garmin-uploader/package.nix b/pkgs/by-name/ga/garmin-uploader/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "garmin-uploader"; version = "1.0.9"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "La0"; repo = "garmin-uploader"; - tag = version; + tag = finalAttrs.version; hash = "sha256-OHY4f+0jfxKXiwRJRdSarlb2H+lEt2EVoAAsD4aEc9o="; }; @@ -33,4 +33,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/gc/gcgn-converter/package.nix b/pkgs/by-name/gc/gcgn-converter/package.nix @@ -5,7 +5,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "gcgn-converter"; version = "08.07.2023"; format = "other"; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "Miroff"; repo = "gcgn-converter"; - tag = version; + tag = finalAttrs.version; hash = "sha256-1ipBRQNMGb0wBAHxlJWoQEcaegR3wrlAw9YXUF4fkH8="; }; @@ -47,4 +47,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.free; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ge/geojson-pydantic/package.nix b/pkgs/by-name/ge/geojson-pydantic/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "geojson-pydantic"; version = "2.0.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "developmentseed"; repo = "geojson-pydantic"; - tag = version; + tag = finalAttrs.version; hash = "sha256-SOo4Hs1WMUerMLMgjzUVuDkUXCuiStJ4P9iMSpUF8Uw="; }; @@ -33,4 +33,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ge/geoutils/package.nix b/pkgs/by-name/ge/geoutils/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "geoutils"; version = "0.1.17"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "GlacioHack"; repo = "geoutils"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EfDqr0nKRCoypi7cX3B1Smiw4IaWqQf0v/CpTAFQpzw="; }; @@ -45,4 +45,4 @@ python3Packages.buildPythonPackage rec { maintainers = [ lib.maintainers.sikmir ]; broken = true; }; -} +}) diff --git a/pkgs/by-name/gp/gpx-player/package.nix b/pkgs/by-name/gp/gpx-player/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "gpx-player"; version = "0.1.2"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "kirienko"; repo = "gpx-player"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vLY+uQvIT9WpbtU1lxRzEx/taxi3q6y7AITr+NJ1nW0="; }; @@ -37,4 +37,4 @@ python3Packages.buildPythonApplication rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "gpx-player"; }; -} +}) diff --git a/pkgs/by-name/gp/gpxtrackposter/package.nix b/pkgs/by-name/gp/gpxtrackposter/package.nix @@ -52,7 +52,7 @@ python312Packages.buildPythonApplication { svgwrite stravalib polyline - (timezonefinder.overridePythonAttrs { pythonRelaxDeps = true; }) + timezonefinder setuptools ]; diff --git a/pkgs/by-name/gt/gt4gd/package.nix b/pkgs/by-name/gt/gt4gd/package.nix @@ -5,7 +5,7 @@ withUI ? true, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "gt4gd"; version = "1.3.9"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "xinebf"; repo = "google-translate-for-goldendict"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zJq5dhmrd0k7bsw75xFECKmwZU4qjw+wwSzsYjg8zao="; }; @@ -34,4 +34,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/hu/huami-token/package.nix b/pkgs/by-name/hu/huami-token/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "huami-token"; version = "0.7.0"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { domain = "codeberg.org"; owner = "argrento"; repo = "huami-token"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nQiz1vrZz0sOoZFQaN9ZtzfDY3zn3Gk0jMdqORDDW3w="; }; @@ -33,4 +33,4 @@ python3Packages.buildPythonApplication rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "huami_token"; }; -} +}) diff --git a/pkgs/by-name/lo/localtileserver/package.nix b/pkgs/by-name/lo/localtileserver/package.nix @@ -6,7 +6,7 @@ server-thread, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "localtileserver"; version = "0.10.6"; pyproject = true; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "banesullivan"; repo = "localtileserver"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-09POlT+3gWGoP/tKRur9OaFsfQvC4OwSHE+ssqSQi1Q="; }; @@ -61,4 +61,4 @@ python3Packages.buildPythonApplication rec { maintainers = [ lib.maintainers.sikmir ]; inherit (python3Packages.rio-tiler.meta) broken; }; -} +}) diff --git a/pkgs/by-name/ls/lsdreader/package.nix b/pkgs/by-name/ls/lsdreader/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "lsdreader"; version = "0.2.15"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "sv99"; repo = "lsdreader"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8DYPFUmhgA4mxaliPjbPkywyJUwrl3J034scmFGE9no="; }; @@ -26,4 +26,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ma/map-machine/package.nix b/pkgs/by-name/ma/map-machine/package.nix @@ -5,16 +5,15 @@ portolan, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "map-machine"; version = "0.2.0"; pyproject = true; - disabled = python3Packages.pythonOlder "3.9"; src = fetchFromGitHub { owner = "enzet"; repo = "map-machine"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QDCbT4n8M2eJkv2uFyr9aDs16UzFG+oH/qMwpf08bfI="; }; @@ -46,4 +45,4 @@ python3Packages.buildPythonApplication rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "map-machine"; }; -} +}) diff --git a/pkgs/by-name/ma/maproulette-python-client/package.nix b/pkgs/by-name/ma/maproulette-python-client/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "maproulette-python-client"; version = "1.8.1"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "osmlab"; repo = "maproulette-python-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EmYa2B1FO4PNE1pdoPXeKo8uoY7Tc1cRwkqxiD41WrQ="; }; @@ -35,4 +35,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/mi/mikatools/package.nix b/pkgs/by-name/mi/mikatools/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "mikatools"; version = "1.0.1"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "mikahama"; repo = "mikatools"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2YpRTSZWJVXMoTLDBFS+tFkmA8pOBsqWF7Z85gtIfY0="; }; @@ -32,4 +32,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/mi/mitzasql/package.nix b/pkgs/by-name/mi/mitzasql/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "mitzasql"; version = "1.4.4"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "vladbalmos"; repo = "mitzasql"; - tag = version; + tag = finalAttrs.version; hash = "sha256-C/KecK8PJDn/MyUxtxFLjVnkra6pW9QoLY34FWkwQ+8="; }; @@ -35,4 +35,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/mq/mqtt-logger/package.nix b/pkgs/by-name/mq/mqtt-logger/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "mqtt-logger"; version = "0.3.6"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "Blake-Haydon"; repo = "mqtt-logger"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AG8L2CD+YN6gWswDtsUtUMOA3xC2ro1f1YKYgc4jwXE="; }; @@ -37,4 +37,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/mq/mqtt-to-influxdb-forwarder/package.nix b/pkgs/by-name/mq/mqtt-to-influxdb-forwarder/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "mqtt-to-influxdb-forwarder"; version = "2.1.0"; format = "other"; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mhaas"; repo = "mqtt-to-influxdb-forwarder"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2n5YF5aLaUzHmxgPhnRXXyhoXV0nJ21aa7g+NBTYvBk="; }; @@ -38,4 +38,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/mq/mqttwarn/package.nix b/pkgs/by-name/mq/mqttwarn/package.nix @@ -9,7 +9,7 @@ let python3Packages = python312Packages; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "mqttwarn"; version = "0.35.0"; pyproject = true; @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mqtt-tools"; repo = "mqttwarn"; - tag = version; + tag = finalAttrs.version; hash = if stdenv.hostPlatform.isDarwin then "sha256-jdQNCmfGs1k52VKzcF132mmUSWkcdcsjx+AHxM+MRdw=" @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { patches = [ (replaceVars ./version.patch { - inherit version; + inherit (finalAttrs) version; }) ]; @@ -65,7 +65,7 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ python3Packages.pytestCheckHook ] - ++ lib.flatten (lib.attrValues optional-dependencies); + ++ lib.flatten (lib.attrValues finalAttrs.passthru.optional-dependencies); meta = { description = "A highly configurable MQTT message router, where the routing targets are notification plugins"; @@ -74,4 +74,4 @@ python3Packages.buildPythonApplication rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "mqttwarn"; }; -} +}) diff --git a/pkgs/by-name/my/mysql-to-sqlite3/package.nix b/pkgs/by-name/my/mysql-to-sqlite3/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "mysql-to-sqlite3"; version = "2.1.9"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "techouse"; repo = "mysql-to-sqlite3"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nS+BWVemB1XYe37+Cl8q8ZhXBcZDBw5ApOapns7hXKg="; }; @@ -37,4 +37,4 @@ python3Packages.buildPythonApplication rec { mainProgram = "mysql2sqlite"; broken = true; # required mysql-connector-python>=8.2.0 }; -} +}) diff --git a/pkgs/by-name/os/osmviz/package.nix b/pkgs/by-name/os/osmviz/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "osmviz"; version = "4.4.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "hugovk"; repo = "osmviz"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rEbCMF5G4C/xJTEqO0XwV+VfoL63alh5IzjOdQ34NzU="; }; @@ -50,4 +50,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ov/overpassforge/package.nix b/pkgs/by-name/ov/overpassforge/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "overpassforge"; version = "0.4.3"; pyproject = true; @@ -12,13 +12,13 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "Krafpy"; repo = "Overpass-Forge"; - tag = version; + tag = finalAttrs.version; hash = "sha256-HtP1aSIf6iOyZDhDF/kDps1hMgKHKOAlPjYwOQSeXjE="; }; build-system = with python3Packages; [ setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; @@ -30,4 +30,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ph/phyghtmap/package.nix b/pkgs/by-name/ph/phyghtmap/package.nix @@ -6,13 +6,13 @@ installShellFiles, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "phyghtmap"; version = "2.23"; pyproject = true; src = fetchurl { - url = "http://katze.tfiu.de/projects/phyghtmap/phyghtmap_${version}.orig.tar.gz"; + url = "http://katze.tfiu.de/projects/phyghtmap/phyghtmap_${finalAttrs.version}.orig.tar.gz"; hash = "sha256-jA6uc/HVdrDQF3NX0Cbu4wMl4SSd7cA/VOvtRRzDsBM="; }; @@ -39,4 +39,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/pi/pipfile/package.nix b/pkgs/by-name/pi/pipfile/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pipfile"; version = "0.0.2"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "pypa"; repo = "pipfile"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GsDhxnvBvjJGQWk25cS9+HqLQ9YVSxujeX2iGivYl6Q="; }; @@ -32,4 +32,4 @@ python3Packages.buildPythonPackage rec { ]; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "pmtiles"; version = "3.3"; pyproject = true; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-VKI09aEdZdGJosDBe9PGQEDdIaDk8xq6EToiUc1XmOQ="; }; - sourceRoot = "${src.name}/python"; + sourceRoot = "${finalAttrs.src.name}/python"; build-system = with python3Packages; [ setuptools ]; @@ -26,4 +26,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/pn/pnoise/package.nix b/pkgs/by-name/pn/pnoise/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "pnoise"; version = "0.2.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "plottertools"; repo = "pnoise"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JwWzLvgCNSLRs/ToZNFH6fN6VLEsQTmsgxxkugwjA9k="; }; @@ -28,4 +28,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.lgpl2Plus; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/pr/prettymapp/package.nix b/pkgs/by-name/pr/prettymapp/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "prettymapp"; version = "0.6.0"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "chrieke"; repo = "prettymapp"; - tag = version; + tag = finalAttrs.version; hash = "sha256-i7pklXV8mL1wEYBiCGpHbP6X779KXvwNzZ4/GY1/aMA="; }; @@ -41,4 +41,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/px/px/package.nix b/pkgs/by-name/px/px/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "px"; version = "3.8.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "walles"; repo = "px"; - tag = version; + tag = finalAttrs.version; hash = "sha256-cCTaDs/BYmL6Ql3kAzCk169M7JqenXeLhwsG1ErE2DI="; }; @@ -24,4 +24,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/py/py-staticmaps/package.nix b/pkgs/by-name/py/py-staticmaps/package.nix @@ -5,7 +5,7 @@ s2sphere, }: -python312Packages.buildPythonApplication rec { +python312Packages.buildPythonApplication (finalAttrs: { pname = "py-staticmaps"; version = "0.5.0"; pyproject = true; @@ -13,7 +13,7 @@ python312Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "flopp"; repo = "py-staticmaps"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TWLPCM1tsWiRCLDhowC/uQrDUujNO3FuDgnUQXMcTm0="; }; @@ -43,4 +43,4 @@ python312Packages.buildPythonApplication rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/py/pygnssutils/package.nix b/pkgs/by-name/py/pygnssutils/package.nix @@ -9,7 +9,7 @@ pyubxutils, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pygnssutils"; version = "1.1.21"; pyproject = true; @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "semuconsulting"; repo = "pygnssutils"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6bbmVYOc+yul8KBzkj3+nR1Tcd5EPMFDF3Ysm6GfIIk="; }; @@ -42,4 +42,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/py/pygpsclient/package.nix b/pkgs/by-name/py/pygpsclient/package.nix @@ -5,7 +5,7 @@ pygnssutils, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "pygpsclient"; version = "1.5.23"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "semuconsulting"; repo = "PyGPSClient"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wIZoxcQ+DKiVYHBL3/JeIPNLpDrKw7ZjH6OqVqeWyA4="; }; @@ -33,4 +33,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/py/pyqgc/package.nix b/pkgs/by-name/py/pyqgc/package.nix @@ -5,7 +5,7 @@ pyrtcm, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pyqgc"; version = "0.1.2"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "semuconsulting"; repo = "pyqgc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-n8D5dYbpygaVr397MdT6qeAl2bL61rvw0kpZ/Z5PohU="; }; @@ -32,4 +32,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/py/pyrosm/package.nix b/pkgs/by-name/py/pyrosm/package.nix @@ -7,7 +7,7 @@ pyrobuf, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pyrosm"; version = "0.6.2"; pyproject = true; @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "HTenkanen"; repo = "pyrosm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eX6lOkprU/RkSz2+dGlRtdQQsI+m9GZyN/VfcIix79k="; }; @@ -48,4 +48,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/py/pyrtcm/package.nix b/pkgs/by-name/py/pyrtcm/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pyrtcm"; version = "1.1.10"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "semuconsulting"; repo = "pyrtcm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NZmzIMOS3BLkSC1hf2tV770qPpgBQ8uS/VvVh+e5AAs="; }; @@ -28,4 +28,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/py/pysbf2/package.nix b/pkgs/by-name/py/pysbf2/package.nix @@ -5,7 +5,7 @@ pyrtcm, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pysbf2"; version = "1.0.3"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "semuconsulting"; repo = "pysbf2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0GBk7MytxkwCM9WNWk+bJo4JlwUgC5Xwex+zZNR6Hqo="; }; @@ -32,4 +32,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/py/pysheds/package.nix b/pkgs/by-name/py/pysheds/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pysheds"; version = "0.5"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "mdbartos"; repo = "pysheds"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tWAPJ+uQdmiBl+dfV4FoVFCcozWk3xnoV+CD9Z4pMgI="; }; @@ -41,4 +41,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.gpl3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/py/pyspartn/package.nix b/pkgs/by-name/py/pyspartn/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pyspartn"; version = "1.0.8"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "semuconsulting"; repo = "pyspartn"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CCj7hoY3zNVdKUeMryXoqe1SbNd1BMQQCHc3Rvn7zPg="; }; @@ -28,4 +28,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/py/pytest-mqtt/package.nix b/pkgs/by-name/py/pytest-mqtt/package.nix @@ -5,16 +5,15 @@ pytest-docker-fixtures, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pytest-mqtt"; version = "0.4.1"; pyproject = true; - disabled = python3Packages.pythonOlder "3.7"; src = fetchFromGitHub { owner = "mqtt-tools"; repo = "pytest-mqtt"; - tag = version; + tag = finalAttrs.version; hash = "sha256-DohQw10WCDlb9kJdMd9ql4mcELx4IhVSmoovLI6GI9k="; }; @@ -31,4 +30,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/py/pytorchtext/package.nix b/pkgs/by-name/py/pytorchtext/package.nix @@ -9,7 +9,7 @@ revtok, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pytorchtext"; version = "0.18.0"; pyproject = true; @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "pytorch"; repo = "text"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ok91rw/76ivtTTd3DkdDG7N2aZE5WqPuZE4YbbQ0pYU="; fetchSubmodules = true; }; @@ -64,4 +64,4 @@ python3Packages.buildPythonPackage rec { maintainers = [ lib.maintainers.sikmir ]; broken = true; # error: implicit instantiation of undefined template 'std::char_traits' }; -} +}) diff --git a/pkgs/by-name/py/pyubx2/package.nix b/pkgs/by-name/py/pyubx2/package.nix @@ -5,7 +5,7 @@ pyrtcm, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pyubx2"; version = "1.2.59"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "semuconsulting"; repo = "pyubx2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ay1fqgC5uAzxW8QH7bInsWaGAPD6VtKeVWmVJgBQcwA="; }; @@ -34,4 +34,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/py/pyubxutils/package.nix b/pkgs/by-name/py/pyubxutils/package.nix @@ -5,7 +5,7 @@ pyubx2, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pyubxutils"; version = "1.0.5"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "semuconsulting"; repo = "pyubxutils"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-k6/7BKzDVQNvjS0JNVJnj7ALHPcq6VwklxpxLhJ/e3M="; }; @@ -32,4 +32,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/qu/qute-gemini/package.nix b/pkgs/by-name/qu/qute-gemini/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "qute-gemini"; version = "1.0.0"; format = "other"; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromSourcehut { owner = "~sotirisp"; repo = "qute-gemini"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-0e0DvnhPtdtA2ZSGTaWuMNgVlP6fA1P0cuze7AFG3bM="; }; @@ -29,4 +29,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ri/rio-cogeo/package.nix b/pkgs/by-name/ri/rio-cogeo/package.nix @@ -5,7 +5,7 @@ cogdumper, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "rio-cogeo"; version = "5.4.1"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "cogeotiff"; repo = "rio-cogeo"; - tag = version; + tag = finalAttrs.version; hash = "sha256-BMIUC5h2E9hTeLXGYvkkFuh6DsYVwQHSWAtJZvqVhV8="; }; @@ -42,4 +42,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ri/rio-color/package.nix b/pkgs/by-name/ri/rio-color/package.nix @@ -5,7 +5,7 @@ rio-mucho, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "rio-color"; version = "2.0.1"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "mapbox"; repo = "rio-color"; - tag = version; + tag = finalAttrs.version; hash = "sha256-iJ+whIk3ANop8i712dLE0mJyDMHGnE0tic23H6f67Xg="; }; @@ -47,4 +47,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ri/rio-mbtiles/package.nix b/pkgs/by-name/ri/rio-mbtiles/package.nix @@ -5,7 +5,7 @@ supermercado, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "rio-mbtiles"; version = "1.6.0"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mapbox"; repo = "rio-mbtiles"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Kje443Qqs8+Jcv3PnTrMncaoaGDdjrzTcd42NYIenuU="; }; @@ -44,4 +44,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ri/rio-mucho/package.nix b/pkgs/by-name/ri/rio-mucho/package.nix @@ -5,7 +5,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "rio-mucho"; version = "1.0.0"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "mapbox"; repo = "rio-mucho"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yr79Lb02vxp2CN+638S8CFxbtim+zrkjxhjwEkx0XsY="; }; @@ -33,4 +33,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ri/rio-stac/package.nix b/pkgs/by-name/ri/rio-stac/package.nix @@ -5,7 +5,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "rio-stac"; version = "0.11.0"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "developmentseed"; repo = "rio-stac"; - tag = version; + tag = finalAttrs.version; hash = "sha256-3MAqBhekkjJOQnE1B7GxZiFcjkbhhsON01ciKPvGa4g="; }; @@ -37,4 +37,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ri/riverrem/package.nix b/pkgs/by-name/ri/riverrem/package.nix @@ -5,7 +5,7 @@ cmocean, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "riverrem"; version = "1.1.2"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "OpenTopography"; repo = "RiverREM"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/HutRO6GBrTAE4KNGU+JrFQpfP+Bf+FjdHVaucEkKe0="; }; @@ -37,4 +37,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.gpl3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/rs/rst2txt/package.nix b/pkgs/by-name/rs/rst2txt/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "rst2txt"; version = "1.1.0"; pyproject = true; @@ -12,13 +12,13 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "stephenfin"; repo = "rst2txt"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UqY+qD1S8tyRxvQ0GIzfBlHzsdVSaEJkmgw1WC0H/KA="; }; build-system = with python3Packages; [ setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; dependencies = with python3Packages; [ docutils @@ -34,4 +34,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/se/server-thread/package.nix b/pkgs/by-name/se/server-thread/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "server-thread"; version = "0.3.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "banesullivan"; repo = "server-thread"; - tag = version; + tag = finalAttrs.version; hash = "sha256-1a2XFPyf3FacMx3WU1hPeiqGP4dAUGlQxsXAUz81muo="; }; @@ -41,4 +41,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/sm/smopy/package.nix b/pkgs/by-name/sm/smopy/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "smopy"; version = "0.0.7"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "rossant"; repo = "smopy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ds3BQryv9uwJYfpqbFOT7Cxm2HkHhfVqvu8eeyaAET0="; }; @@ -33,4 +33,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/st/starlette-cramjam/package.nix b/pkgs/by-name/st/starlette-cramjam/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "starlette-cramjam"; version = "0.5.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "developmentseed"; repo = "starlette-cramjam"; - tag = version; + tag = finalAttrs.version; hash = "sha256-D4kYEXL4WTle3HnWwzub/AWwMm9xDIYdAVgpPmkJmns="; }; @@ -36,4 +36,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/su/supermercado/package.nix b/pkgs/by-name/su/supermercado/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "supermercado"; version = "0.3.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mapbox"; repo = "supermercado"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5wE4XGRmMMFOCT4YCn4lwu9O6nn2wqYeQoU/cEjkv0g="; }; @@ -39,4 +39,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/su/supermorecado/package.nix b/pkgs/by-name/su/supermorecado/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "supermorecado"; version = "0.1.2"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "developmentseed"; repo = "supermorecado"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CuuJ4B/f7JoGQuTo5LS3WqMD860tucZ6z/97atw94k0="; }; @@ -37,4 +37,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/sy/systemdlint/package.nix b/pkgs/by-name/sy/systemdlint/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "systemdlint"; version = "1.4.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "systemdlint"; - tag = version; + tag = finalAttrs.version; hash = "sha256-cJpZkqj4IWxofFWju/s8K3JoCVigSQHpN3o1+rG1/iM="; }; @@ -30,4 +30,4 @@ python3Packages.buildPythonApplication rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "systemdlint"; }; -} +}) diff --git a/pkgs/by-name/ta/tatoebatools/package.nix b/pkgs/by-name/ta/tatoebatools/package.nix @@ -6,7 +6,7 @@ checkLang ? false, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "tatoebatools"; version = "0.2.3"; pyproject = true; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "LBeaudoux"; repo = "tatoebatools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-45CDAH80z6zApgR4gK7ZLPSXtCyPx+6YaA61Iskued4="; }; @@ -51,4 +51,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/te/terracotta/package.nix b/pkgs/by-name/te/terracotta/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "terracotta"; version = "0.9.1"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "DHI-GRAS"; repo = "terracotta"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PWXm3TDtHyHfpsX1revK6G0yUP0fBr2QqJC1vCr51gI="; }; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { #setuptools-scm-git-archive ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; dependencies = with python3Packages; [ apispec @@ -58,4 +58,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/te/tewi/package.nix b/pkgs/by-name/te/tewi/package.nix @@ -5,7 +5,7 @@ geoip2fast, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "tewi"; version = "2.2.0"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "anlar"; repo = "tewi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XLriHazE+YyLTEWcjDuW+3WX3NKYdsvzRmIc/Oc81oM="; }; @@ -34,4 +34,4 @@ python3Packages.buildPythonApplication rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "tewi"; }; -} +}) diff --git a/pkgs/by-name/ti/tilecloud/package.nix b/pkgs/by-name/ti/tilecloud/package.nix @@ -5,7 +5,7 @@ c2cwsgiutils, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "tilecloud"; version = "1.13.2"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "camptocamp"; repo = "tilecloud"; - tag = version; + tag = finalAttrs.version; hash = "sha256-nxTfMTKj0pXAzQPYRdh08Qi0u+WY865s3JtvdNy2eIQ="; }; @@ -61,4 +61,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ti/tilekiln/package.nix b/pkgs/by-name/ti/tilekiln/package.nix @@ -6,7 +6,7 @@ pmtiles, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "tilekiln"; version = "0.8.1"; pyproject = true; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "pnorman"; repo = "tilekiln"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TLROZGSY2yqbbSHoUOfqaUz+g9K9gltfH7BmZPUx73k="; }; @@ -49,4 +49,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ti/tilelog/package.nix b/pkgs/by-name/ti/tilelog/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "tilelog"; version = "1.7.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "openstreetmap"; repo = "tilelog"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tSBawN8u3mw6sSVFUMT+qfjbhwPF+x3sYXpO18YUjpw="; }; @@ -35,4 +35,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/ti/tilesets-cli/package.nix b/pkgs/by-name/ti/tilesets-cli/package.nix @@ -5,10 +5,9 @@ jsonseq, supermercado, testers, - tilesets-cli, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "tilesets-cli"; version = "1.13.0"; pyproject = true; @@ -16,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mapbox"; repo = "tilesets-cli"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9IGJ3jhw2U5vZl9dG0ourxFgKV+QRf6JXT6nmvuTx7A="; }; @@ -43,7 +42,7 @@ python3Packages.buildPythonApplication rec { supermercado ]; - passthru.tests.version = testers.testVersion { package = tilesets-cli; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { description = "CLI for interacting with the Mapbox Tilesets API"; @@ -52,4 +51,4 @@ python3Packages.buildPythonApplication rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "tilesets"; }; -} +}) diff --git a/pkgs/by-name/ti/tinyflux/package.nix b/pkgs/by-name/ti/tinyflux/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "tinyflux"; version = "1.0.0"; pyproject = true; @@ -12,12 +12,12 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "citrusvanilla"; repo = "tinyflux"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WgNkYFWZvZJ8MYMqfnqXH8YgjzRemMxAkyN9On+5PQI="; }; postPatch = '' - echo ${version} > version.txt + echo ${finalAttrs.version} > version.txt ''; build-system = with python3Packages; [ setuptools ]; @@ -30,4 +30,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/tp/tpkutils/package.nix b/pkgs/by-name/tp/tpkutils/package.nix @@ -5,7 +5,7 @@ pymbtiles, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "tpkutils"; version = "0.8.2"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "consbio"; repo = "tpkutils"; - tag = version; + tag = finalAttrs.version; hash = "sha256-iKM+tEEOtSkwDdkBN+n35q3D2IBi7a/bnY/fSlGDowU="; }; @@ -35,4 +35,4 @@ python3Packages.buildPythonApplication rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "tpk"; }; -} +}) diff --git a/pkgs/by-name/tr/trackanimation/package.nix b/pkgs/by-name/tr/trackanimation/package.nix @@ -6,7 +6,7 @@ smopy, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "trackanimation"; version = "1.0.5"; pyproject = true; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "JoanMartin"; repo = "trackanimation"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fLubRKq+3wQh16xSdqJmNMy4zw83RiSQj8C6jNV4fV8="; }; @@ -39,4 +39,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/by-name/tu/tuiview/package.nix b/pkgs/by-name/tu/tuiview/package.nix @@ -6,7 +6,7 @@ gdal, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "tuiview"; version = "1.3.3"; pyproject = true; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "ubarsc"; repo = "tuiview"; - tag = "tuiview-${version}"; + tag = "tuiview-${finalAttrs.version}"; hash = "sha256-e3tpkQlfdmbzwZVp9Hl1p505uaFa0umNyzlOwfHOMCo="; }; @@ -37,4 +37,4 @@ python3Packages.buildPythonApplication rec { maintainers = [ lib.maintainers.sikmir ]; mainProgram = "tuiview"; }; -} +}) diff --git a/pkgs/by-name/zd/zdict/package.nix b/pkgs/by-name/zd/zdict/package.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "zdict"; version = "5.0.1"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "zdict"; repo = "zdict"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vZpxJkKBHo9fO7xNN9Is7BumZhAkepVK0dpk+Y/1YBM="; }; @@ -34,4 +34,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/bounded-pool-executor/default.nix b/pkgs/development/python-modules/bounded-pool-executor/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "bounded-pool-executor"; version = "0.0.3"; pyproject = true; diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix @@ -5,17 +5,17 @@ locale, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "click"; version = "6.7"; pyproject = true; src = python3Packages.fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8VUW30eNWlYYD7+A5o8gYBDm0WD8OfpQi2XgNf11Ews="; }; - patches = lib.optionals (lib.versionAtLeast version "6.7") [ + patches = lib.optionals (lib.versionAtLeast finalAttrs.version "6.7") [ (replaceVars ./fix-paths.patch { locale = "${locale}/bin/locale"; }) @@ -35,4 +35,4 @@ python3Packages.buildPythonPackage rec { description = "Create beautiful command line interfaces in Python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/development/python-modules/config-path/default.nix b/pkgs/development/python-modules/config-path/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "config-path"; version = "1.0.5"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "barry-scott"; repo = "config-path"; - tag = version; + tag = finalAttrs.version; hash = "sha256-W3qsCGYejM5J2FIYGJ5An2YCfuqQBtx6q3JCUxQAWUg="; }; @@ -24,4 +24,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/contextily/default.nix b/pkgs/development/python-modules/contextily/default.nix @@ -5,22 +5,21 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "contextily"; version = "1.6.0"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "geopandas"; repo = "contextily"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Pkw21EOjRiIhdZvCY6JJ2T2yjShF9Io4NAQZIIjeKpU="; }; build-system = with python3Packages; [ setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; dependencies = with python3Packages; [ geopy @@ -43,4 +42,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/curses-menu/default.nix b/pkgs/development/python-modules/curses-menu/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "curses-menu"; version = "0.7.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "pmbarrett314"; repo = "curses-menu"; - tag = version; + tag = finalAttrs.version; hash = "sha256-l5KPBPODfeQdZIW3kjoj4ImhokFKjxyiB7r57Ryqj0g="; }; @@ -37,4 +37,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/earthaccess/default.nix b/pkgs/development/python-modules/earthaccess/default.nix @@ -7,7 +7,7 @@ tinynetrc, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "earthaccess"; version = "0.11.0"; pyproject = true; @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "nsidc"; repo = "earthaccess"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-N4pRODkCPUNW3EPTLgtSscHJv4B/YN37VNOhzCC33+M="; }; @@ -45,4 +45,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/earthpy/default.nix b/pkgs/development/python-modules/earthpy/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "earthpy"; version = "0.9.4"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "earthlab"; repo = "earthpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MCyeFXtjOqnVarSUk7Z/+Y5oNhYLlxznjWHQOCgUOIc="; }; @@ -36,4 +36,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/geotiler/default.nix b/pkgs/development/python-modules/geotiler/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "geotiler"; version = "0.15.1"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "wrobell"; repo = "geotiler"; - tag = "geotiler-${version}"; + tag = "geotiler-${finalAttrs.version}"; hash = "sha256-fiY5cJIus4eLzSfqVjZfmco4pFABYWNPVUOXGGYPEso="; }; @@ -40,4 +40,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/gpxelevations/default.nix b/pkgs/development/python-modules/gpxelevations/default.nix @@ -8,7 +8,7 @@ let testdata = import ./testdata.nix { inherit fetchurl; }; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "gpxelevations"; version = "0.3.7"; pyproject = true; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "tkrajina"; repo = "srtm.py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/AGvFE74sJTnn70VklQp0MG+7dsooavAdSTyV2oJM+I="; }; @@ -52,4 +52,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/hardpy/default.nix b/pkgs/development/python-modules/hardpy/default.nix @@ -5,16 +5,15 @@ pycouchdb, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "hardpy"; version = "0.4.0"; pyproject = true; - disabled = python3Packages.pythonOlder "3.10"; src = fetchFromGitHub { owner = "everypinio"; repo = "hardpy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CVn5Edon1auXNFFNRGnt2i1j9TJo+uX194a22tIQpVE="; }; @@ -45,4 +44,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/jsonseq/default.nix b/pkgs/development/python-modules/jsonseq/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "jsonseq"; version = "1.0.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "sgillies"; repo = "jsonseq"; - tag = version; + tag = finalAttrs.version; hash = "sha256-aZu4+MRFrAizskxqMnks9pRXbe/vw4sYt92tRpjfUSg="; }; @@ -26,4 +26,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/portolan/default.nix b/pkgs/development/python-modules/portolan/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "portolan"; version = "1.0.1"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "fitnr"; repo = "portolan"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zKloFO7uCLkqgayxC11JRfMpNxIR+UkT/Xabb9AH8To="; }; @@ -26,4 +26,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/pqdm/default.nix b/pkgs/development/python-modules/pqdm/default.nix @@ -5,7 +5,7 @@ bounded-pool-executor, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pqdm"; version = "0.2.0"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "niedakh"; repo = "pqdm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qB/0TOxD7XCLsr3bKDIKZvYa8g2N95SzTeDiRgJp3Jk="; }; @@ -35,4 +35,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/pycouchdb/default.nix b/pkgs/development/python-modules/pycouchdb/default.nix @@ -4,16 +4,15 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pycouchdb"; version = "1.16.0"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "histrio"; repo = "py-couchdb"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jcDES8PC02F5eel2KThYZFXKzUm70UqktG521lt+Dj0="; }; @@ -43,4 +42,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-docker-fixtures/default.nix b/pkgs/development/python-modules/pytest-docker-fixtures/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pytest-docker-fixtures"; version = "1.3.19"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "guillotinaweb"; repo = "pytest-docker-fixtures"; - tag = version; + tag = finalAttrs.version; hash = "sha256-9MR2gz69/oGNjuZNGTSe58j8ykOl6AWWII+XzLkri60="; }; @@ -32,4 +32,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-shell-utilities/default.nix b/pkgs/development/python-modules/pytest-shell-utilities/default.nix @@ -5,20 +5,19 @@ pytest-skip-markers, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pytest-shell-utilities"; version = "1.9.3"; pyproject = true; - disabled = python3Packages.pythonOlder "3.7"; src = fetchFromGitHub { owner = "saltstack"; repo = "pytest-shell-utilities"; - tag = version; + tag = finalAttrs.version; hash = "sha256-AzIspaE6eHaG7YcRtuXtYsjwqF2rvO2YRxdiFlWsHuw="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; build-system = with python3Packages; [ setuptools-scm @@ -42,4 +41,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-skip-markers/default.nix b/pkgs/development/python-modules/pytest-skip-markers/default.nix @@ -4,20 +4,19 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "pytest-skip-markers"; version = "1.5.1"; pyproject = true; - disabled = python3Packages.pythonOlder "3.7"; src = fetchFromGitHub { owner = "saltstack"; repo = "pytest-skip-markers"; - tag = version; + tag = finalAttrs.version; hash = "sha256-jrNPF68sKpEmwU12ZbKK/24DqA1RrjIXYPyoKE/3FLM="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; build-system = with python3Packages; [ setuptools-scm @@ -38,4 +37,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-cmr/default.nix b/pkgs/development/python-modules/python-cmr/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "python-cmr"; version = "0.13.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "nasa"; repo = "python_cmr"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yQAWmX4PsaDx/x3AdQkVIOXAH72VvJ4Ow4QaoZq4/gc="; }; @@ -39,4 +39,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/development/python-modules/tinynetrc/default.nix b/pkgs/development/python-modules/tinynetrc/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage (finalAttrs: { pname = "tinynetrc"; version = "1.3.1"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "sloria"; repo = "tinynetrc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-iy0sa1oqJeZxSfXISI7Ypbml8+SGHhRZkznTdbI5yAo="; }; @@ -30,4 +30,4 @@ python3Packages.buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; -} +})