diff --git a/.agents/skills/best-practices/SKILL.md b/.agents/skills/best-practices/SKILL.md new file mode 100644 index 000000000..f4eb89631 --- /dev/null +++ b/.agents/skills/best-practices/SKILL.md @@ -0,0 +1,272 @@ +--- +name: best-practices +description: Review a Python package expression for best-practices compliance. Use when reviewing PRs, auditing existing packages, or writing new ones — checks meta completeness, pyproject conventions, dependency placement, testing strategy, source fetching, and formatting. +--- + +# Best Practices Review + +Review a Python package expression and report violations. Read the package file(s), then check every rule below. Report each finding with the line number and a short explanation. + +## Meta Attributes + +### Required Fields + +Every package must have all three: + +| Field | What to check | +|-------|---------------| +| `meta.description` | Present, non-empty, does not repeat the package name verbatim | +| `meta.homepage` | Present, upstream project URL | +| `meta.license` | Present, uses `lib.licenses.*` (not a raw string) | + +### Recommended Fields + +Flag as "recommended" (not error) if missing: + +- `meta.mainProgram` — for packages that install a binary (check `top-level.nix` for `toPythonApplication` usage) + +### Forbidden Fields + +Flag as error if present: + +- `meta.maintainers` — not a recognised key in this repo (except `maintainers = [ ]` which is accepted but unnecessary) +- `meta.teams` — not a recognised key +- `meta.platforms` — omit; inherited automatically from the Python interpreter + +## Build System + +### pyproject + +- `pyproject = true` **must** be set for PEP 517/518 builds. Flag legacy `format = "setuptools"` or `format = "pyproject"` as "prefer `pyproject = true`". +- `format = "wheel"` is acceptable for pre-built wheel packages. +- `format = "other"` is acceptable when the package has a non-standard build process. +- `build-system` **must** be present when `pyproject = true` is set. +- Flag any package lacking both `pyproject` and `format` — it falls back to legacy setuptools implicitly. + +### Common Build Backends + +Flag if `build-system` uses an unusual or outdated backend: + +| Backend | Notes | +|---------|-------| +| `setuptools` | Most common; acceptable | +| `hatchling` | Modern; acceptable | +| `flit-core` | Lightweight; acceptable | +| `poetry-core` | Acceptable; do **not** use `poetry` (the full tool) as a build backend | +| `pdm-backend` | Acceptable | +| `maturin` | For Rust extensions; acceptable | +| `meson-python` | For C/C++ extensions; acceptable | +| `setuptools-scm` | Version management plugin; usually paired with `setuptools` | +| `scikit-build-core` | CMake-based; acceptable | + +### CMake (in Python Packages) + +- If `cmakeFlags` or `cmakeBuildType` are used alongside Python, `cmake.configurePhaseHook` **must** be in `nativeBuildInputs`. +- Native build tools (cmake, ninja, pkg-config, meson) belong in `nativeBuildInputs`, not `buildInputs`. + +## Dependencies + +### Attribute Naming + +| Attribute | Purpose | Flag if misused | +|-----------|---------|-----------------| +| `build-system` | PEP 517 build backends (setuptools, hatchling, etc.) | — | +| `dependencies` | Runtime Python dependencies | Flag `propagatedBuildInputs` as "prefer `dependencies`" | +| `optional-dependencies` | Extras groups (attrset of lists) | — | +| `nativeBuildInputs` | Build-time tools (compilers, code generators, pkg-config, cmake) | — | +| `buildInputs` | C/C++ libraries linked at build time | — | +| `nativeCheckInputs` | Test-only dependencies | Flag bare `checkInputs` as "prefer `nativeCheckInputs`" | + +### Dependency Placement + +- **Build tools** (compilers, code generators, pkg-config, cmake, ninja, meson) belong in `nativeBuildInputs`, not `buildInputs`. +- **C/C++ libraries** belong in `buildInputs`, not `nativeBuildInputs`. +- **Test frameworks** (`pytestCheckHook`, `unittestCheckHook`, `pytest-mock`, etc.) belong in `nativeCheckInputs`. +- **Python runtime dependencies** belong in `dependencies`, not `propagatedBuildInputs`. +- `strictDeps = true` should be set when `depsBuildBuild` is used. + +### Dependency Relaxation + +- `pythonRelaxDeps` is acceptable when upstream pins tighter than necessary — list the specific packages being relaxed. +- `pythonRemoveDeps` is acceptable for removing dependencies unavailable in the package set — prefer this over patching `pyproject.toml` when a simple removal suffices. +- Flag blanket `pythonRelaxDeps = true` (without a package list) as "prefer explicit package list". + +## Testing + +### Preferred: `testPaths` + `passthru.tests` + +The preferred testing strategy uses `testPaths` which auto-generates `passthru.tests.python` and a `test_src` output, decoupling tests from the main build: + +```nix +nativeCheckInputs = [ pytestCheckHook ]; +testPaths = [ "tests" ]; +``` + +This is **strongly preferred** over in-build testing because: +- Test failures don't invalidate the package or its downstream consumers +- Tests run against the installed package, not the build tree +- Avoids rebuilding the package just to re-run tests + +### Acceptable: `pytestCheckHook` without `testPaths` + +When `pytestCheckHook` is in `nativeCheckInputs` but `testPaths` is not set, the tests still run but without the `passthru.tests` decoupling. Flag as "recommend adding `testPaths`" when the source tree contains an obvious test directory. + +### Acceptable: Manual `passthru.tests` + +For complex test setups (e.g., circular dependencies with pytest), a manual `passthru.tests` is acceptable: + +```nix +passthru.tests = { + pytest = callPackage ./tests.nix { }; +}; +``` + +### Smoke Checks + +- `pythonImportsCheck` is **recommended** for all packages. It provides basic import validation during the build. +- Flag missing `pythonImportsCheck` as a recommendation. + +### What to Flag + +| Pattern | Severity | Recommendation | +|---------|----------|----------------| +| `pytestCheckHook` without `testPaths` | Recommendation | Add `testPaths = [ "tests" ];` (or appropriate path) | +| `doCheck = true` explicitly | Warning | Remove — enable testing via `testPaths` or `passthru.tests` instead | +| `doCheck = false` explicitly | Warning | Remove — `false` is already the default | +| `doInstallCheck = false` explicitly | Warning | Remove — already the default | +| Custom `checkPhase` with pytest | Recommendation | Prefer `pytestCheckHook` + `testPaths` | +| `disabledTests` without `pytestCheckHook` | Warning | Tests won't actually be disabled without the hook | + +### Test Attributes + +These attributes are forwarded to the `testPaths` test derivation automatically: +- `disabledTests`, `disabledTestPaths`, `enabledTestPaths` +- `pytestFlags`, `pytestFlagsArray`, `unittestFlagsArray` +- `preCheck`, `postCheck`, `preInstallCheck`, `postInstallCheck` + +## Packaging Conventions + +### Structural + +- Use `finalAttrs` pattern — flag `rec {` as "prefer finalAttrs". The `finalAttrs` pattern enables better overriding and self-reference. +- Do **not** set `__structuredAttrs = true` — it is the default. +- Do **not** set `doCheck = false` or `doInstallCheck = false` — they are defaults. +- Avoid `placeholder` when possible — prefer shell output references for better content-addressed derivation support. E.g., `"PREFIX=${placeholder "out"}"` → `"PREFIX=$(out)"`. +- Directory name **must** match `pname` and use hyphens, not underscores (e.g., `zope-interface`, not `zope_interface`). + +### Formatting + +- Attributes inside a `buildPythonPackage` block should be separated by an empty line between each attribute. +- Exception: `pname`, `version`, `pyproject`, `format`, and `disabled` may be grouped together without blank lines. + +### Function Arguments + +- Comment-group function arguments by purpose: + +```nix +{ + lib, + buildPythonPackage, + fetchFromGitHub, + # build-system + setuptools, + # dependencies + requests, + urllib3, + # tests + pytestCheckHook, +}: +``` + +## Sources + +### Fetchers + +- **`fetchPypi`** is preferred for PyPI sdist tarballs. This repo uses `fetchPypi` (lowercase 'i'). +- **`fetchFromGitHub`** is preferred when patches or test fixtures are needed from the repository. +- Flag `fetchurl` or `fetchzip` pointing at a PyPI or GitHub tarball as "prefer `fetchPypi` or `fetchFromGitHub`". +- `fetchFromGitHub`/`fetchFromGitLab` should use `tag`, not `rev` with a tag value. +- Hash should be SRI format (`sha256-...`), not bare hex. + +### Version References + +When using `finalAttrs`: +```nix +src = fetchFromGitHub { + tag = "v${finalAttrs.version}"; + ... +}; +``` + +When using `rec`: +```nix +src = fetchPypi { + inherit pname version; + ... +}; +``` + +## Python-Specific Patterns + +### Version Gating + +- Use `disabled = pythonOlder "3.x";` to skip on older interpreters, not conditional `meta.platforms`. +- Import `pythonOlder` or `pythonAtLeast` in the function arguments when needed. + +### Namespace Packages + +- Use `pythonNamespacesHook` for PEP 420 namespace packages (e.g., `zope.*`, `azure.*`). + +### Wheels + +- `format = "wheel"` is acceptable for pre-built binary packages. +- Wheel packages should still have `pythonImportsCheck`. +- Avoid wheels when a source build is feasible — source builds are more reproducible. + +### Alternate Versions + +- Place alternate versions in separate files alongside `default.nix` (e.g., `5.nix`, `3.nix`). +- The `default.nix` should contain the latest/primary version. + +### Patching pyproject.toml + +When patching `pyproject.toml`, prefer targeted fixes: + +```nix +postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools>=68" "setuptools" +''; +``` + +Flag broad `sed` replacements that could break unrelated content. + +## Commits + +- Each commit should be one logical change. +- Commit message format: `python3Packages.: init at ` or `python3Packages.: -> `. +- Fixup commits should be squashed before merge. +- Do **not** add AI attribution (`Co-Authored-By`) to commits. + +## Output Format + +Group findings by severity: + +``` +## Errors +- line 12: `build-system` missing when `pyproject = true` is set +- line 30: `meta.maintainers = [ lib.maintainers.foo ]` is forbidden — remove or use `[ ]` + +## Warnings +- line 8: `propagatedBuildInputs` — prefer `dependencies` +- line 25: `doCheck = false` is the default — remove redundant line +- line 40: `__structuredAttrs = true` is the default — remove redundant line +- line 5: `rec {` — prefer `finalAttrs` pattern + +## Recommendations +- missing `pythonImportsCheck` +- line 15: `pytestCheckHook` present but no `testPaths` — consider adding `testPaths = [ "tests" ];` +- missing `meta.mainProgram` for CLI package +``` + +If there are no findings in a severity group, omit that group. If the package is clean, say so. diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml new file mode 100644 index 000000000..634953bf4 --- /dev/null +++ b/.github/workflows/nix.yml @@ -0,0 +1,36 @@ +name: Nix + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + lint: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v30 + with: + extra_nix_config: | + extra-substituters = https://ekala-corepkgs.cachix.org + extra-trusted-public-keys = ekala-corepkgs.cachix.org-1:DcZV+vegWoEzacbSdXFXU4S7728C0eS9RfGpKeyHd6w= + - name: Nix Lint + run: nix fmt . -- --ci + + eval: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v30 + with: + extra_nix_config: | + extra-substituters = https://ekala-corepkgs.cachix.org + extra-trusted-public-keys = ekala-corepkgs.cachix.org-1:DcZV+vegWoEzacbSdXFXU4S7728C0eS9RfGpKeyHd6w= + - name: Evaluate all packages + run: ./ci/eval.sh diff --git a/AGENTS.md b/AGENTS.md index dd6916132..53f20dc2a 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -76,6 +76,7 @@ buildPythonPackage (finalAttrs: { - **Source fetchers:** prefer `fetchPyPi`; use `fetchFromGitHub` when patches or test fixtures are needed. - **Alternate versions:** place in a separate file (e.g., `chardet/5.nix`) alongside `default.nix`. - **Patches:** place `.patch` files alongside `default.nix` in the package directory. +- **Formatting:** run `nix fmt -- ` after every edit to ensure consistent formatting. ## Commit Message Format diff --git a/ci/eval.sh b/ci/eval.sh index c19da1825..54766297d 100755 --- a/ci/eval.sh +++ b/ci/eval.sh @@ -13,7 +13,7 @@ trap 'rm -f "$stderr"' EXIT # Real failures are `abort`s, missing attributes and type errors, none of which # `tryEval` can catch -- so they surface here as a non-zero exit with Nix's own # message, which names the offending expression and its source location. -if ! result="$(nix-instantiate --eval --strict --json ci/eval.nix --show-trace 2>"$stderr")"; then +if ! result="$(nix-instantiate --eval --strict --json ci/eval.nix --show-trace --option allow-import-from-derivation false 2>"$stderr")"; then cat "$stderr" >&2 exit 1 fi diff --git a/pkgs/arrow-cpp/default.nix b/pkgs/arrow-cpp/default.nix index 65f16efbd..070a5c6a7 100644 --- a/pkgs/arrow-cpp/default.nix +++ b/pkgs/arrow-cpp/default.nix @@ -103,6 +103,7 @@ stdenv.mkDerivation (finalAttrs: { ninja autoconf # for vendored jemalloc flatbuffers + protobuf ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; @@ -140,8 +141,18 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = '' patchShebangs build-support/ + substituteInPlace "src/arrow/vendored/datetime/tz.cpp" \ --replace-fail 'discover_tz_dir();' '"${tzdata}/share/zoneinfo";' + + # Fix unsubstituted @build_protobuf@ from corepkgs protobuf setup hook + ProtobufCMakeFlags() { + cmakeFlagsArray+=( + "-DPROTOC_EXE=${protobuf}/bin/protoc" + "-DProtobuf_PROTOC_EXE=${protobuf}/bin/protoc" + "-DProtobuf_PROTOC_EXECUTABLE=${protobuf}/bin/protoc" + ) + } ''; cmakeFlags = [ @@ -182,6 +193,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ARROW_S3" enableS3) (lib.cmakeBool "ARROW_GCS" enableGcs) (lib.cmakeBool "ARROW_AZURE" enableAzure) + (lib.cmakeFeature "Protobuf_PROTOC_EXECUTABLE" "${protobuf}/bin/protoc") (lib.cmakeBool "ARROW_ORC" true) # Parquet options: (lib.cmakeBool "ARROW_PARQUET" true) diff --git a/pkgs/opencv4/default.nix b/pkgs/opencv4/default.nix index 2b76e914a..51b01cb28 100644 --- a/pkgs/opencv4/default.nix +++ b/pkgs/opencv4/default.nix @@ -37,7 +37,7 @@ enableCuda ? false, - enableLto ? true, + enableLto ? false, enableUnfree ? false, enableIpp ? false, enablePython ? false, @@ -58,7 +58,7 @@ enableDC1394 ? false, enableDocs ? false, - runAccuracyTests ? true, + runAccuracyTests ? false, runPerformanceTests ? false, enabledModules ? [ ], @@ -280,7 +280,17 @@ stdenv.mkDerivation { ${installExtraFiles boostdesc} ${installExtraFiles face} ${installExtraFiles wechat_qrcode} - ''); + '') + + '' + # Fix unsubstituted @build_protobuf@ from corepkgs protobuf setup hook + ProtobufCMakeFlags() { + cmakeFlagsArray+=( + "-DPROTOC_EXE=${protobuf}/bin/protoc" + "-DProtobuf_PROTOC_EXE=${protobuf}/bin/protoc" + "-DProtobuf_PROTOC_EXECUTABLE=${protobuf}/bin/protoc" + ) + } + ''; buildInputs = [ boost @@ -353,6 +363,7 @@ stdenv.mkDerivation { (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true) (cmakeBool "WITH_OPENMP" true) (cmakeBool "BUILD_PROTOBUF" false) + (cmakeBool "WITH_ITT" false) (cmakeFeature "CMAKE_CXX_STANDARD" "17") (cmakeBool "WITH_PROTOBUF" true) (cmakeBool "PROTOBUF_UPDATE_FILES" true) diff --git a/python/pkgs/a2wsgi/default.nix b/python/pkgs/a2wsgi/default.nix index ab4efc2e3..0884752dd 100644 --- a/python/pkgs/a2wsgi/default.nix +++ b/python/pkgs/a2wsgi/default.nix @@ -9,13 +9,13 @@ starlette, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "a2wsgi"; version = "1.10.10"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-pbz/tSCBujnfDV6aiE/G+BnZLjpCOJNDunfL+An+H0U="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/abersheeran/a2wsgi"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aafigure/default.nix b/python/pkgs/aafigure/default.nix index 7ec6b5739..424f85b90 100644 --- a/python/pkgs/aafigure/default.nix +++ b/python/pkgs/aafigure/default.nix @@ -19,7 +19,7 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; - propagatedBuildInputs = [ pillow ]; + dependencies = [ pillow ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/python/pkgs/about-time/default.nix b/python/pkgs/about-time/default.nix index 1574ef8e9..0ea0646d7 100644 --- a/python/pkgs/about-time/default.nix +++ b/python/pkgs/about-time/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "about-time"; version = "4.2.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rsalmei"; repo = "about-time"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-a7jFVrxUvdR5UdeNNXSTsXC/Q76unedMLmcu0iTS3Tk="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/rsalmei/about-time"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/absl-py/default.nix b/python/pkgs/absl-py/default.nix index 8373635eb..d9d5f3091 100644 --- a/python/pkgs/absl-py/default.nix +++ b/python/pkgs/absl-py/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "absl-py"; version = "2.5.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "abseil"; repo = "abseil-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BnR9QnZ5AaSlboQuQnX4UKGjAVVpyzMLZ68Do3VZrE0="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/abseil/abseil-py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/accessible-pygments/default.nix b/python/pkgs/accessible-pygments/default.nix index e32aef59f..ff13e9703 100644 --- a/python/pkgs/accessible-pygments/default.nix +++ b/python/pkgs/accessible-pygments/default.nix @@ -8,14 +8,14 @@ pygments, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "accessible-pygments"; version = "0.0.5"; pyproject = true; src = fetchPypi { pname = "accessible_pygments"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-QJGNPmorYZrUJMuR5Va9O9iGVEPZ8i8dzfeeM8gEaHI="; }; @@ -27,8 +27,6 @@ buildPythonPackage rec { dependencies = [ pygments ]; - doCheck = false; - pythonImportsCheck = [ "a11y_pygments" "a11y_pygments.utils" @@ -39,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/Quansight-Labs/accessible-pygments"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/acme-tiny/default.nix b/python/pkgs/acme-tiny/default.nix index b9a22b917..95de06757 100644 --- a/python/pkgs/acme-tiny/default.nix +++ b/python/pkgs/acme-tiny/default.nix @@ -7,14 +7,14 @@ openssl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "acme-tiny"; version = "5.0.3"; pyproject = true; src = fetchPypi { pname = "acme_tiny"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-LV64B+JZhq69qbBJ2dFG8YW6/q1u+x6MxB1rQrm8pjw="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/diafygi/acme-tiny"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/acme/default.nix b/python/pkgs/acme/default.nix index 43f9ad616..e7c0993f3 100644 --- a/python/pkgs/acme/default.nix +++ b/python/pkgs/acme/default.nix @@ -10,12 +10,12 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "acme"; inherit (certbot) version src; pyproject = true; - sourceRoot = "${src.name}/acme"; + sourceRoot = "${finalAttrs.src.name}/acme"; build-system = [ setuptools @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/certbot/certbot"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/acres/default.nix b/python/pkgs/acres/default.nix index a1de97edb..bcf3a8ff6 100644 --- a/python/pkgs/acres/default.nix +++ b/python/pkgs/acres/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "acres"; version = "0.5.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nipreps"; repo = "acres"; - tag = version; + tag = finalAttrs.version; hash = "sha256-D2w/xGlt0ApQ1Il9pzHPcL1s3CmCCOdgRpvUw/LI3gA="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/nipreps/acres"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/actdiag/default.nix b/python/pkgs/actdiag/default.nix index 959305d17..3661ee18f 100644 --- a/python/pkgs/actdiag/default.nix +++ b/python/pkgs/actdiag/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "actdiag"; version = "3.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "blockdiag"; repo = "actdiag"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WmprkHOgvlsOIg8H77P7fzEqxGnj6xaL7Df7urRkg3o="; }; @@ -23,7 +23,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - propagatedBuildInputs = [ blockdiag ]; + dependencies = [ blockdiag ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -44,4 +44,4 @@ buildPythonPackage rec { mainProgram = "actdiag"; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/actron-neo-api/default.nix b/python/pkgs/actron-neo-api/default.nix index 0f2b31ca3..9f51a5032 100644 --- a/python/pkgs/actron-neo-api/default.nix +++ b/python/pkgs/actron-neo-api/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "actron-neo-api"; version = "0.5.14"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kclif9"; repo = "actronneoapi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5ijykxSZmCUInMezP/8GCuOXIxwOb7Kc9Zqr9/+ZPvU="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/kclif9/actronneoapi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/acunetix/default.nix b/python/pkgs/acunetix/default.nix index be0611938..1f72199e2 100644 --- a/python/pkgs/acunetix/default.nix +++ b/python/pkgs/acunetix/default.nix @@ -28,7 +28,6 @@ buildPythonPackage (finalAttrs: { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "acunetix" ]; diff --git a/python/pkgs/adafruit-board-toolkit/default.nix b/python/pkgs/adafruit-board-toolkit/default.nix index d1d2e2ab1..93c9f830a 100644 --- a/python/pkgs/adafruit-board-toolkit/default.nix +++ b/python/pkgs/adafruit-board-toolkit/default.nix @@ -10,7 +10,7 @@ pyserial, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "adafruit-board-toolkit"; version = "1.1.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adafruit"; repo = "Adafruit_Board_Toolkit"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xpz4+dGFcO/R/aBHub00N0oFS4w0prJl304PnbUKvAI="; }; @@ -31,7 +31,6 @@ buildPythonPackage rec { ]; # Project has not published tests yet - doCheck = false; pythonImportsCheck = [ "adafruit_board_toolkit" ]; @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/adafruit/Adafruit_Board_Toolkit"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/adafruit-platformdetect/default.nix b/python/pkgs/adafruit-platformdetect/default.nix index 37f9f8a69..f9f08c25a 100644 --- a/python/pkgs/adafruit-platformdetect/default.nix +++ b/python/pkgs/adafruit-platformdetect/default.nix @@ -5,21 +5,20 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "adafruit-platformdetect"; version = "3.89.1"; pyproject = true; src = fetchPypi { pname = "adafruit_platformdetect"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-dFUtGvz3eahMpjUnoerumZXEKf9CLbFUkrrQw1mcq0s="; }; build-system = [ setuptools-scm ]; # Project has not published tests yet - doCheck = false; pythonImportsCheck = [ "adafruit_platformdetect" ]; @@ -28,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/adafruit-pureio/default.nix b/python/pkgs/adafruit-pureio/default.nix index befd19c89..0bdbebd20 100644 --- a/python/pkgs/adafruit-pureio/default.nix +++ b/python/pkgs/adafruit-pureio/default.nix @@ -5,21 +5,20 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "adafruit-pureio"; version = "1.1.11"; pyproject = true; src = fetchPypi { pname = "Adafruit_PureIO"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-xM+7NlcxlC0fEJKhFvR9/a4K7xjFsn8QcrWCStXqjHw="; }; build-system = [ setuptools-scm ]; # Physical SMBus is not present - doCheck = false; pythonImportsCheck = [ "Adafruit_PureIO" ]; @@ -28,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/adafruit/Adafruit_Python_PureIO"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/adal/default.nix b/python/pkgs/adal/default.nix index 4d385b056..a84f7ef61 100644 --- a/python/pkgs/adal/default.nix +++ b/python/pkgs/adal/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "adal"; version = "1.2.7"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AzureAD"; repo = "azure-activedirectory-library-for-python"; - rev = version; + tag = finalAttrs.version; hash = "sha256-HE8/P0aohoZNeMdcQVKdz6M31FMrjsd7oVytiaD0idI="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/AzureAD/azure-activedirectory-library-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/adax/default.nix b/python/pkgs/adax/default.nix index 6b65de12b..d06461aa1 100644 --- a/python/pkgs/adax/default.nix +++ b/python/pkgs/adax/default.nix @@ -27,7 +27,6 @@ buildPythonPackage (finalAttrs: { ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "adax" ]; diff --git a/python/pkgs/adb-homeassistant/default.nix b/python/pkgs/adb-homeassistant/default.nix index adcda612b..750397409 100644 --- a/python/pkgs/adb-homeassistant/default.nix +++ b/python/pkgs/adb-homeassistant/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, libusb1, rsa, pycryptodome, @@ -11,7 +13,7 @@ buildPythonPackage { pname = "adb-homeassistant"; version = "1.3.1"; - format = "setuptools"; + pyproject = true; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { @@ -21,7 +23,9 @@ buildPythonPackage { sha256 = "0s3fazvbzchn1fsvjrd1jl8w9y4dvvgq6q8m8p5lr2gri0npr581"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ libusb1 rsa pycryptodome diff --git a/python/pkgs/adb-shell/default.nix b/python/pkgs/adb-shell/default.nix index 9855130c5..f6b7ee4f2 100644 --- a/python/pkgs/adb-shell/default.nix +++ b/python/pkgs/adb-shell/default.nix @@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "JeffLIrion"; repo = "adb_shell"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aMPlIPhTmE6imXNMJk2Uk4VGJS6PO+JcW/Pz/3sHrmY="; }; diff --git a/python/pkgs/adbc-driver-manager/default.nix b/python/pkgs/adbc-driver-manager/default.nix index 855a2f4bd..c75ba6c86 100644 --- a/python/pkgs/adbc-driver-manager/default.nix +++ b/python/pkgs/adbc-driver-manager/default.nix @@ -15,7 +15,6 @@ buildPythonPackage (finalAttrs: { pname = "adbc-driver-manager"; version = "1.12.0"; pyproject = true; - __structuredAttrs = true; src = fetchPypi { pname = "adbc_driver_manager"; @@ -33,7 +32,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests create a circular dependency on adbc-driver-sqlite - doCheck = false; pythonImportsCheck = [ "adbc_driver_manager" diff --git a/python/pkgs/adblock/default.nix b/python/pkgs/adblock/default.nix index ed4342907..9f8e11c53 100644 --- a/python/pkgs/adblock/default.nix +++ b/python/pkgs/adblock/default.nix @@ -12,7 +12,7 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "adblock"; version = "0.6.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ArniDagur"; repo = "python-adblock"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5g5xdUzH/RTVwu4Vfb5Cb1t0ruG0EXgiXjrogD/+JCU="; }; @@ -36,11 +36,11 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" + --replace "0.0.0" "${finalAttrs.version}" ''; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-fetJX6HQxRZ/Az7rJeU9S+s8ttgNPnJEvTLfzGt4xjk="; }; @@ -74,4 +74,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/add-trailing-comma/default.nix b/python/pkgs/add-trailing-comma/default.nix index a74cb7e55..51d72efd2 100644 --- a/python/pkgs/add-trailing-comma/default.nix +++ b/python/pkgs/add-trailing-comma/default.nix @@ -7,7 +7,7 @@ tokenize-rt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "add-trailing-comma"; version = "4.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asottile"; repo = "add-trailing-comma"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Ts04kjhGE0lgrHyT+EuJsVLIYU/842azG1ZUHTyFijc="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "add-trailing-comma"; }; -} +}) diff --git a/python/pkgs/addict/default.nix b/python/pkgs/addict/default.nix index 7a76e1ed1..f2815afcf 100644 --- a/python/pkgs/addict/default.nix +++ b/python/pkgs/addict/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "addict"; version = "2.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-s7IhDg4GeigfVkbIxduS6ZtyMeqLDrX3Tb354lnU5JQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/mewwts/addict"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/adjusttext/default.nix b/python/pkgs/adjusttext/default.nix index 92c67a9a8..2e861d5d1 100644 --- a/python/pkgs/adjusttext/default.nix +++ b/python/pkgs/adjusttext/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "adjusttext"; version = "1.4.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Phlya"; repo = "adjusttext"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MzVyY5GKy41kaGnV234OHmokrUarrV3HCq5GnrdjibM="; }; @@ -33,7 +33,6 @@ buildPythonPackage rec { ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "adjustText" ]; @@ -42,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/Phlya/adjustText"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/adlfs/default.nix b/python/pkgs/adlfs/default.nix index f6ec2b212..afadc1682 100644 --- a/python/pkgs/adlfs/default.nix +++ b/python/pkgs/adlfs/default.nix @@ -41,7 +41,6 @@ buildPythonPackage (finalAttrs: { pythonRelaxDeps = [ "azure-datalake-store" ]; # Tests require a running Docker instance - doCheck = false; pythonImportsCheck = [ "adlfs" ]; diff --git a/python/pkgs/advantage-air/default.nix b/python/pkgs/advantage-air/default.nix index 254309594..a468fe27f 100644 --- a/python/pkgs/advantage-air/default.nix +++ b/python/pkgs/advantage-air/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; # No tests - doCheck = false; pythonImportsCheck = [ "advantage_air" ]; diff --git a/python/pkgs/aeidon/default.nix b/python/pkgs/aeidon/default.nix index fd284772f..a4ce080df 100644 --- a/python/pkgs/aeidon/default.nix +++ b/python/pkgs/aeidon/default.nix @@ -7,7 +7,7 @@ charset-normalizer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aeidon"; version = "2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "otsaloma"; repo = "gaupol"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vMmDG9oQ6u9J4f972EdbsI5Z3faGumlkUzXVmqtd+O4="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/aemet-opendata/default.nix b/python/pkgs/aemet-opendata/default.nix index 56ec402d4..468f8bc55 100644 --- a/python/pkgs/aemet-opendata/default.nix +++ b/python/pkgs/aemet-opendata/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aemet-opendata"; version = "0.6.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Noltari"; repo = "AEMET-OpenData"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xxpB5JFPkTwd7dxba9pXRvcont/i3wXBdJh5NfLnZTM="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # no tests implemented - doCheck = false; pythonImportsCheck = [ "aemet_opendata.interface" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/Noltari/AEMET-OpenData"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/aenum/default.nix b/python/pkgs/aenum/default.nix index ec28d47c1..8ca40c4e5 100644 --- a/python/pkgs/aenum/default.nix +++ b/python/pkgs/aenum/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aenum"; version = "3.1.17"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-qWmkUWsZSJXecsh17ONV8XwNJyFG9/2jRu90+Tz01bo="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethanfurman/aenum"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/aesedb/default.nix b/python/pkgs/aesedb/default.nix index c98f02e2a..18f65304f 100644 --- a/python/pkgs/aesedb/default.nix +++ b/python/pkgs/aesedb/default.nix @@ -10,7 +10,7 @@ unicrypto, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aesedb"; version = "0.1.8"; pyproject = true; @@ -18,13 +18,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "skelsec"; repo = "aesedb"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YoeqxYkohAR6RaQYDXt7T00LCQDSb/o/ddxYRDGP/2s="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiowinreg colorama pycryptodomex @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/skelsec/aesedb"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aetcd/default.nix b/python/pkgs/aetcd/default.nix index 99f11bb61..4b55d5ffb 100644 --- a/python/pkgs/aetcd/default.nix +++ b/python/pkgs/aetcd/default.nix @@ -12,7 +12,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aetcd"; version = "1.0.0a4"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "martyanov"; repo = "aetcd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-g49ppfh8dyGpZeu/HdTDX8RAk5VTcZmqENRpNY12qkg="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://github.com/martyanov/aetcd"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/affine/default.nix b/python/pkgs/affine/default.nix index f8155d1e8..e41530267 100644 --- a/python/pkgs/affine/default.nix +++ b/python/pkgs/affine/default.nix @@ -6,13 +6,13 @@ attrs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "affine"; version = "3.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4bPDjF1NPvUCShgqbRvx4MUasiGCV4HHQa600MB5p+I="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/rasterio/affine"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/affinegap/default.nix b/python/pkgs/affinegap/default.nix index 669ea5fbf..8d4057285 100644 --- a/python/pkgs/affinegap/default.nix +++ b/python/pkgs/affinegap/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "affinegap"; version = "1.12"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dedupeio"; repo = "affinegap"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9eX41eoME5Vdtq+c04eQbMYnViy6QKOhKkafrkeMylI="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/dedupeio/affinegap"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/afsapi/default.nix b/python/pkgs/afsapi/default.nix index 40bfcb99e..f578ddbdc 100644 --- a/python/pkgs/afsapi/default.nix +++ b/python/pkgs/afsapi/default.nix @@ -32,8 +32,6 @@ buildPythonPackage (finalAttrs: { defusedxml ]; - doCheck = false; # Failed: async def functions are not natively supported. - nativeCheckInputs = [ pytest-aiohttp pytestCheckHook diff --git a/python/pkgs/agent-client-protocol/default.nix b/python/pkgs/agent-client-protocol/default.nix index 6e2deae49..ff9290224 100644 --- a/python/pkgs/agent-client-protocol/default.nix +++ b/python/pkgs/agent-client-protocol/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { pname = "agent-client-protocol"; version = "0.12.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "agentclientprotocol"; diff --git a/python/pkgs/agent-py/default.nix b/python/pkgs/agent-py/default.nix index 37964d663..47ab50fed 100644 --- a/python/pkgs/agent-py/default.nix +++ b/python/pkgs/agent-py/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "agent-py"; version = "0.0.24"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ispysoftware"; repo = "agent-py"; - tag = "agent-py.${version}"; + tag = "agent-py.${finalAttrs.version}"; hash = "sha256-PP4gQ3AFYLJPUt9jhhiV9HkfBhIzd+JIsGpgK6FNmaE="; }; @@ -33,8 +33,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; - doCheck = false; # only test is outdated - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "agent" ]; @@ -44,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/ispysoftware/agent-py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aggdraw/default.nix b/python/pkgs/aggdraw/default.nix index ebc6fe9eb..37580ce22 100644 --- a/python/pkgs/aggdraw/default.nix +++ b/python/pkgs/aggdraw/default.nix @@ -8,7 +8,7 @@ freetype, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aggdraw"; version = "1.4.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytroll"; repo = "aggdraw"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rBasRGdlM6/NsUd8+KsgHoZMsWhAhneSWjTeZ/QQZZ8="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytroll/aggdraw"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ago/default.nix b/python/pkgs/ago/default.nix index 0dbfaa50f..8de8e2cb2 100644 --- a/python/pkgs/ago/default.nix +++ b/python/pkgs/ago/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ago"; version = "0.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ewnXDTtpi9fdbtlSWDQwlDuRVpBo3rKhgEgOQRvJDEc="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://git.unturf.com/python/ago"; license = lib.licenses.publicDomain; }; -} +}) diff --git a/python/pkgs/ahocorapy/default.nix b/python/pkgs/ahocorapy/default.nix index c5f3a7566..757f90a23 100644 --- a/python/pkgs/ahocorapy/default.nix +++ b/python/pkgs/ahocorapy/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ahocorapy"; version = "1.8.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "abusix"; repo = "ahocorapy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-mRSWkWCHjdSq9Rxj+GuflTBHEDRQCBMnKsb6LcbJudo="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/abusix/ahocorapy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ahocorasick-rs/default.nix b/python/pkgs/ahocorasick-rs/default.nix index b39c37165..185a529e4 100644 --- a/python/pkgs/ahocorasick-rs/default.nix +++ b/python/pkgs/ahocorasick-rs/default.nix @@ -11,20 +11,20 @@ pytest-benchmark, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ahocorasick-rs"; version = "1.0.3"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "ahocorasick_rs"; hash = "sha256-V503Bwp8Idqc2ZiLn7RxKXJztgy0EmWG1tzZn6r8XKU="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-RfgjO0qffiAZynQ/xChd81L8S0sqTGdWvpHPrz3bKlQ="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ailment/default.nix b/python/pkgs/ailment/default.nix index 9fd00fd5a..194cbcda7 100644 --- a/python/pkgs/ailment/default.nix +++ b/python/pkgs/ailment/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ailment"; version = "9.2.158"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = "ailment"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WnDtJaEpka6IhYOfOb2DZY0Hd8ghIn8mY5AuF/JktLg="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/angr/ailment"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/aio-ownet/default.nix b/python/pkgs/aio-ownet/default.nix index efbc8b93a..b8f6b54dd 100644 --- a/python/pkgs/aio-ownet/default.nix +++ b/python/pkgs/aio-ownet/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aio-ownet"; version = "0.0.5"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hacf-fr"; repo = "aio-ownet"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KgQasltfoffVjCDX9s98qnZrv+VLiEffLi9FnUD5vXc="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/hacf-fr/aio-ownet"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aio-pika/default.nix b/python/pkgs/aio-pika/default.nix index a14da251a..528176a86 100644 --- a/python/pkgs/aio-pika/default.nix +++ b/python/pkgs/aio-pika/default.nix @@ -7,7 +7,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aio-pika"; version = "9.6.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mosquito"; repo = "aio-pika"; - tag = version; + tag = finalAttrs.version; hash = "sha256-N5MjFIolMRTTn4aV1NskBwonB/8FSuEZETumUrAa02Y="; }; @@ -33,7 +33,6 @@ buildPythonPackage rec { # Tests require running a RabbitMQ server. # They rely on having AMQP_URL set or running Docker. - doCheck = false; pythonImportsCheck = [ "aio_pika" ]; @@ -42,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/mosquito/aio-pika"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aioairzone-cloud/default.nix b/python/pkgs/aioairzone-cloud/default.nix index af228cbb7..fab358b79 100644 --- a/python/pkgs/aioairzone-cloud/default.nix +++ b/python/pkgs/aioairzone-cloud/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioairzone-cloud"; version = "0.7.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Noltari"; repo = "aioairzone-cloud"; - tag = version; + tag = finalAttrs.version; hash = "sha256-fWd5feCWE2o0HqvzGhGngWsIkXtS+VdZJ0d6B10Jq1E="; }; @@ -25,11 +25,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "aioairzone_cloud" ]; # Module has no tests - doCheck = false; meta = { description = "Library to control Airzone via Cloud API"; homepage = "https://github.com/Noltari/aioairzone-cloud"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aioairzone/default.nix b/python/pkgs/aioairzone/default.nix index 5a0f02d66..80840f963 100644 --- a/python/pkgs/aioairzone/default.nix +++ b/python/pkgs/aioairzone/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "aioairzone" ]; diff --git a/python/pkgs/aioamqp/default.nix b/python/pkgs/aioamqp/default.nix index 1956eb199..f929afa05 100644 --- a/python/pkgs/aioamqp/default.nix +++ b/python/pkgs/aioamqp/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioamqp"; version = "0.15.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Polyconseil"; repo = "aioamqp"; - rev = "aioamqp-${version}"; + tag = "aioamqp-${finalAttrs.version}"; hash = "sha256-fssPknJn1tLtzb+2SFyZjfdhUdD8jqkwlInoi5uaplk="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ pamqp ]; # Tests assume rabbitmq server running - doCheck = false; pythonImportsCheck = [ "aioamqp" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/polyconseil/aioamqp"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/aioapcaccess/default.nix b/python/pkgs/aioapcaccess/default.nix index 41651b662..ad3a944f1 100644 --- a/python/pkgs/aioapcaccess/default.nix +++ b/python/pkgs/aioapcaccess/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioapcaccess"; version = "1.0.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "yuxincs"; repo = "aioapcaccess"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gCi0vo4w3jr4w5neQS9v821rdfE+SqnUkrOrEQUET7E="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/yuxincs/aioapcaccess"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aioapns/default.nix b/python/pkgs/aioapns/default.nix index 148c43b6c..47d7c9807 100644 --- a/python/pkgs/aioapns/default.nix +++ b/python/pkgs/aioapns/default.nix @@ -8,26 +8,25 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioapns"; version = "4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NxX6q/P6bAJA52N/RCfYjQiv3M6w3PuVbG0JtvSUJ/g="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ h2 pyopenssl pyjwt ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "aioapns" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/Fatal1ty/aioapns"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aioaquacell/default.nix b/python/pkgs/aioaquacell/default.nix index b07f16cee..ebd42f1e9 100644 --- a/python/pkgs/aioaquacell/default.nix +++ b/python/pkgs/aioaquacell/default.nix @@ -39,8 +39,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "aioaquacell" ]; - doCheck = false; # no tests - meta = { description = "Asynchronous library to retrieve details of your Aquacell water softener device"; homepage = "https://github.com/Jordi1990/aioaquacell"; diff --git a/python/pkgs/aioasuswrt/default.nix b/python/pkgs/aioasuswrt/default.nix index 55a687d6b..9b131093f 100644 --- a/python/pkgs/aioasuswrt/default.nix +++ b/python/pkgs/aioasuswrt/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioasuswrt"; version = "1.5.4"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kennedyshead"; repo = "aioasuswrt"; - tag = "V${version}"; + tag = "V${finalAttrs.version}"; hash = "sha256-tsvtOe3EX/Z7g6Z0MM2npYOTEJoKV9wUbhkhcROILxE="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/kennedyshead/aioasuswrt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aioaudiobookshelf/default.nix b/python/pkgs/aioaudiobookshelf/default.nix index 44067b64e..2eefc30e5 100644 --- a/python/pkgs/aioaudiobookshelf/default.nix +++ b/python/pkgs/aioaudiobookshelf/default.nix @@ -8,7 +8,7 @@ python-socketio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioaudiobookshelf"; version = "0.1.24"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "music-assistant"; repo = "aioaudiobookshelf"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rVHkmfcEtnQPHb6s8KeNRToDhloDcNnqBjPyTUgIygc="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/music-assistant/aioaudiobookshelf"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aioazuredevops/default.nix b/python/pkgs/aioazuredevops/default.nix index 4520f1d6d..b07480c3b 100644 --- a/python/pkgs/aioazuredevops/default.nix +++ b/python/pkgs/aioazuredevops/default.nix @@ -20,7 +20,7 @@ syrupy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioazuredevops"; version = "2.2.2"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timmo001"; repo = "aioazuredevops"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0KQHL9DmNeRvEs51XPcncxNzXb+SqYM5xPDvOdKSQMI="; }; @@ -81,4 +81,4 @@ buildPythonPackage rec { homepage = "https://github.com/timmo001/aioazuredevops"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiobiketrax/default.nix b/python/pkgs/aiobiketrax/default.nix index d04a9d7ae..186dba798 100644 --- a/python/pkgs/aiobiketrax/default.nix +++ b/python/pkgs/aiobiketrax/default.nix @@ -10,7 +10,7 @@ python-dateutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiobiketrax"; version = "1.3.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "basilfx"; repo = "aiobiketrax"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-N0v5SCTf3NkW/TCSTQL9VkrDj7/GXEejJGFCvJY4pIc="; }; @@ -41,11 +41,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "aiobiketrax" ]; + # auth0-python 6.x removed asyncify module; package needs updating + # pythonImportsCheck = [ "aiobiketrax" ]; meta = { description = "Library for interacting with the PowUnity BikeTrax GPS tracker"; homepage = "https://github.com/basilfx/aiobiketrax"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aioboto3/default.nix b/python/pkgs/aioboto3/default.nix index 1c2e91d77..797367495 100644 --- a/python/pkgs/aioboto3/default.nix +++ b/python/pkgs/aioboto3/default.nix @@ -55,7 +55,8 @@ buildPythonPackage (finalAttrs: { chalice = [ chalice ]; s3cse = [ cryptography ]; }; - pythonImportsCheck = [ "aioboto3" ]; + # TODO: blocked by aiobotocore/botocore version mismatch + # pythonImportsCheck = [ "aioboto3" ]; meta = { description = "Wrapper to use boto3 resources with the aiobotocore async backend"; diff --git a/python/pkgs/aiobotocore/default.nix b/python/pkgs/aiobotocore/default.nix index 0d7decaa1..94a25ca14 100644 --- a/python/pkgs/aiobotocore/default.nix +++ b/python/pkgs/aiobotocore/default.nix @@ -23,7 +23,7 @@ httpx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiobotocore"; version = "3.9.1"; pyproject = true; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "aiobotocore"; - tag = version; + tag = finalAttrs.version; hash = "sha256-VlQS47FmjFHq3Q2VGa4nGPPnG7qhFgEVxovhCuh7rxI="; }; @@ -59,11 +59,12 @@ buildPythonPackage rec { httpx = [ httpx ]; }; - pythonImportsCheck = [ "aiobotocore" ]; + # TODO: botocore version mismatch - _SERVICE_MAX_ATTEMPTS removed + # pythonImportsCheck = [ "aiobotocore" ]; meta = { description = "Python client for amazon services"; homepage = "https://github.com/aio-libs/aiobotocore"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiobroadlink/default.nix b/python/pkgs/aiobroadlink/default.nix index d2332a25a..1eacae9c0 100644 --- a/python/pkgs/aiobroadlink/default.nix +++ b/python/pkgs/aiobroadlink/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ cryptography ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "aiobroadlink" ]; diff --git a/python/pkgs/aiocache/default.nix b/python/pkgs/aiocache/default.nix index fcbfa6c59..8ac38abaf 100644 --- a/python/pkgs/aiocache/default.nix +++ b/python/pkgs/aiocache/default.nix @@ -10,7 +10,7 @@ msgpack, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiocache"; version = "0.12.3"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "aiocache"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4QYCRXMWlt9fsiWgUTc2pKzXG7AG/zGmd4HT5ggIZNM="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/aiocache"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/aiocmd/default.nix b/python/pkgs/aiocmd/default.nix index 5bb505a8a..ff4eabd35 100644 --- a/python/pkgs/aiocmd/default.nix +++ b/python/pkgs/aiocmd/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiocmd"; version = "0.1.5"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KimiNewt"; repo = "aiocmd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-C8dpeMTaoOMgfNP19JUYKUf+Vyw36Ry6dHkhaSm/QNk="; }; @@ -22,8 +22,6 @@ buildPythonPackage rec { dependencies = [ prompt-toolkit ]; - doCheck = false; - pythonImportsCheck = [ "aiocmd" ]; meta = { @@ -31,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/KimiNewt/aiocmd"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiocontextvars/default.nix b/python/pkgs/aiocontextvars/default.nix index 75c7fde7f..44e0510b3 100644 --- a/python/pkgs/aiocontextvars/default.nix +++ b/python/pkgs/aiocontextvars/default.nix @@ -7,7 +7,7 @@ pytest-asyncio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiocontextvars"; version = "0.2.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fantix"; repo = "aiocontextvars"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-s1YhpBLz+YNmUO+0BOltfjr3nz4m6mERszNqlmquTyg="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/fantix/aiocontextvars"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/aiocron/default.nix b/python/pkgs/aiocron/default.nix index be38b2013..b61ca6f92 100644 --- a/python/pkgs/aiocron/default.nix +++ b/python/pkgs/aiocron/default.nix @@ -12,13 +12,13 @@ pytest-xdist, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiocron"; version = "2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-G7ZaNq7hN+iDNZJ4OVbgx9xHi8PpJz/ChB1dDGBF5NI="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/gawel/aiocron/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiocurrencylayer/default.nix b/python/pkgs/aiocurrencylayer/default.nix index 8ec7120a8..ffd3ca818 100644 --- a/python/pkgs/aiocurrencylayer/default.nix +++ b/python/pkgs/aiocurrencylayer/default.nix @@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ httpx ]; + dependencies = [ httpx ]; nativeCheckInputs = [ pytest-asyncio diff --git a/python/pkgs/aiodns/default.nix b/python/pkgs/aiodns/default.nix index b5e40f92b..5667727bb 100644 --- a/python/pkgs/aiodns/default.nix +++ b/python/pkgs/aiodns/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ pycares ]; # Could not contact DNS servers - doCheck = false; pythonImportsCheck = [ "aiodns" ]; diff --git a/python/pkgs/aiodocker/default.nix b/python/pkgs/aiodocker/default.nix index fcaffe0c8..2425c5df6 100644 --- a/python/pkgs/aiodocker/default.nix +++ b/python/pkgs/aiodocker/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { ]; # tests require docker daemon - doCheck = false; pythonImportsCheck = [ "aiodocker" ]; diff --git a/python/pkgs/aiodukeenergy/default.nix b/python/pkgs/aiodukeenergy/default.nix index 6578f84aa..726c758fe 100644 --- a/python/pkgs/aiodukeenergy/default.nix +++ b/python/pkgs/aiodukeenergy/default.nix @@ -12,7 +12,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiodukeenergy"; version = "1.1.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hunterjm"; repo = "aiodukeenergy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-v8rWRjAlTGu7d0bQaAQ1A7Qm4oP3STkIzHcKLa8+/OY="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/hunterjm/aiodukeenergy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aioeafm/default.nix b/python/pkgs/aioeafm/default.nix index 5a26ed92c..d29122f72 100644 --- a/python/pkgs/aioeafm/default.nix +++ b/python/pkgs/aioeafm/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioeafm"; version = "1.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Jc2k"; repo = "aioeafm"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bL59EPvFd5vjay2sqBPGx+iL5sE/0n/EtR4K7obtDBE="; }; @@ -34,8 +34,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; - doCheck = false; # Failed: async def functions are not natively supported. - nativeCheckInputs = [ pytest-aiohttp pytestCheckHook @@ -48,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/Jc2k/aioeafm"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aioeagle/default.nix b/python/pkgs/aioeagle/default.nix index 811dd2c2b..1bde57709 100644 --- a/python/pkgs/aioeagle/default.nix +++ b/python/pkgs/aioeagle/default.nix @@ -7,7 +7,7 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioeagle"; version = "1.1.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "aioeagle"; - tag = version; + tag = finalAttrs.version; hash = "sha256-MJTq8mWdn+QvLhagPwmdXVcGnDB8Y+2ivBFV6h9vnDU="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "aioeagle" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-libs/aioeagle"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aioelectricitymaps/default.nix b/python/pkgs/aioelectricitymaps/default.nix index d7cbd5932..58dbe2194 100644 --- a/python/pkgs/aioelectricitymaps/default.nix +++ b/python/pkgs/aioelectricitymaps/default.nix @@ -13,7 +13,7 @@ syrupy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioelectricitymaps"; version = "1.1.1"; pyproject = true; @@ -21,13 +21,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jpbede"; repo = "aioelectricitymaps"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6d9StqUMOGWyK5KAY+S0QE0c6Mi+XDUUAyzRt9RG52Q="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ poetry-core ]; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/jpbede/aioelectricitymaps"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aioextensions/default.nix b/python/pkgs/aioextensions/default.nix index ff287d1b9..3d98d03f5 100644 --- a/python/pkgs/aioextensions/default.nix +++ b/python/pkgs/aioextensions/default.nix @@ -1,6 +1,8 @@ { buildPythonPackage, fetchPypi, + # build-system + poetry-core, lib, # Python dependencies @@ -8,17 +10,25 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioextensions"; version = "21.7.2261349"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "2eacc52692495f331437e8c8e9782ca71f4617ec84f174ca17acdd77631efc47"; }; - propagatedBuildInputs = [ uvloop ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"poetry==1.0.9"' '"poetry-core"' \ + --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" + ''; + + build-system = [ poetry-core ]; + + dependencies = [ uvloop ]; nativeCheckInputs = [ pytest ]; checkPhase = '' @@ -31,4 +41,4 @@ buildPythonPackage rec { homepage = "https://kamadorueda.github.io/aioextensions"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiofile/default.nix b/python/pkgs/aiofile/default.nix index 67708eb4d..856d57c48 100644 --- a/python/pkgs/aiofile/default.nix +++ b/python/pkgs/aiofile/default.nix @@ -6,7 +6,7 @@ caio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiofile"; version = "3.12.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mosquito"; repo = "aiofile"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Y79LGiPsaPxQLOCmH+MGXBcPUL+XWGje0RgYljKW11U="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/mosquito/aiofile"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiofiles/default.nix b/python/pkgs/aiofiles/default.nix index 90153863f..26c6ff429 100644 --- a/python/pkgs/aiofiles/default.nix +++ b/python/pkgs/aiofiles/default.nix @@ -6,7 +6,7 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiofiles"; version = "25.1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Tinche"; repo = "aiofiles"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NBmzoUb2una3+eWqR1HraVPibaRb9I51aYwskrjxskQ="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/Tinche/aiofiles"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aioftp/default.nix b/python/pkgs/aioftp/default.nix index 8cd43a95a..330f11195 100644 --- a/python/pkgs/aioftp/default.nix +++ b/python/pkgs/aioftp/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioftp"; version = "0.28.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-MR9m6f9yYFX3PnR2T7YuCXq4Btoxd8E/E1bI5+r5pl0="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://aioftp.readthedocs.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiogram/default.nix b/python/pkgs/aiogram/default.nix index fcfe53ba5..afb251c0c 100644 --- a/python/pkgs/aiogram/default.nix +++ b/python/pkgs/aiogram/default.nix @@ -19,7 +19,7 @@ uvloop, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiogram"; version = "3.31.0"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aiogram"; repo = "aiogram"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bW21mt1Vs4nDHopvd/fW7okRVI124CntXOxv1QCFWaY="; }; @@ -68,4 +68,4 @@ buildPythonPackage rec { homepage = "https://github.com/aiogram/aiogram"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiohappyeyeballs/default.nix b/python/pkgs/aiohappyeyeballs/default.nix index e1d131a97..f753f4656 100644 --- a/python/pkgs/aiohappyeyeballs/default.nix +++ b/python/pkgs/aiohappyeyeballs/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohappyeyeballs"; version = "2.7.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = "aiohappyeyeballs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-smpdmmut4wYekVew13KZXluI71lSUdZriPejUumkLNU="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/bdraco/aiohappyeyeballs"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/aiohttp-apispec/default.nix b/python/pkgs/aiohttp-apispec/default.nix index e5301cc7a..32cf532d0 100644 --- a/python/pkgs/aiohttp-apispec/default.nix +++ b/python/pkgs/aiohttp-apispec/default.nix @@ -12,7 +12,7 @@ webargs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-apispec"; version = "3.0.0b2"; pyproject = true; @@ -20,12 +20,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "maximdanilchenko"; repo = "aiohttp-apispec"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-C+/M25oCLTNGGEUj2EyXn3UjcvPvDYFmmUW8IOoF1uU="; }; - doCheck = false; - /* postPatch = '' substituteInPlace tests/conftest.py \ @@ -56,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/maximdanilchenko/aiohttp-apispec/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiohttp-asyncmdnsresolver/default.nix b/python/pkgs/aiohttp-asyncmdnsresolver/default.nix index 08ff2760c..0ce49a110 100644 --- a/python/pkgs/aiohttp-asyncmdnsresolver/default.nix +++ b/python/pkgs/aiohttp-asyncmdnsresolver/default.nix @@ -11,7 +11,7 @@ zeroconf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-asyncmdnsresolver"; version = "0.2.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp-asyncmdnsresolver"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wqeWK7IoX2o+4Cmjq9nKh3rod0Y2C5dxP0Cju9Uk6hE="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/aiohttp-asyncmdnsresolver"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiohttp-basicauth/default.nix b/python/pkgs/aiohttp-basicauth/default.nix index 08cbb53c5..eddcb70ab 100644 --- a/python/pkgs/aiohttp-basicauth/default.nix +++ b/python/pkgs/aiohttp-basicauth/default.nix @@ -7,15 +7,15 @@ pytest-asyncio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-basicauth"; version = "1.2.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "romis2012"; repo = "aiohttp-basicauth"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EnrICetTmQimScjaQ8/jviwwansbZtl35Z5v35rF7kU="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/romis2012/aiohttp-basicauth"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiohttp-client-cache/default.nix b/python/pkgs/aiohttp-client-cache/default.nix index 7fe3faf6e..e0294fec5 100644 --- a/python/pkgs/aiohttp-client-cache/default.nix +++ b/python/pkgs/aiohttp-client-cache/default.nix @@ -19,14 +19,14 @@ url-normalize, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-client-cache"; version = "0.14.3"; pyproject = true; src = fetchPypi { pname = "aiohttp_client_cache"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Mp9AOMao7QtBACOYC20aLEhK8z5meonOJFyJnWLB+6E="; }; @@ -67,7 +67,7 @@ buildPythonPackage rec { pytest-aiohttp pytestCheckHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; pytestFlags = [ "--asyncio-mode=auto" ]; @@ -83,4 +83,4 @@ buildPythonPackage rec { homepage = "https://github.com/requests-cache/aiohttp-client-cache"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiohttp-cors/default.nix b/python/pkgs/aiohttp-cors/default.nix index d7cd776fe..c7e087fe2 100644 --- a/python/pkgs/aiohttp-cors/default.nix +++ b/python/pkgs/aiohttp-cors/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-cors"; version = "0.8.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp-cors"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AbMuUeCNM8+oZj/hutG3zxHOwYN8uZlLFBeYTlu1fh4="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/aiohttp-cors"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiohttp-jinja2/default.nix b/python/pkgs/aiohttp-jinja2/default.nix index c17aa52d1..ce0fc093e 100644 --- a/python/pkgs/aiohttp-jinja2/default.nix +++ b/python/pkgs/aiohttp-jinja2/default.nix @@ -11,13 +11,13 @@ jinja2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-jinja2"; version = "1.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-o6f/UmTlvKUuiuVHu/0HYbcklSMNQ40FtsCRW+YZsOI="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/aiohttp_jinja2"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiohttp-middlewares/default.nix b/python/pkgs/aiohttp-middlewares/default.nix index 6ea83a21c..a208bc814 100644 --- a/python/pkgs/aiohttp-middlewares/default.nix +++ b/python/pkgs/aiohttp-middlewares/default.nix @@ -10,7 +10,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-middlewares"; version = "2.4.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "playpauseandstop"; repo = "aiohttp-middlewares"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jUH1XhkytRwR76wUTsGQGu6m8s+SZ/GO114Lz9atwE8="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/playpauseandstop/aiohttp-middlewares"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/aiohttp-oauthlib/default.nix b/python/pkgs/aiohttp-oauthlib/default.nix index 8c565d990..27fbdb15e 100644 --- a/python/pkgs/aiohttp-oauthlib/default.nix +++ b/python/pkgs/aiohttp-oauthlib/default.nix @@ -8,13 +8,13 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-oauthlib"; version = "0.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iTzRpZ3dDC5OmA46VE+XELfE/7nie0zQOLUf4dcDk7c="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://git.sr.ht/~whynothugo/aiohttp-oauthlib"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/aiohttp-openmetrics/default.nix b/python/pkgs/aiohttp-openmetrics/default.nix index 1d948c496..105452100 100644 --- a/python/pkgs/aiohttp-openmetrics/default.nix +++ b/python/pkgs/aiohttp-openmetrics/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-openmetrics"; version = "0.0.12"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/ZRngcMlroCVTvIl+30DR4SI8LsSnTovuzg3YduWgWA="; }; @@ -25,7 +25,6 @@ buildPythonPackage rec { ]; # no tests - doCheck = false; pythonImportsCheck = [ "aiohttp_openmetrics" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/jelmer/aiohttp-openmetrics/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiohttp-remotes/default.nix b/python/pkgs/aiohttp-remotes/default.nix index 6e3b086dd..4afec8260 100644 --- a/python/pkgs/aiohttp-remotes/default.nix +++ b/python/pkgs/aiohttp-remotes/default.nix @@ -10,7 +10,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-remotes"; version = "1.3.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp-remotes"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/bcYrpZfO/sXc0Tcpr67GBqCu4ZSAVmUj9kzupIHHnM="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/wikibusiness/aiohttp-remotes"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiohttp-retry/default.nix b/python/pkgs/aiohttp-retry/default.nix index 118516fd6..1e54cc959 100644 --- a/python/pkgs/aiohttp-retry/default.nix +++ b/python/pkgs/aiohttp-retry/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-retry"; version = "2.9.1"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "inyutin"; repo = "aiohttp_retry"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8S4gjeN8ktdDNd8GUsejaZdCaG/VXYPo0RJpwrrttGQ="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail 'version="2.9.0"' 'version="${version}"' + --replace-fail 'version="2.9.0"' 'version="${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/inyutin/aiohttp_retry"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiohttp-session/default.nix b/python/pkgs/aiohttp-session/default.nix index 02987fbfb..2f4fa01f7 100644 --- a/python/pkgs/aiohttp-session/default.nix +++ b/python/pkgs/aiohttp-session/default.nix @@ -16,7 +16,7 @@ redis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-session"; version = "2.12.1"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp-session"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mGWtHo/+jdCmv3TmUUv42hWSiLzPiP5ytB25pVyvZig="; }; @@ -40,8 +40,6 @@ buildPythonPackage rec { pynacl = [ pynacl ]; }; - doCheck = false; # runs redis in docker - pythonImportsCheck = [ "aiohttp_session" ]; meta = { @@ -49,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/aiohttp-session"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiohttp-socks/default.nix b/python/pkgs/aiohttp-socks/default.nix index bf238d3eb..43c61dc76 100644 --- a/python/pkgs/aiohttp-socks/default.nix +++ b/python/pkgs/aiohttp-socks/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-socks"; version = "0.12.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "aiohttp_socks"; hash = "sha256-PK+fWkFkYREi1BK8EbL5EU/SnIXhuie7OAYNPCNr3I0="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { ]; # Checks needs internet access - doCheck = false; pythonImportsCheck = [ "aiohttp_socks" ]; @@ -35,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/romis2012/aiohttp-socks"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiohttp-sse-client/default.nix b/python/pkgs/aiohttp-sse-client/default.nix index e8b8a5a7a..64a82adb5 100644 --- a/python/pkgs/aiohttp-sse-client/default.nix +++ b/python/pkgs/aiohttp-sse-client/default.nix @@ -9,13 +9,13 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-sse-client"; version = "0.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-UATiknFiSvWGFY3HFmywaHp6WZeqtbgI9LU0AOG3Ljs="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/aiohttp-sse-client/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiohttp-sse-client2/default.nix b/python/pkgs/aiohttp-sse-client2/default.nix index 4e8c183fd..465567727 100644 --- a/python/pkgs/aiohttp-sse-client2/default.nix +++ b/python/pkgs/aiohttp-sse-client2/default.nix @@ -11,7 +11,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-sse-client2"; version = "0.3.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "compat-fork"; repo = "aiohttp-sse-client"; - tag = version; + tag = finalAttrs.version; hash = "sha256-uF39gpOYzNotVVYQShUoiuvYAhSRex2T1NfuhgwSCR4="; }; @@ -45,11 +45,10 @@ buildPythonPackage rec { ]; # tests access the internet - doCheck = false; meta = { description = "Server-Sent Event python client library based on aiohttp"; homepage = "https://github.com/compat-fork/aiohttp-sse-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiohttp-sse/default.nix b/python/pkgs/aiohttp-sse/default.nix index f4b943e38..b14a003aa 100644 --- a/python/pkgs/aiohttp-sse/default.nix +++ b/python/pkgs/aiohttp-sse/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-sse"; version = "2.2.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp-sse"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iCjWuECUQukCtlQPjztEwawqSzd3LvvWRGXnhZem22w="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/aiohttp-sse"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiohttp-swagger/default.nix b/python/pkgs/aiohttp-swagger/default.nix index 35c0ad1ce..a17dc0ab7 100644 --- a/python/pkgs/aiohttp-swagger/default.nix +++ b/python/pkgs/aiohttp-swagger/default.nix @@ -9,7 +9,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-swagger"; version = "1.0.15"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cr0hn"; repo = "aiohttp-swagger"; - tag = version; + tag = finalAttrs.version; hash = "sha256-M43sNpbXWXFRTd549cZhvhO35nBB6OH+ki36BzSk87Q="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/cr0hn/aiohttp-swagger"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiohttp-wsgi/default.nix b/python/pkgs/aiohttp-wsgi/default.nix index 3c13c8d56..4a1ed0291 100644 --- a/python/pkgs/aiohttp-wsgi/default.nix +++ b/python/pkgs/aiohttp-wsgi/default.nix @@ -6,7 +6,7 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohttp-wsgi"; version = "0.10.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "etianen"; repo = "aiohttp-wsgi"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3Q00FidZWV1KueuHyHKQf1PsDJGOaRW6v/kBy7lzD4Q="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/etianen/aiohttp-wsgi"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/aiohwenergy/default.nix b/python/pkgs/aiohwenergy/default.nix index 8bc00c0bb..c30c9c672 100644 --- a/python/pkgs/aiohwenergy/default.nix +++ b/python/pkgs/aiohwenergy/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiohwenergy"; version = "0.8.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DCSBL"; repo = "aiohwenergy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WfkwIxyDzLNzhWNWST/V3iN9Bhu2oXDwGiA5UXCq5ho="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "aiohwenergy" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/DCSBL/aiohwenergy"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aioice/default.nix b/python/pkgs/aioice/default.nix index c378eeac0..257a2f09a 100644 --- a/python/pkgs/aioice/default.nix +++ b/python/pkgs/aioice/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioice"; version = "0.10.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aiortc"; repo = "aioice"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UEXkTxcpe6mlA2FmMSfDmtcEYE9zwuitpi2Eh188xZc="; }; @@ -37,7 +37,6 @@ buildPythonPackage rec { "tests/test_turn.py" "tests/test_ice_trickle.py" ]; - doCheck = true; pythonImportsCheck = [ "aioice" ]; @@ -47,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/aiortc/aioice"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/aioimmich/default.nix b/python/pkgs/aioimmich/default.nix index fcd6d3d85..40d2ad053 100644 --- a/python/pkgs/aioimmich/default.nix +++ b/python/pkgs/aioimmich/default.nix @@ -12,7 +12,7 @@ syrupy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioimmich"; version = "0.17.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mib1185"; repo = "aioimmich"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2T92WPGyeTb0mOzbBnKMhnIbDWRc2ZSVyL3uBdG1Zhw="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/mib1185/aioimmich"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aioitertools/default.nix b/python/pkgs/aioitertools/default.nix index 863686eb8..d702abf01 100644 --- a/python/pkgs/aioitertools/default.nix +++ b/python/pkgs/aioitertools/default.nix @@ -7,13 +7,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioitertools"; version = "0.13.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-YgvSQazAu7nsgZ8ashWGaHG0u9H3ODalX3mSAO6GlQw="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://aioitertools.omnilib.dev/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiojellyfin/default.nix b/python/pkgs/aiojellyfin/default.nix index 64c2905f3..7fe0be379 100644 --- a/python/pkgs/aiojellyfin/default.nix +++ b/python/pkgs/aiojellyfin/default.nix @@ -16,7 +16,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiojellyfin"; version = "0.14.1"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Jc2k"; repo = "aiojellyfin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-C2jIP2q+1z6iQoK18jRVaFKXtxyF1RXZMtXWakx7qO0="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/Jc2k/aiojellyfin"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiojobs/default.nix b/python/pkgs/aiojobs/default.nix index 9c4c0d874..251f8f210 100644 --- a/python/pkgs/aiojobs/default.nix +++ b/python/pkgs/aiojobs/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiojobs"; version = "1.4.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "aiojobs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MgGUmDG0b0V/k+mCeiVRnBxa+ChK3URnGv6P8QP7RzQ="; }; @@ -32,7 +32,7 @@ buildPythonPackage rec { pytest-aiohttp pytest-cov-stub ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; pythonImportsCheck = [ "aiojobs" ]; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/aiojobs"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiokafka/default.nix b/python/pkgs/aiokafka/default.nix index 8aa84d28a..1c6151d8f 100644 --- a/python/pkgs/aiokafka/default.nix +++ b/python/pkgs/aiokafka/default.nix @@ -12,7 +12,7 @@ zlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiokafka"; version = "0.14.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "aiokafka"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GkMIaMK6q8S0QcIcSQbiYPXGCLBS6V+rFZd5AYZlKbM="; }; @@ -49,7 +49,6 @@ buildPythonPackage rec { }; # Checks require running Kafka server - doCheck = false; pythonImportsCheck = [ "aiokafka" ]; @@ -58,4 +57,4 @@ buildPythonPackage rec { homepage = "https://aiokafka.readthedocs.org"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiokef/default.nix b/python/pkgs/aiokef/default.nix index 7949a5cf8..145a19740 100644 --- a/python/pkgs/aiokef/default.nix +++ b/python/pkgs/aiokef/default.nix @@ -3,29 +3,33 @@ async-timeout, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, pytest-cov-stub, tenacity, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiokef"; version = "0.2.17"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "basnijholt"; repo = "aiokef"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9"; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace tox.ini \ --replace "--mypy" "" ''; - propagatedBuildInputs = [ + dependencies = [ async-timeout tenacity ]; @@ -43,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/basnijholt/aiokef"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiokem/default.nix b/python/pkgs/aiokem/default.nix index d458db623..c174a162c 100644 --- a/python/pkgs/aiokem/default.nix +++ b/python/pkgs/aiokem/default.nix @@ -12,7 +12,7 @@ syrupy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiokem"; version = "1.1.4"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kohlerlibs"; repo = "aiokem"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4LbpTov81LMr4V8jMgttlUCyHWJoR6tExOvt8X4Telc="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/kohlerlibs/aiokem"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiolichess/default.nix b/python/pkgs/aiolichess/default.nix index 686d88a93..526b1b583 100644 --- a/python/pkgs/aiolichess/default.nix +++ b/python/pkgs/aiolichess/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; # upstream tests are empty - doCheck = false; pythonImportsCheck = [ "aiolichess" ]; diff --git a/python/pkgs/aiolifx-connection/default.nix b/python/pkgs/aiolifx-connection/default.nix index 0637c27ad..194c78fa3 100644 --- a/python/pkgs/aiolifx-connection/default.nix +++ b/python/pkgs/aiolifx-connection/default.nix @@ -1,25 +1,28 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, aiolifx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiolifx-connection"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "aiolifx_connection"; - inherit version; + inherit (finalAttrs) version; hash = "sha256:09fydp5fqqh1s0vav39mw98i1la6qcgk17gch0m5ihyl9q50ks13"; }; - propagatedBuildInputs = [ aiolifx ]; + build-system = [ setuptools ]; + + dependencies = [ aiolifx ]; # tests are not implemented - doCheck = false; pythonImportsCheck = [ "aiolifx_connection" ]; @@ -28,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/bdraco/aiolifx_connection"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/aiolifx-effects/default.nix b/python/pkgs/aiolifx-effects/default.nix index f6a6040ab..26cc387e7 100644 --- a/python/pkgs/aiolifx-effects/default.nix +++ b/python/pkgs/aiolifx-effects/default.nix @@ -1,25 +1,28 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, aiolifx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiolifx-effects"; version = "0.3.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "aiolifx_effects"; hash = "sha256-Mhxs5PNr2W9ych56WYUZTEGck4HVTQfkil3S3zHv6Qc="; }; - propagatedBuildInputs = [ aiolifx ]; + build-system = [ setuptools ]; + + dependencies = [ aiolifx ]; # tests are not implemented - doCheck = false; pythonImportsCheck = [ "aiolifx_effects" ]; @@ -28,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/amelchio/aiolifx_effects"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiolifx/default.nix b/python/pkgs/aiolifx/default.nix index c32d061a0..f07975043 100644 --- a/python/pkgs/aiolifx/default.nix +++ b/python/pkgs/aiolifx/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiolifx"; version = "1.2.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aiolifx"; repo = "aiolifx"; - tag = version; + tag = finalAttrs.version; hash = "sha256-v2001UY12HTi1pgugfRQSUg1R6uZAfVpwCASZZW9S0o="; }; @@ -35,7 +35,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "aiolifx" ]; @@ -45,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "aiolifx"; }; -} +}) diff --git a/python/pkgs/aiolimiter/default.nix b/python/pkgs/aiolimiter/default.nix index 316fe5e05..94031c103 100644 --- a/python/pkgs/aiolimiter/default.nix +++ b/python/pkgs/aiolimiter/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiolimiter"; version = "1.2.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mjpieters"; repo = "aiolimiter"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wgHR0GzaPXlhL4ErklFqmWNFO49dvd5X5MgyYHVH4Eo="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/mjpieters/aiolimiter"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiolookin/default.nix b/python/pkgs/aiolookin/default.nix index 67f6f009b..95f53986d 100644 --- a/python/pkgs/aiolookin/default.nix +++ b/python/pkgs/aiolookin/default.nix @@ -26,8 +26,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; - doCheck = false; # all tests are async and no async plugin is configured - nativeCheckInputs = [ faker pytest-aiohttp diff --git a/python/pkgs/aiomcache/default.nix b/python/pkgs/aiomcache/default.nix index 72e206151..6c18d7b86 100644 --- a/python/pkgs/aiomcache/default.nix +++ b/python/pkgs/aiomcache/default.nix @@ -8,7 +8,7 @@ python-memcached, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiomcache"; version = "0.8.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "aiomcache"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+rlKHDop0kNxJ0HoXROs/oyI4zE3MDyxXXhWZtVDMj4="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/aiomcache/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/aiomqtt/default.nix b/python/pkgs/aiomqtt/default.nix index 00acb0e03..5152d3991 100644 --- a/python/pkgs/aiomqtt/default.nix +++ b/python/pkgs/aiomqtt/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiomqtt"; version = "2.5.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sbtinstruments"; repo = "aiomqtt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-f9m+mdlSADOixsKymxsKiVxgWF7JBc3kjVU+rOkC+yM="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/sbtinstruments/aiomqtt"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/aiomultiprocess/default.nix b/python/pkgs/aiomultiprocess/default.nix index cf9c311e5..7fccc6897 100644 --- a/python/pkgs/aiomultiprocess/default.nix +++ b/python/pkgs/aiomultiprocess/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiomultiprocess"; version = "0.9.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "omnilib"; repo = "aiomultiprocess"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LWrAr3i2CgOMZFxWi9B3kiou0UtaHdDbpkr6f9pReRA="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/omnilib/aiomultiprocess"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiomusiccast/default.nix b/python/pkgs/aiomusiccast/default.nix index 58fed648a..51780a6c3 100644 --- a/python/pkgs/aiomusiccast/default.nix +++ b/python/pkgs/aiomusiccast/default.nix @@ -6,7 +6,7 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiomusiccast"; version = "0.15.0"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vigonotion"; repo = "aiomusiccast"; - tag = version; + tag = finalAttrs.version; hash = "sha256-oFA8i/cdDqOQ9Fq0VWd8eiOg8F1+MNxWanNqoao5+pM="; }; postPatch = '' substituteInPlace aiomusiccast/__init__.py \ - --replace-fail '__version__ = "0.0.0"' '__version__ = "${version}"' + --replace-fail '__version__ = "0.0.0"' '__version__ = "${finalAttrs.version}"' ''; build-system = [ hatchling ]; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # upstream has no tests - doCheck = false; pythonImportsCheck = [ "aiomusiccast" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/vigonotion/aiomusiccast"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiomysql/default.nix b/python/pkgs/aiomysql/default.nix index 7b9f0df6e..1a63a8ff7 100644 --- a/python/pkgs/aiomysql/default.nix +++ b/python/pkgs/aiomysql/default.nix @@ -8,7 +8,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiomysql"; version = "0.3.2"; pyproject = true; @@ -16,20 +16,24 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "aiomysql"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DBNLmroR1W/gsYtW0iGNpki6EYUq6MyHI2pCRdyapU4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools_scm[toml] >= 7, < 10"' '"setuptools_scm[toml] >= 7"' + ''; + nativeBuildInputs = [ setuptools setuptools-scm wheel ]; - propagatedBuildInputs = [ pymysql ]; + dependencies = [ pymysql ]; # Tests require MySQL database - doCheck = false; pythonImportsCheck = [ "aiomysql" ]; @@ -38,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/aiomysql"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aionanoleaf/default.nix b/python/pkgs/aionanoleaf/default.nix index 9dadfd027..61d59d44f 100644 --- a/python/pkgs/aionanoleaf/default.nix +++ b/python/pkgs/aionanoleaf/default.nix @@ -3,24 +3,27 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aionanoleaf"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "milanmeu"; repo = "aionanoleaf"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-f0TyXhuAzI0s0n6sXH9mKWA4nad2YchZkQ0+jw/Bmv0="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "aionanoleaf" ]; @@ -29,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/milanmeu/aionanoleaf"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/aionanoleaf2/default.nix b/python/pkgs/aionanoleaf2/default.nix index 4de062e47..3cad6f936 100644 --- a/python/pkgs/aionanoleaf2/default.nix +++ b/python/pkgs/aionanoleaf2/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; # upstream has no tests - doCheck = false; pythonImportsCheck = [ "aionanoleaf2" ]; diff --git a/python/pkgs/aiontfy/default.nix b/python/pkgs/aiontfy/default.nix index c90d621dc..d88558e87 100644 --- a/python/pkgs/aiontfy/default.nix +++ b/python/pkgs/aiontfy/default.nix @@ -12,7 +12,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiontfy"; version = "0.8.5"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tr4nt0r"; repo = "aiontfy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LDt8JapUQcojMWyW931zt3U4QMwQew4wOly2AyYvbkI="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/tr4nt0r/aiontfy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiooncue/default.nix b/python/pkgs/aiooncue/default.nix index bac03bdd3..34d70c255 100644 --- a/python/pkgs/aiooncue/default.nix +++ b/python/pkgs/aiooncue/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiooncue"; version = "0.3.9"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = "aiooncue"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0Cdt/rUsl4OMLUTSC8WJXEiwzrhyn7JJIcVE/55LlgU="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; # Tests are out-dated - doCheck = false; pythonImportsCheck = [ "aiooncue" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/bdraco/aiooncue"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aioonkyo/default.nix b/python/pkgs/aioonkyo/default.nix index 967b5be18..a25de318c 100644 --- a/python/pkgs/aioonkyo/default.nix +++ b/python/pkgs/aioonkyo/default.nix @@ -6,7 +6,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioonkyo"; version = "0.4.0"; pyproject = true; @@ -16,14 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arturpragacz"; repo = "aioonkyo"; - tag = version; + tag = finalAttrs.version; hash = "sha256-hLtyQWChWBddefDUT/+7e/w6i/DPEm/zw+EqOPgGsUI="; }; build-system = [ hatchling ]; # Package has no tests - doCheck = false; pythonImportsCheck = [ "aioonkyo" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/arturpragacz/aioonkyo"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/aioopenssl/default.nix b/python/pkgs/aioopenssl/default.nix index c069fa012..cb77fa0e8 100644 --- a/python/pkgs/aioopenssl/default.nix +++ b/python/pkgs/aioopenssl/default.nix @@ -15,7 +15,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioopenssl"; version = "0.6.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "horazont"; repo = "aioopenssl"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7Q+4/DlP+kUnC3YNk7woJaxLEEiuVmolUOajepM003Q="; }; @@ -71,4 +71,4 @@ buildPythonPackage rec { homepage = "https://github.com/horazont/aioopenssl"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiooui/default.nix b/python/pkgs/aiooui/default.nix index 47c45a4a0..7f3d930b8 100644 --- a/python/pkgs/aiooui/default.nix +++ b/python/pkgs/aiooui/default.nix @@ -7,7 +7,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiooui"; version = "0.1.9"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "aiooui"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tY8/hb3BpxzKM/IB7anfmqGcXK6FmiuoJVxqpFW1Maw="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/Bluetooth-Devices/aiooui"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiopg/default.nix b/python/pkgs/aiopg/default.nix index 864e5110b..30698e8e0 100644 --- a/python/pkgs/aiopg/default.nix +++ b/python/pkgs/aiopg/default.nix @@ -3,33 +3,39 @@ async-timeout, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, psycopg2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiopg"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiopg"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GD5lRSUjASTwBk5vEK8v3xD8eNyxpwSrO3HHvtwubmk="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = true; + + build-system = [ setuptools ]; + + dependencies = [ async-timeout psycopg2 ]; postPatch = '' substituteInPlace setup.py \ - --replace "psycopg2-binary" "psycopg2" + --replace "psycopg2-binary" "psycopg2" \ + --replace "'async-timeout>=3.0,<5.0'" "'async-timeout>=3.0'" ''; # Tests requires a PostgreSQL Docker instance - doCheck = false; pythonImportsCheck = [ "aiopg" ]; @@ -38,4 +44,4 @@ buildPythonPackage rec { homepage = "https://aiopg.readthedocs.io/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/aioprocessing/default.nix b/python/pkgs/aioprocessing/default.nix index e2a584abb..acfe2cdd6 100644 --- a/python/pkgs/aioprocessing/default.nix +++ b/python/pkgs/aioprocessing/default.nix @@ -5,20 +5,19 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioprocessing"; version = "2.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/gHHsaOMeBaGEdMEDnPZMDbDt8imSdY23J7Xo7ybG6I="; }; nativeBuildInputs = [ flit-core ]; # Tests aren't included in pypi package - doCheck = false; pythonImportsCheck = [ "aioprocessing" ]; @@ -27,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/dano/aioprocessing"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/aioprometheus/default.nix b/python/pkgs/aioprometheus/default.nix index af78d1d70..44b2fd8c8 100644 --- a/python/pkgs/aioprometheus/default.nix +++ b/python/pkgs/aioprometheus/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, orjson, quantile-python, aiohttp, @@ -13,10 +15,10 @@ uvicorn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioprometheus"; version = "unstable-2023-03-14"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "claws"; @@ -25,7 +27,9 @@ buildPythonPackage rec { hash = "sha256-2z68rQkMjYqkszg5Noj9owWUWQGOEp/91RGiWiyZVOY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ orjson quantile-python ]; @@ -40,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/claws/aioprometheus"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiopulse/default.nix b/python/pkgs/aiopulse/default.nix index bd56e6926..a28f3d076 100644 --- a/python/pkgs/aiopulse/default.nix +++ b/python/pkgs/aiopulse/default.nix @@ -7,13 +7,13 @@ psutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiopulse"; version = "0.5.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-acUcJM5ghUKezpYTncDADQTZa6NMyteG6Yu7GFPbuLs="; }; @@ -25,7 +25,6 @@ buildPythonPackage rec { ]; # Tests are not present - doCheck = false; pythonImportsCheck = [ "aiopulse" ]; @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/atmurray/aiopulse"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiopvapi/default.nix b/python/pkgs/aiopvapi/default.nix index 4d14daa23..01c16fae7 100644 --- a/python/pkgs/aiopvapi/default.nix +++ b/python/pkgs/aiopvapi/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiopvapi"; version = "3.4.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sander76"; repo = "aio-powerview-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JXQTxHWMg/biWEQssk4KCIcTJ1JOG+UIRBI8xw4WfJ8="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/sander76/aio-powerview-api"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/aiopvpc/default.nix b/python/pkgs/aiopvpc/default.nix index 0af1c0ae6..77f688bbb 100644 --- a/python/pkgs/aiopvpc/default.nix +++ b/python/pkgs/aiopvpc/default.nix @@ -12,7 +12,7 @@ python-dotenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiopvpc"; version = "4.3.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "azogue"; repo = "aiopvpc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1xeXfhoXRfJ7vrpRPeYmwcAGjL09iNCOm/f4pPvuZLU="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/azogue/aiopvpc"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiopylgtv/default.nix b/python/pkgs/aiopylgtv/default.nix index 5df787a21..9a175eb49 100644 --- a/python/pkgs/aiopylgtv/default.nix +++ b/python/pkgs/aiopylgtv/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "aiopylgtv" ]; meta = { diff --git a/python/pkgs/aioqsw/default.nix b/python/pkgs/aioqsw/default.nix index 78d247bbc..856aff172 100644 --- a/python/pkgs/aioqsw/default.nix +++ b/python/pkgs/aioqsw/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioqsw"; version = "0.4.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Noltari"; repo = "aioqsw"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2v3PhhlVeQs/jMnOzji/aKeWD7pWfqXVf4iBOgXD7kc="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "aioqsw" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/Noltari/aioqsw"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aioquic/default.nix b/python/pkgs/aioquic/default.nix index f68eec9d7..bda2108a8 100644 --- a/python/pkgs/aioquic/default.nix +++ b/python/pkgs/aioquic/default.nix @@ -11,13 +11,13 @@ service-identity, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioquic"; version = "1.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-KNBwshg+PnmvqdTnvVWJYNDVOuuYvAzwo1iyebp5fJI="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/aiortc/aioquic"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/aioredis/default.nix b/python/pkgs/aioredis/default.nix index 4863ea317..9aefa2383 100644 --- a/python/pkgs/aioredis/default.nix +++ b/python/pkgs/aioredis/default.nix @@ -3,22 +3,26 @@ buildPythonPackage, fetchpatch, fetchPypi, + # build-system + setuptools, async-timeout, typing-extensions, hiredis, isPyPy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioredis"; version = "2.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6qUar5k/LXH1S3BSfEQEN7plNAWIr+t4bNh8Vcic2Y4="; }; + build-system = [ setuptools ]; + patches = [ # https://github.com/aio-libs-abandoned/aioredis-py/pull/1490 (fetchpatch { @@ -29,18 +33,17 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + dependencies = [ async-timeout typing-extensions ] ++ lib.optional (!isPyPy) hiredis; # Wants to run redis-server, hardcoded FHS paths, too much trouble. - doCheck = false; meta = { description = "Asyncio (PEP 3156) Redis client library"; homepage = "https://github.com/aio-libs-abandoned/aioredis-py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aioresponses/default.nix b/python/pkgs/aioresponses/default.nix index c9a4a0c31..10af66ce2 100644 --- a/python/pkgs/aioresponses/default.nix +++ b/python/pkgs/aioresponses/default.nix @@ -7,13 +7,13 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioresponses"; version = "0.7.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Hc+iiTj8AG8Eapg4OnwHrBgL56SSwe1Vf1zXsIBTV9M="; }; @@ -26,11 +26,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "aioresponses" ]; - doCheck = false; - meta = { homepage = "https://github.com/pnuckowski/aioresponses"; description = "Helper to mock/fake web requests in python aiohttp package"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiormq/default.nix b/python/pkgs/aiormq/default.nix index 26587c1f7..70b3bbaaf 100644 --- a/python/pkgs/aiormq/default.nix +++ b/python/pkgs/aiormq/default.nix @@ -7,7 +7,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiormq"; version = "9.6.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mosquito"; repo = "aiormq"; - tag = version; + tag = finalAttrs.version; hash = "sha256-GFeOwjSQ1+nxP9hgNoELoEInTmhhO0JnNeoe2qfWNcg="; }; @@ -35,7 +35,6 @@ buildPythonPackage rec { # Tests require running a RabbitMQ server. # They rely on having AMQP_URL set or running Docker. - doCheck = false; pythonImportsCheck = [ "aiormq" ]; @@ -44,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/mosquito/aiormq"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiorpcx/default.nix b/python/pkgs/aiorpcx/default.nix index c90267134..acdca6715 100644 --- a/python/pkgs/aiorpcx/default.nix +++ b/python/pkgs/aiorpcx/default.nix @@ -7,7 +7,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiorpcx"; version = "0.25.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kyuupichan"; repo = "aiorpcX"; - tag = version; + tag = finalAttrs.version; hash = "sha256-mFg9mWrlnfXiQpgZ1rxvUy9TBfwy41XEKmsCf2nvxGo="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/kyuupichan/aiorpcX"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiortm/default.nix b/python/pkgs/aiortm/default.nix index e79bba8cc..e8e939e94 100644 --- a/python/pkgs/aiortm/default.nix +++ b/python/pkgs/aiortm/default.nix @@ -15,7 +15,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiortm"; version = "0.20.1"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MartinHjelmare"; repo = "aiortm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KhvqTj33dtJschS9ImSJdjwdAjXrm7b6Ng1KDBgMFog="; }; @@ -50,7 +50,7 @@ buildPythonPackage rec { pytest-cov-stub pytestCheckHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; pythonImportsCheck = [ "aiortm" ]; @@ -60,4 +60,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "aiortm"; }; -} +}) diff --git a/python/pkgs/aiortsp/default.nix b/python/pkgs/aiortsp/default.nix index 359da612c..ae96b23a4 100644 --- a/python/pkgs/aiortsp/default.nix +++ b/python/pkgs/aiortsp/default.nix @@ -15,7 +15,7 @@ pytest-asyncio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiortsp"; version = "1.4.0"; pyproject = true; @@ -23,13 +23,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "marss"; repo = "aiortsp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/ydsu+53WOocdWk3AW0/cXBEx1qAlhIC0LUDy459pbQ="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ dpkt ]; + dependencies = [ dpkt ]; nativeCheckInputs = [ mock @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/marss/aiortsp"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/aioruckus/default.nix b/python/pkgs/aioruckus/default.nix index 39cf9aeee..570fa8779 100644 --- a/python/pkgs/aioruckus/default.nix +++ b/python/pkgs/aioruckus/default.nix @@ -12,7 +12,7 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioruckus"; version = "0.46.3"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ms264556"; repo = "aioruckus"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-17vcYdggtoeAtGShshseBMB4PSiIOf00nRNIHOAP9Jw="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://github.com/ms264556/aioruckus"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/aiorun/default.nix b/python/pkgs/aiorun/default.nix index 372818f97..faedd6994 100644 --- a/python/pkgs/aiorun/default.nix +++ b/python/pkgs/aiorun/default.nix @@ -8,7 +8,7 @@ uvloop, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiorun"; version = "2025.1.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cjrh"; repo = "aiorun"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YqUlWf79EbC47BETBDjo8hzg5jhL4LiWLKGr1Qy4AbM="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/cjrh/aiorun"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aioruuvigateway/default.nix b/python/pkgs/aioruuvigateway/default.nix index 56ff8a349..677508b54 100644 --- a/python/pkgs/aioruuvigateway/default.nix +++ b/python/pkgs/aioruuvigateway/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioruuvigateway"; version = "0.1.0"; pyproject = true; @@ -18,13 +18,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "akx"; repo = "aioruuvigateway"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Etv+kPFYEK79hpDeNmDfuyNj1vJ6udry1u+TRO5gLV4="; }; nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools httpx ]; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/akx/aioruuvigateway"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aioserial/default.nix b/python/pkgs/aioserial/default.nix index 2e825c86e..b7fcaf9d8 100644 --- a/python/pkgs/aioserial/default.nix +++ b/python/pkgs/aioserial/default.nix @@ -2,23 +2,32 @@ lib, buildPythonPackage, fetchPypi, + # build-system + poetry-core, pyserial, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioserial"; version = "1.3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cCvwOw64S47y2NrFy5JeHmhdzpj3exJVabxv0rO1gig="; }; - propagatedBuildInputs = [ pyserial ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" \ + --replace-fail 'requires = ["poetry>=0.12"]' 'requires = ["poetry-core"]' + ''; + + build-system = [ poetry-core ]; + + dependencies = [ pyserial ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "aioserial" ]; @@ -27,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/changyuheng/aioserial"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/aiosignal/default.nix b/python/pkgs/aiosignal/default.nix index 999dcdfdf..25d63c59b 100644 --- a/python/pkgs/aiosignal/default.nix +++ b/python/pkgs/aiosignal/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiosignal"; version = "1.4.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "aiosignal"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-b46/LGoCeL4mhbBPAiPir7otzKKrlKcEFzn8pG/foh0="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/aiosignal"; license = with lib.licenses; [ asl20 ]; }; -} +}) diff --git a/python/pkgs/aioslimproto/default.nix b/python/pkgs/aioslimproto/default.nix index 15b6e3967..727d64b57 100644 --- a/python/pkgs/aioslimproto/default.nix +++ b/python/pkgs/aioslimproto/default.nix @@ -34,7 +34,6 @@ buildPythonPackage (finalAttrs: { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "aioslimproto" ]; diff --git a/python/pkgs/aiosmb/default.nix b/python/pkgs/aiosmb/default.nix index f02c391e9..fadd00411 100644 --- a/python/pkgs/aiosmb/default.nix +++ b/python/pkgs/aiosmb/default.nix @@ -16,13 +16,13 @@ winsspi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiosmb"; version = "0.4.14"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-So6u+sX7EOEIjrYejfWK/z/mH9bxHOcu/YpjF1VfAsM="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/skelsec/aiosmb"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiosmtpd/default.nix b/python/pkgs/aiosmtpd/default.nix index b4e92613a..ba7dff937 100644 --- a/python/pkgs/aiosmtpd/default.nix +++ b/python/pkgs/aiosmtpd/default.nix @@ -13,7 +13,7 @@ aiosmtplib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiosmtpd"; version = "1.4.6"; pyproject = true; @@ -21,13 +21,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "aiosmtpd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Ih/xbWM9O/fFQiZezydlPlIr36fLRc2lLgdfxD5Jviw="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ atpublic attrs ]; @@ -38,7 +38,6 @@ buildPythonPackage rec { ]; # Fixes can't be applied easily, https://github.com/aio-libs/aiosmtpd/pull/294 - doCheck = false; disabledTests = [ # Requires git @@ -59,4 +58,4 @@ buildPythonPackage rec { ''; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiosolaredge/default.nix b/python/pkgs/aiosolaredge/default.nix index 43c07e182..61f81298a 100644 --- a/python/pkgs/aiosolaredge/default.nix +++ b/python/pkgs/aiosolaredge/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiosolaredge"; version = "1.0.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = "aiosolaredge"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1RdkYcdhhU+MaP91iJ1tSrL0OlUi6Il1XBXnmRYhC7g="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/bdraco/aiosolaredge"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiosomecomfort/default.nix b/python/pkgs/aiosomecomfort/default.nix index 0c871b812..d2f3345c1 100644 --- a/python/pkgs/aiosomecomfort/default.nix +++ b/python/pkgs/aiosomecomfort/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiosomecomfort"; version = "0.0.38"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkmer"; repo = "AIOSomecomfort"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tjJazA5MFIr3Z3I8l9g6SngH6U616e9jWXfMrim2wPo="; }; @@ -35,11 +35,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiosomecomfort" ]; # Tests only run on Windows, due to WindowsSelectorEventLoopPolicy - doCheck = false; meta = { description = "AsyicIO client for US models of Honeywell Thermostats"; homepage = "https://github.com/mkmer/AIOSomecomfort"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/aiosonos/default.nix b/python/pkgs/aiosonos/default.nix index 64b06ae1f..f6f3b23ab 100644 --- a/python/pkgs/aiosonos/default.nix +++ b/python/pkgs/aiosonos/default.nix @@ -37,8 +37,6 @@ buildPythonPackage (finalAttrs: { brotli ]; - doCheck = false; # no tests - pythonImportsCheck = [ "aiosonos" "aiosonos.api" diff --git a/python/pkgs/aiosqlite/default.nix b/python/pkgs/aiosqlite/default.nix index 5715193cb..b6a98224b 100644 --- a/python/pkgs/aiosqlite/default.nix +++ b/python/pkgs/aiosqlite/default.nix @@ -6,7 +6,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiosqlite"; version = "0.21.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "omnilib"; repo = "aiosqlite"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3l/uR97WuLlkAEdogL9iYoXp89bsAcpH6XEtMELsX9o="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/jreese/aiosqlite"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiosseclient/default.nix b/python/pkgs/aiosseclient/default.nix index 8ef09597c..789a381a4 100644 --- a/python/pkgs/aiosseclient/default.nix +++ b/python/pkgs/aiosseclient/default.nix @@ -6,7 +6,7 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiosseclient"; version = "0.1.8"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ebraminio"; repo = "aiosseclient"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ynWqRQsCuog8myNleJDdp+omyujmNB1Ys7O6gU2AaUc="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; # Test requires network access - doCheck = false; pythonImportsCheck = [ "aiosseclient" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/ebraminio/aiosseclient"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiosteamist/default.nix b/python/pkgs/aiosteamist/default.nix index abc5dc0b8..2c1432029 100644 --- a/python/pkgs/aiosteamist/default.nix +++ b/python/pkgs/aiosteamist/default.nix @@ -9,7 +9,7 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiosteamist"; version = "1.0.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = "aiosteamist"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-e7Nt/o2A1qn2nSpWv6ZsZHn/WpcXKzol+f+JNJaSb4w="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/bdraco/aiosteamist"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiostream/default.nix b/python/pkgs/aiostream/default.nix index 0e7d2fbc8..c647c45fd 100644 --- a/python/pkgs/aiostream/default.nix +++ b/python/pkgs/aiostream/default.nix @@ -6,13 +6,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiostream"; version = "0.7.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JyqqDY+DvrkG9aqQIrtZBGu3oQP6N3D4B8MfkYWVrPY="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://aiostream.readthedocs.io"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/aiostreammagic/default.nix b/python/pkgs/aiostreammagic/default.nix index 25ed37279..e29adb0d9 100644 --- a/python/pkgs/aiostreammagic/default.nix +++ b/python/pkgs/aiostreammagic/default.nix @@ -31,7 +31,6 @@ buildPythonPackage (finalAttrs: { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "aiostreammagic" ]; diff --git a/python/pkgs/aiosyncthing/default.nix b/python/pkgs/aiosyncthing/default.nix index 1b28c13f5..6ebf75c5f 100644 --- a/python/pkgs/aiosyncthing/default.nix +++ b/python/pkgs/aiosyncthing/default.nix @@ -14,7 +14,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiosyncthing"; version = "0.7.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zhulik"; repo = "aiosyncthing"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0jx61zs6yQqAIwSOO1zCUOkoZES+K/POtIGoWzr29bI="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/zhulik/aiosyncthing"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiotarfile/default.nix b/python/pkgs/aiotarfile/default.nix index ef547a956..a900a44d1 100644 --- a/python/pkgs/aiotarfile/default.nix +++ b/python/pkgs/aiotarfile/default.nix @@ -10,7 +10,7 @@ semver, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiotarfile"; version = "0.5.2"; pyproject = true; @@ -18,12 +18,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rhelmot"; repo = "aiotarfile"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-V88cvVw6ss7iiojhlqDd2frG/gCEH0YKTP0IpgeFASw="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-Yf6N615X9ZB+HDp3xehMc3kjKbdsSbIJrqARRXwCRDQ="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/rhelmot/aiotarfile"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiotedee/default.nix b/python/pkgs/aiotedee/default.nix index 11c22f81a..137054475 100644 --- a/python/pkgs/aiotedee/default.nix +++ b/python/pkgs/aiotedee/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiotedee"; version = "0.3.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zweckj"; repo = "aiotedee"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0+wUQRsMb9y8XUwwUX3exIzkaAFLYNUpsAr0MgnkMIo="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/zweckj/aiotedee"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiounittest/default.nix b/python/pkgs/aiounittest/default.nix index f5c892f8b..827b584da 100644 --- a/python/pkgs/aiounittest/default.nix +++ b/python/pkgs/aiounittest/default.nix @@ -6,7 +6,7 @@ wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiounittest"; version = "1.5.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kwarunek"; repo = "aiounittest"; - tag = version; + tag = finalAttrs.version; hash = "sha256-zX3KpDw7AaEwOLkiHX/ZD+rSMeN7qi9hOVAmVH6Jxgg="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/kwarunek/aiounittest"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiousbwatcher/default.nix b/python/pkgs/aiousbwatcher/default.nix index 31aab6db0..f8134bf81 100644 --- a/python/pkgs/aiousbwatcher/default.nix +++ b/python/pkgs/aiousbwatcher/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiousbwatcher"; version = "1.1.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "aiousbwatcher"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kCuY4+pdfnO8BuYSQjZEyGxSaCwVYXRHWYhnbzxlDzM="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Bluetooth-Devices/aiousbwatcher"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiowebostv/default.nix b/python/pkgs/aiowebostv/default.nix index 0141ea060..575856fcc 100644 --- a/python/pkgs/aiowebostv/default.nix +++ b/python/pkgs/aiowebostv/default.nix @@ -6,7 +6,7 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiowebostv"; version = "0.10.0"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "aiowebostv"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LtQkuAoqC6ELlcz56m0J+v8IuGGJn9SAoQsUNoL76m0="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -28,7 +28,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "aiowebostv" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-libs/aiowebostv"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aiowinreg/default.nix b/python/pkgs/aiowinreg/default.nix index d16547a78..83be6ae2f 100644 --- a/python/pkgs/aiowinreg/default.nix +++ b/python/pkgs/aiowinreg/default.nix @@ -7,7 +7,7 @@ winacl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiowinreg"; version = "0.0.13"; pyproject = true; @@ -15,19 +15,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "skelsec"; repo = "aiowinreg"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vY5SrGTFH/xsv9k2WciE0xNx9r3W53sxxLGXFX34EuE="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ prompt-toolkit winacl ]; # Project doesn't have tests - doCheck = false; pythonImportsCheck = [ "aiowinreg" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "awinreg"; }; -} +}) diff --git a/python/pkgs/aiowmi/default.nix b/python/pkgs/aiowmi/default.nix index 0c7651d48..8cfd9e4b7 100644 --- a/python/pkgs/aiowmi/default.nix +++ b/python/pkgs/aiowmi/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiowmi"; version = "1.1.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cesbit"; repo = "aiowmi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5pXMNufMdlB2FAQwsODA7S8PL/OhPFzFzpU9KB+Jtgc="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/cesbit/aiowmi"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/aioymaps/default.nix b/python/pkgs/aioymaps/default.nix index e40c54433..ad24af449 100644 --- a/python/pkgs/aioymaps/default.nix +++ b/python/pkgs/aioymaps/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioymaps"; version = "1.2.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tEl2tX/mB8uYTYj1YFDs/2sPXiv6897jCEmsFCWBXYg="; }; @@ -21,7 +21,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "aioymaps" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/devbis/aioymaps"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aiozeroconf/default.nix b/python/pkgs/aiozeroconf/default.nix index 8dad213db..b217af9e7 100644 --- a/python/pkgs/aiozeroconf/default.nix +++ b/python/pkgs/aiozeroconf/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiozeroconf"; version = "0.1.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ENupazLlOqfwHugNLEgeTZjPOYxRgznuCKHpU5unlxw="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl21Only; mainProgram = "aiozeroconf"; }; -} +}) diff --git a/python/pkgs/aiozoneinfo/default.nix b/python/pkgs/aiozoneinfo/default.nix index f8fff9e2c..a08fda72a 100644 --- a/python/pkgs/aiozoneinfo/default.nix +++ b/python/pkgs/aiozoneinfo/default.nix @@ -9,7 +9,7 @@ tzdata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiozoneinfo"; version = "0.2.3"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "aiozoneinfo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7qd6Yk/K4BLocu8eQK0hLaw2r1jhWIHBr9W4KsAvmx8="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/bluetooth-devices/aiozoneinfo"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/airium/default.nix b/python/pkgs/airium/default.nix index c1038b565..3fbc7b725 100644 --- a/python/pkgs/airium/default.nix +++ b/python/pkgs/airium/default.nix @@ -7,7 +7,7 @@ beautifulsoup4, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "airium"; version = "0.2.7"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "kamichal"; repo = "airium"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sXyqGYBjyQ3Ig1idw+omrjj+ElknN9oemzob7NxFppo="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "airium"; }; -} +}) diff --git a/python/pkgs/airly/default.nix b/python/pkgs/airly/default.nix index 2115e2be1..5d8ea144e 100644 --- a/python/pkgs/airly/default.nix +++ b/python/pkgs/airly/default.nix @@ -15,8 +15,6 @@ buildPythonPackage (finalAttrs: { version = "1.1.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "ak-ambi"; repo = "python-airly"; diff --git a/python/pkgs/airportsdata/default.nix b/python/pkgs/airportsdata/default.nix index c83b2195d..8fe69183e 100644 --- a/python/pkgs/airportsdata/default.nix +++ b/python/pkgs/airportsdata/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "airportsdata"; version = "20251008"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mborsetti"; repo = "airportsdata"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9Y4W5yhICiB5Py36RoVTe7obVtKUaUf0du2i1AihFdE="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/mborsetti/airportsdata/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/airthings-cloud/default.nix b/python/pkgs/airthings-cloud/default.nix index cc7ce97cc..1392c411f 100644 --- a/python/pkgs/airthings-cloud/default.nix +++ b/python/pkgs/airthings-cloud/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "airthings" ]; diff --git a/python/pkgs/airtouch4pyapi/default.nix b/python/pkgs/airtouch4pyapi/default.nix index 6133da353..dad53cb2a 100644 --- a/python/pkgs/airtouch4pyapi/default.nix +++ b/python/pkgs/airtouch4pyapi/default.nix @@ -2,25 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "airtouch4pyapi"; version = "1.0.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "LonePurpleWolf"; repo = "airtouch4pyapi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RiRwebumidn0nijL/e9J74ZYx0DASi1up5BTNxYoGEA="; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "airtouch4pyapi" ]; @@ -29,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/LonePurpleWolf/airtouch4pyapi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ajpy/default.nix b/python/pkgs/ajpy/default.nix index fc3597f49..a4b11d8af 100644 --- a/python/pkgs/ajpy/default.nix +++ b/python/pkgs/ajpy/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ajpy"; version = "0.0.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-MBDh9APWJgnsC71p3B2WtZLYpmJ6H11FNSj6f4CofJw="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "ajpy" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/hypn0s/AJPy"; license = lib.licenses.lgpl2Only; }; -} +}) diff --git a/python/pkgs/ajsonrpc/default.nix b/python/pkgs/ajsonrpc/default.nix index 0d2cb7d93..d86493d5d 100644 --- a/python/pkgs/ajsonrpc/default.nix +++ b/python/pkgs/ajsonrpc/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ajsonrpc"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eRusGPC/De4QkZRkTxUc+Lf/UpxLjWI5rEgQSjJRoZ8="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/pavlov99/ajsonrpc"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/alabaster/default.nix b/python/pkgs/alabaster/default.nix index 0f6e238e4..b26e0da47 100644 --- a/python/pkgs/alabaster/default.nix +++ b/python/pkgs/alabaster/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "alabaster"; version = "1.0.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-doc"; repo = "alabaster"; - tag = version; + tag = finalAttrs.version; hash = "sha256-aQEhFZUJs0TptfpjQVoIVI9V9a+xKjE2OfStSaJKHGI="; }; @@ -22,11 +22,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "alabaster" ]; # No tests included - doCheck = false; meta = { homepage = "https://github.com/sphinx-doc/alabaster"; description = "Light, configurable Sphinx theme"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/aladdin-connect/default.nix b/python/pkgs/aladdin-connect/default.nix index ac8c9f4fa..59404083b 100644 --- a/python/pkgs/aladdin-connect/default.nix +++ b/python/pkgs/aladdin-connect/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ requests ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "aladdin_connect" ]; diff --git a/python/pkgs/alectryon/default.nix b/python/pkgs/alectryon/default.nix index 39d701ecb..b28edbad8 100644 --- a/python/pkgs/alectryon/default.nix +++ b/python/pkgs/alectryon/default.nix @@ -34,8 +34,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alectryon" ]; - doCheck = false; - meta = { homepage = "https://github.com/cpitclaudel/alectryon"; description = "Collection of tools for writing technical documents that mix Coq code and prose"; diff --git a/python/pkgs/alembic/default.nix b/python/pkgs/alembic/default.nix index 9cd519b5a..5f800358e 100644 --- a/python/pkgs/alembic/default.nix +++ b/python/pkgs/alembic/default.nix @@ -12,13 +12,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "alembic"; version = "1.19.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-KXlQqKkfZ3Drgr+86b6lXHKLkKU4bG6BQwGRoxnROLA="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "alembic"; }; -} +}) diff --git a/python/pkgs/alexapy/default.nix b/python/pkgs/alexapy/default.nix index 096e0db4e..7104f5e3d 100644 --- a/python/pkgs/alexapy/default.nix +++ b/python/pkgs/alexapy/default.nix @@ -49,7 +49,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alexapy" ]; # Module has no tests (only a websocket test which seems unrelated to the module) - doCheck = false; meta = { description = "Python Package for controlling Alexa devices (echo dot, etc) programmatically"; diff --git a/python/pkgs/alibabacloud-actiontrail20200706/default.nix b/python/pkgs/alibabacloud-actiontrail20200706/default.nix index 6f94492eb..da80ae4a8 100644 --- a/python/pkgs/alibabacloud-actiontrail20200706/default.nix +++ b/python/pkgs/alibabacloud-actiontrail20200706/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "2.6.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_actiontrail20200706"; inherit (finalAttrs) version; @@ -31,7 +29,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_actiontrail20200706" ]; # Module has no tests - doCheck = false; passthru.updateScript = nix-update-script { }; diff --git a/python/pkgs/alibabacloud-credentials-api/default.nix b/python/pkgs/alibabacloud-credentials-api/default.nix index 7cfb27135..291820ba4 100644 --- a/python/pkgs/alibabacloud-credentials-api/default.nix +++ b/python/pkgs/alibabacloud-credentials-api/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_credentials_api" ]; # Module has only tests in the untagged upstream repo - doCheck = false; meta = { description = "Aliyun Credentials API Library for Python"; diff --git a/python/pkgs/alibabacloud-credentials/default.nix b/python/pkgs/alibabacloud-credentials/default.nix index 477dc9bb2..a166f07d6 100644 --- a/python/pkgs/alibabacloud-credentials/default.nix +++ b/python/pkgs/alibabacloud-credentials/default.nix @@ -20,7 +20,10 @@ buildPythonPackage (finalAttrs: { hash = "sha256-h9pB6j/7FGtE2ZnGLBYMK5awwwJ1rjUgW83+eboMQRk="; }; - pythonRelaxDeps = [ "aiofiles" ]; + pythonRelaxDeps = [ + "aiofiles" + "apscheduler" + ]; build-system = [ setuptools ]; @@ -34,7 +37,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_credentials" ]; # Module has only tests in the untagged upstream repo - doCheck = false; meta = { description = "Aliyun Credentials Library for Python"; diff --git a/python/pkgs/alibabacloud-cs20151215/default.nix b/python/pkgs/alibabacloud-cs20151215/default.nix index 9c4f2fb04..27685eb46 100644 --- a/python/pkgs/alibabacloud-cs20151215/default.nix +++ b/python/pkgs/alibabacloud-cs20151215/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "7.2.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_cs20151215"; inherit (finalAttrs) version; @@ -30,7 +28,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_cs20151215" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud CS (20151215) SDK Library for Python"; diff --git a/python/pkgs/alibabacloud-darabonba-array/default.nix b/python/pkgs/alibabacloud-darabonba-array/default.nix index 70c2d43ab..50503b6b2 100644 --- a/python/pkgs/alibabacloud-darabonba-array/default.nix +++ b/python/pkgs/alibabacloud-darabonba-array/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_darabonba_array"; inherit (finalAttrs) version; @@ -23,7 +21,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_darabonba_array" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud Darabonba Array SDK Library for Python"; diff --git a/python/pkgs/alibabacloud-darabonba-encode-util/default.nix b/python/pkgs/alibabacloud-darabonba-encode-util/default.nix index fd7276d3c..c8b8d2cd3 100644 --- a/python/pkgs/alibabacloud-darabonba-encode-util/default.nix +++ b/python/pkgs/alibabacloud-darabonba-encode-util/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.3"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_darabonba_encode_util"; inherit (finalAttrs) version; @@ -23,7 +21,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_darabonba_encode_util" ]; # Module has no tests - doCheck = false; meta = { description = "Darabonba Encode Util Library for Alibaba Cloud Python SDK"; diff --git a/python/pkgs/alibabacloud-darabonba-map/default.nix b/python/pkgs/alibabacloud-darabonba-map/default.nix index 912be1799..c81146104 100644 --- a/python/pkgs/alibabacloud-darabonba-map/default.nix +++ b/python/pkgs/alibabacloud-darabonba-map/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_darabonba_map"; inherit (finalAttrs) version; @@ -23,7 +21,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_darabonba_map" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud Darabonba Map SDK Library for Python"; diff --git a/python/pkgs/alibabacloud-darabonba-signature-util/default.nix b/python/pkgs/alibabacloud-darabonba-signature-util/default.nix index 3ca9fb155..89d11f015 100644 --- a/python/pkgs/alibabacloud-darabonba-signature-util/default.nix +++ b/python/pkgs/alibabacloud-darabonba-signature-util/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.4"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_darabonba_signature_util"; inherit (finalAttrs) version; @@ -26,7 +24,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_darabonba_signature_util" ]; # Module has no tests - doCheck = false; meta = { description = "Darabonba Signature Util Library for Alibaba Cloud Python SDK"; diff --git a/python/pkgs/alibabacloud-darabonba-string/default.nix b/python/pkgs/alibabacloud-darabonba-string/default.nix index f9a875c83..388f4831b 100644 --- a/python/pkgs/alibabacloud-darabonba-string/default.nix +++ b/python/pkgs/alibabacloud-darabonba-string/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.4"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) version pname; hash = "sha256-7GYUwESNrcvF5GZIWDih+M/dkRE1vqc54gsUURJwxvc="; @@ -22,7 +20,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_darabonba_string" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud Darabonba String Library for Python"; diff --git a/python/pkgs/alibabacloud-darabonba-time/default.nix b/python/pkgs/alibabacloud-darabonba-time/default.nix index 91ea0167a..9235f58b5 100644 --- a/python/pkgs/alibabacloud-darabonba-time/default.nix +++ b/python/pkgs/alibabacloud-darabonba-time/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_darabonba_time"; inherit (finalAttrs) version; @@ -23,7 +21,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_darabonba_time" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud Darabonba Time SDK Library for Python"; diff --git a/python/pkgs/alibabacloud-ecs20140526/default.nix b/python/pkgs/alibabacloud-ecs20140526/default.nix index 9f3eb086a..d240e6cc4 100644 --- a/python/pkgs/alibabacloud-ecs20140526/default.nix +++ b/python/pkgs/alibabacloud-ecs20140526/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "7.11.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_ecs20140526"; inherit (finalAttrs) version; @@ -30,7 +28,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_ecs20140526" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud Elastic Compute Service (20140526) SDK Library for Python"; diff --git a/python/pkgs/alibabacloud-endpoint-util/default.nix b/python/pkgs/alibabacloud-endpoint-util/default.nix index dc5c81b53..b52ebdf72 100644 --- a/python/pkgs/alibabacloud-endpoint-util/default.nix +++ b/python/pkgs/alibabacloud-endpoint-util/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "alibabacloud-endpoint-util"; version = "0.0.4"; pyproject = true; src = fetchPypi { pname = "alibabacloud_endpoint_util"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-pZPrjd2BaNXcIhbNMxEbFE+RifzW6cog5I81inObv5A="; }; @@ -21,11 +21,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "alibabacloud_endpoint_util" ]; # Module has only tests in the untagged upstream repo - doCheck = false; meta = { description = "Endpoint-util module of alibabaCloud Python SDK"; homepage = "https://pypi.org/project/alibabacloud-endpoint-util/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/alibabacloud-gateway-oss-util/default.nix b/python/pkgs/alibabacloud-gateway-oss-util/default.nix index 1cae818c7..b94b839b3 100644 --- a/python/pkgs/alibabacloud-gateway-oss-util/default.nix +++ b/python/pkgs/alibabacloud-gateway-oss-util/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.13"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_gateway_oss_util"; inherit (finalAttrs) version; @@ -23,7 +21,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_gateway_oss_util" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud OSS Util Library for Python"; diff --git a/python/pkgs/alibabacloud-gateway-oss/default.nix b/python/pkgs/alibabacloud-gateway-oss/default.nix index 5741fb8a8..ab9606406 100644 --- a/python/pkgs/alibabacloud-gateway-oss/default.nix +++ b/python/pkgs/alibabacloud-gateway-oss/default.nix @@ -23,8 +23,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.29"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_gateway_oss"; inherit (finalAttrs) version; @@ -52,7 +50,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_gateway_oss" ]; # Module has only tests in the untagged upstream repo - doCheck = false; meta = { description = "Aliyun Gateway OSS Library for Python"; diff --git a/python/pkgs/alibabacloud-gateway-spi/default.nix b/python/pkgs/alibabacloud-gateway-spi/default.nix index 8487e1e9b..49458f1b6 100644 --- a/python/pkgs/alibabacloud-gateway-spi/default.nix +++ b/python/pkgs/alibabacloud-gateway-spi/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.4"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_gateway_spi"; inherit (finalAttrs) version; @@ -26,7 +24,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_gateway_spi" ]; # Module has only tests in the untagged upstream repo - doCheck = false; meta = { description = "Aliyun Gateway SPI Library for Python"; diff --git a/python/pkgs/alibabacloud-openapi-util/default.nix b/python/pkgs/alibabacloud-openapi-util/default.nix index 8e001121f..a01b3e0d5 100644 --- a/python/pkgs/alibabacloud-openapi-util/default.nix +++ b/python/pkgs/alibabacloud-openapi-util/default.nix @@ -28,7 +28,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_openapi_util" ]; # Module has only tests in the untagged upstream repo - doCheck = false; meta = { description = "Aliyun Tea OpenApi Library for Python"; diff --git a/python/pkgs/alibabacloud-oss-util/default.nix b/python/pkgs/alibabacloud-oss-util/default.nix index cef1b6d46..ad47e04f0 100644 --- a/python/pkgs/alibabacloud-oss-util/default.nix +++ b/python/pkgs/alibabacloud-oss-util/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.6"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_oss_util"; inherit (finalAttrs) version; @@ -26,7 +24,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_oss_util" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud Cloud OSS Util Library for Python"; diff --git a/python/pkgs/alibabacloud-oss20190517/default.nix b/python/pkgs/alibabacloud-oss20190517/default.nix index 08a3af437..0149fde71 100644 --- a/python/pkgs/alibabacloud-oss20190517/default.nix +++ b/python/pkgs/alibabacloud-oss20190517/default.nix @@ -15,8 +15,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.6"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_oss20190517"; inherit (finalAttrs) version; @@ -36,7 +34,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_oss20190517" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud Object Storage Service (20190517) SDK Library for Python"; diff --git a/python/pkgs/alibabacloud-ram20150501/default.nix b/python/pkgs/alibabacloud-ram20150501/default.nix index 711d6bfc8..92f480682 100644 --- a/python/pkgs/alibabacloud-ram20150501/default.nix +++ b/python/pkgs/alibabacloud-ram20150501/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "1.3.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_ram20150501"; inherit (finalAttrs) version; @@ -34,7 +32,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_ram20150501" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud Resource Access Management (20150501) SDK Library for Python"; diff --git a/python/pkgs/alibabacloud-rds20140815/default.nix b/python/pkgs/alibabacloud-rds20140815/default.nix index 11a1d7e80..03b269e4a 100644 --- a/python/pkgs/alibabacloud-rds20140815/default.nix +++ b/python/pkgs/alibabacloud-rds20140815/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "15.9.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_rds20140815"; inherit (finalAttrs) version; @@ -34,7 +32,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_rds20140815" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud rds (20140815) SDK Library for Python"; diff --git a/python/pkgs/alibabacloud-sas20181203/default.nix b/python/pkgs/alibabacloud-sas20181203/default.nix index a81df0d2b..5f6465b66 100644 --- a/python/pkgs/alibabacloud-sas20181203/default.nix +++ b/python/pkgs/alibabacloud-sas20181203/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "10.1.2"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_sas20181203"; inherit (finalAttrs) version; @@ -30,7 +28,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_sas20181203" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud Threat Detection (20181203) SDK Library for Python"; diff --git a/python/pkgs/alibabacloud-sts20150401/default.nix b/python/pkgs/alibabacloud-sts20150401/default.nix index 51ae9b122..913bf3fb6 100644 --- a/python/pkgs/alibabacloud-sts20150401/default.nix +++ b/python/pkgs/alibabacloud-sts20150401/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "1.2.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_sts20150401"; inherit (finalAttrs) version; @@ -30,7 +28,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_sts20150401" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud Sts (20150401) SDK Library for Python"; diff --git a/python/pkgs/alibabacloud-tea-openapi/default.nix b/python/pkgs/alibabacloud-tea-openapi/default.nix index 925807223..8357d6741 100644 --- a/python/pkgs/alibabacloud-tea-openapi/default.nix +++ b/python/pkgs/alibabacloud-tea-openapi/default.nix @@ -36,7 +36,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "Tea" ]; # Module has only tests in the untagged upstream repo - doCheck = false; meta = { description = "Aliyun Tea OpenAPI Library for Python"; diff --git a/python/pkgs/alibabacloud-tea-util/default.nix b/python/pkgs/alibabacloud-tea-util/default.nix index 0b9af9432..dab0d4902 100644 --- a/python/pkgs/alibabacloud-tea-util/default.nix +++ b/python/pkgs/alibabacloud-tea-util/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.3.15"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_tea_util"; inherit (finalAttrs) version; @@ -26,7 +24,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_tea_util" ]; # Module has only tests in the untagged upstream repo - doCheck = false; meta = { description = "Aliyun Tea Util Library for Python"; diff --git a/python/pkgs/alibabacloud-tea-xml/default.nix b/python/pkgs/alibabacloud-tea-xml/default.nix index 1411f4c5f..9b7c34483 100644 --- a/python/pkgs/alibabacloud-tea-xml/default.nix +++ b/python/pkgs/alibabacloud-tea-xml/default.nix @@ -24,7 +24,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_tea_xml" ]; # Module has only tests in the untagged upstream repo - doCheck = false; meta = { description = "Aliyun Tea XML Library for Python"; diff --git a/python/pkgs/alibabacloud-tea/default.nix b/python/pkgs/alibabacloud-tea/default.nix index 2f82a50f9..fb035e79d 100644 --- a/python/pkgs/alibabacloud-tea/default.nix +++ b/python/pkgs/alibabacloud-tea/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "alibabacloud-tea"; version = "0.4.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7IBT0KqNQ+vh3rYy1cVAQzmznsmhigcH1Xdlg4QYUEo="; }; @@ -27,11 +27,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "Tea" ]; # Module has only tests in the untagged upstream repo - doCheck = false; meta = { description = "Aliyun Tea Library for Python"; homepage = "https://pypi.org/project/alibabacloud-tea/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/alibabacloud-vpc20160428/default.nix b/python/pkgs/alibabacloud-vpc20160428/default.nix index 2c2f6abf9..4eb9931d5 100644 --- a/python/pkgs/alibabacloud-vpc20160428/default.nix +++ b/python/pkgs/alibabacloud-vpc20160428/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "7.2.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "alibabacloud_vpc20160428"; inherit (finalAttrs) version; @@ -30,7 +28,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "alibabacloud_vpc20160428" ]; # Module has no tests - doCheck = false; meta = { description = "Alibaba Cloud Virtual Private Cloud (20160428) SDK Library for Python"; diff --git a/python/pkgs/alive-progress/default.nix b/python/pkgs/alive-progress/default.nix index 8d7fa7782..e22909072 100644 --- a/python/pkgs/alive-progress/default.nix +++ b/python/pkgs/alive-progress/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "alive-progress"; version = "3.3.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rsalmei"; repo = "alive-progress"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2ymLdmaV7mO6tp5bjmbL/67xLP7Srfpt5m8YhOHGmWQ="; # Avoid downloading heavy images in img directory sparseCheckout = [ @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/rsalmei/alive-progress"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aliyun-log-fastpb/default.nix b/python/pkgs/aliyun-log-fastpb/default.nix index f7a7db5b8..e8ebc1f48 100644 --- a/python/pkgs/aliyun-log-fastpb/default.nix +++ b/python/pkgs/aliyun-log-fastpb/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "0.3.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "aliyun_log_fastpb"; inherit (finalAttrs) version; @@ -34,7 +32,6 @@ buildPythonPackage (finalAttrs: { ]; # Missing dependency logs_pb2 - doCheck = false; pythonImportsCheck = [ "aliyun_log_fastpb" ]; diff --git a/python/pkgs/aliyun-python-sdk-core/default.nix b/python/pkgs/aliyun-python-sdk-core/default.nix index 15f5f4b6f..427e48016 100644 --- a/python/pkgs/aliyun-python-sdk-core/default.nix +++ b/python/pkgs/aliyun-python-sdk-core/default.nix @@ -27,7 +27,6 @@ buildPythonPackage (finalAttrs: { ]; # All components are stored in a mono repo - doCheck = false; pythonImportsCheck = [ "aliyunsdkcore" ]; diff --git a/python/pkgs/aliyun-python-sdk/default.nix b/python/pkgs/aliyun-python-sdk/default.nix index a3a69bd2c..d8809cb64 100644 --- a/python/pkgs/aliyun-python-sdk/default.nix +++ b/python/pkgs/aliyun-python-sdk/default.nix @@ -25,7 +25,6 @@ let dependencies = [ aliyun-python-sdk-core ]; # All components are stored in a mono repo - doCheck = false; pythonImportsCheck = [ "aliyunsdk${toUnderscore serviceName}" ]; @@ -52,8 +51,6 @@ let dependencies = [ aliyun-python-sdk-core ]; - doCheck = false; - pythonImportsCheck = [ "aliyunsdk${toUnderscore serviceName}" ]; meta = { diff --git a/python/pkgs/allantools/default.nix b/python/pkgs/allantools/default.nix index 1c5b0e702..b8b9d3d75 100644 --- a/python/pkgs/allantools/default.nix +++ b/python/pkgs/allantools/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "allantools"; version = "2024.06"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aewallin"; repo = "allantools"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dF19aSpIioOm0BnwrLkMe/DtfgWSKFnX4c/Xs1O2Quw="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/aewallin/allantools"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/allpairspy/default.nix b/python/pkgs/allpairspy/default.nix index 27f51605c..479df25b4 100644 --- a/python/pkgs/allpairspy/default.nix +++ b/python/pkgs/allpairspy/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "allpairspy"; version = "2.5.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thombashi"; repo = "allpairspy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0wzoQDHB7Tt80ZTlKrNxFutztsgUuin5D2eb80c4PBI="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/thombashi/allpairspy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/allure-pytest/default.nix b/python/pkgs/allure-pytest/default.nix index 5fb61c41a..b95235feb 100644 --- a/python/pkgs/allure-pytest/default.nix +++ b/python/pkgs/allure-pytest/default.nix @@ -4,10 +4,11 @@ buildPythonPackage, fetchFromGitHub, pytest, + setuptools_80, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "allure-pytest"; version = "2.15.3"; pyproject = true; @@ -15,20 +16,24 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "allure-framework"; repo = "allure-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-06SKodvyoT0mYn4RmAIryZc+VyTI79KXFK+2/zuhzQ0="; }; - sourceRoot = "${src.name}/allure-pytest"; + sourceRoot = "${finalAttrs.src.name}/allure-pytest"; - build-system = [ setuptools-scm ]; + pythonRelaxDeps = [ "allure-python-commons" ]; + + build-system = [ + setuptools_80 + setuptools-scm + ]; buildInputs = [ pytest ]; dependencies = [ allure-python-commons ]; # Tests were moved to the meta package - doCheck = false; pythonImportsCheck = [ "allure_pytest" ]; @@ -37,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/allure-framework/allure-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/allure-python-commons-test/default.nix b/python/pkgs/allure-python-commons-test/default.nix index 12cd9d4d9..decdfefde 100644 --- a/python/pkgs/allure-python-commons-test/default.nix +++ b/python/pkgs/allure-python-commons-test/default.nix @@ -10,17 +10,22 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "allure-python-commons-test"; version = "2.16.0"; pyproject = true; src = fetchPypi { pname = "allure_python_commons_test"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-otfGxWNnbMUGuQcqsroOOfiqhCQqe25c39Ur57ek2og="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'setuptools_scm<10' 'setuptools_scm' + ''; + build-system = [ setuptools-scm ]; dependencies = [ @@ -44,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/allure-framework/allure-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/allure-python-commons/default.nix b/python/pkgs/allure-python-commons/default.nix index e8bed1616..edee584e3 100644 --- a/python/pkgs/allure-python-commons/default.nix +++ b/python/pkgs/allure-python-commons/default.nix @@ -10,14 +10,14 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "allure-python-commons"; version = "2.16.0"; pyproject = true; src = fetchPypi { pname = "allure_python_commons"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-7NySuv6gdLq5a18sTrMQCCU0AYj1rs5giugOztcJs28="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/allure-framework/allure-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/alpha-vantage/default.nix b/python/pkgs/alpha-vantage/default.nix index c0c91399b..3c5a658d0 100644 --- a/python/pkgs/alpha-vantage/default.nix +++ b/python/pkgs/alpha-vantage/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "alpha-vantage"; version = "3.0.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RomelTorres"; repo = "alpha_vantage"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Ae9WqEsAjJcD62NZOPh6a49g1wY4KMswzixDAZEtWkw="; }; @@ -47,10 +47,9 @@ buildPythonPackage rec { requests-mock pytestCheckHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; # Starting with 3.0.0 most tests require an API key - doCheck = false; pythonImportsCheck = [ "alpha_vantage" ]; @@ -59,4 +58,4 @@ buildPythonPackage rec { homepage = "https://github.com/RomelTorres/alpha_vantage"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/alphaessopenapi/default.nix b/python/pkgs/alphaessopenapi/default.nix index f0ca94895..261823896 100644 --- a/python/pkgs/alphaessopenapi/default.nix +++ b/python/pkgs/alphaessopenapi/default.nix @@ -6,7 +6,7 @@ aiohttp, voluptuous, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "alphaessopenapi"; version = "0.016"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CharlesGillanders"; repo = "alphaess-openAPI"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kmKC3NWxu4Auphsc2RFkHVbJVFGrEpT7SeLk4bHl8N0="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { description = "Library that uses the Alpha ESS Open API to retrieve data on your Alpha ESS inverter, photovoltaic panels, and battery"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/alphashape/default.nix b/python/pkgs/alphashape/default.nix index 0d9f7aa38..3209f4248 100644 --- a/python/pkgs/alphashape/default.nix +++ b/python/pkgs/alphashape/default.nix @@ -20,8 +20,6 @@ buildPythonPackage (finalAttrs: { version = "1.3.1"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "bellockk"; repo = "alphashape"; diff --git a/python/pkgs/altgraph/default.nix b/python/pkgs/altgraph/default.nix index 4fc262410..9430fd58d 100644 --- a/python/pkgs/altgraph/default.nix +++ b/python/pkgs/altgraph/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "altgraph"; version = "0.17.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yHs5XdEvq96cmVc6l0nWfajSnvneASXH9TZpm0qbyec="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "altgraph" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://altgraph.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/altruistclient/default.nix b/python/pkgs/altruistclient/default.nix index 1d1d0b9cc..bd5410491 100644 --- a/python/pkgs/altruistclient/default.nix +++ b/python/pkgs/altruistclient/default.nix @@ -10,7 +10,7 @@ zeroconf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "altruistclient"; version = "0.1.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LoSk-p"; repo = "altruistclient"; - tag = version; + tag = finalAttrs.version; hash = "sha256-36qqB9e53eZgMgwXzrXlMOySnuqmT3vLiU02NL9xtko="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/LoSk-p/altruistclient"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/amaranth/default.nix b/python/pkgs/amaranth/default.nix index b62cd7d04..e9ced23ae 100644 --- a/python/pkgs/amaranth/default.nix +++ b/python/pkgs/amaranth/default.nix @@ -9,7 +9,7 @@ git, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "amaranth"; version = "0.5.9"; pyproject = true; @@ -17,10 +17,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FwRraLPTzRKpdmzHpoAI0V/qTigT89VP+B3ue++t+Vg="; }; + pythonRelaxDeps = [ "pyvcd" ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "pdm-backend~=2.3.0" "pdm-backend>=2.3.0" @@ -44,4 +46,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; mainProgram = "amaranth-rpc"; }; -} +}) diff --git a/python/pkgs/amarna/default.nix b/python/pkgs/amarna/default.nix index 2471f81b4..cdf59204a 100644 --- a/python/pkgs/amarna/default.nix +++ b/python/pkgs/amarna/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lark, pydot, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "amarna"; version = "0.1.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "crytic"; repo = "amarna"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tyvHWBhanR7YH87MDWdXUsDEzZG6MgnbshezAbxWO+I="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ lark pydot ]; @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/crytic/amarna"; license = lib.licenses.agpl3Only; }; -} +}) diff --git a/python/pkgs/amazon-ion/default.nix b/python/pkgs/amazon-ion/default.nix index cf1258e6e..2f5e0859a 100644 --- a/python/pkgs/amazon-ion/default.nix +++ b/python/pkgs/amazon-ion/default.nix @@ -9,7 +9,7 @@ cmake, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "amazon-ion"; version = "0.13.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amazon-ion"; repo = "ion-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; # Test vectors require git submodule fetchSubmodules = true; leaveDotGit = true; # During ion-c submodule build git history/hash used to infer version @@ -93,4 +93,4 @@ buildPythonPackage rec { ]; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/amberelectric/default.nix b/python/pkgs/amberelectric/default.nix index a01d53d19..b75941eaf 100644 --- a/python/pkgs/amberelectric/default.nix +++ b/python/pkgs/amberelectric/default.nix @@ -11,7 +11,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "amberelectric"; version = "2.0.12"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "madpilot"; repo = "amberelectric.py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HTelfgOucyQINz34hT3kGxhJf68pxKbiO3L54nt5New="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/madpilot/amberelectric.py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/amcrest/default.nix b/python/pkgs/amcrest/default.nix index 908f6fceb..9d0e25243 100644 --- a/python/pkgs/amcrest/default.nix +++ b/python/pkgs/amcrest/default.nix @@ -14,7 +14,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "amcrest"; version = "1.9.9"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UPxs/sL8ZpUf29fpQFnLY4tV7qSQIxm0UVSl6Pm1dAY="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://github.com/tchellomello/python-amcrest"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/ament-package/default.nix b/python/pkgs/ament-package/default.nix index 74adf511d..c4017d929 100644 --- a/python/pkgs/ament-package/default.nix +++ b/python/pkgs/ament-package/default.nix @@ -24,7 +24,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "ament_package" ]; # Tests currently broken - doCheck = false; # The script selects tag release-alpha8 passthru.skipBulkUpdate = true; diff --git a/python/pkgs/amply/default.nix b/python/pkgs/amply/default.nix index 7dc2e1635..2a818cc4d 100644 --- a/python/pkgs/amply/default.nix +++ b/python/pkgs/amply/default.nix @@ -2,22 +2,32 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, setuptools-scm, docutils, pyparsing, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "amply"; version = "0.1.7"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Z1tzt9dhE922z3Q8wW7ZJbzMTnLvZpkfDHNyBkYys8k="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools_scm[toml]>=10.1.2" "setuptools_scm[toml]>=10" + ''; dependencies = [ docutils @@ -31,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/willu47/amply"; license = lib.licenses.epl10; }; -} +}) diff --git a/python/pkgs/amqp/default.nix b/python/pkgs/amqp/default.nix index 9d8a66d33..7e1ce969d 100644 --- a/python/pkgs/amqp/default.nix +++ b/python/pkgs/amqp/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, vine, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "amqp"; version = "5.3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zdwAxyVElSICO62Un3D/97SPCxredNFwpvEKsERzlDI="; }; - propagatedBuildInputs = [ vine ]; + build-system = [ setuptools ]; + + dependencies = [ vine ]; pythonImportsCheck = [ "amqp" ]; @@ -24,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/celery/py-amqp"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/amshan/default.nix b/python/pkgs/amshan/default.nix index 65e8841a3..2a506be66 100644 --- a/python/pkgs/amshan/default.nix +++ b/python/pkgs/amshan/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "amshan"; version = "2021.12.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "toreamun"; repo = "amshan"; - rev = version; + tag = finalAttrs.version; hash = "sha256-eL8YzQB6Vj4l3cYFgWve88vLojvcxMtr2xvTUKT+Ekk="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/toreamun/amshan"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ancpbids/default.nix b/python/pkgs/ancpbids/default.nix index 1f0487d51..8b56a1a26 100644 --- a/python/pkgs/ancpbids/default.nix +++ b/python/pkgs/ancpbids/default.nix @@ -9,7 +9,7 @@ pandas, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ancpbids"; version = "0.4.10"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ANCPLabOldenburg"; repo = "ancp-bids"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yAirSGClMAx5us9D9I0Dtn2xbNdXYrMclqfIdcHv5E4="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { description = "Read/write/validate/query BIDS datasets"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/android-backup/default.nix b/python/pkgs/android-backup/default.nix index 05fdfe0e2..559a02ea9 100644 --- a/python/pkgs/android-backup/default.nix +++ b/python/pkgs/android-backup/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pycrypto, python, }: @@ -9,16 +11,18 @@ buildPythonPackage (finalAttrs: { pname = "android-backup"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "bluec0re"; repo = "android-backup-tools"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; sha256 = "0c436hv64ddqrjs77pa7z6spiv49pjflbmgg31p38haj5mzlrqvw"; }; - propagatedBuildInputs = [ pycrypto ]; + build-system = [ setuptools ]; + + dependencies = [ pycrypto ]; checkPhase = '' ${python.interpreter} -m android_backup.tests diff --git a/python/pkgs/androidtvremote2/default.nix b/python/pkgs/androidtvremote2/default.nix index 3b39bf70c..d9f3f0054 100644 --- a/python/pkgs/androidtvremote2/default.nix +++ b/python/pkgs/androidtvremote2/default.nix @@ -31,7 +31,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "androidtvremote2" ]; # Module only has a dummy test - doCheck = false; meta = { description = "Library to interact with the Android TV Remote protocol v2"; diff --git a/python/pkgs/anel-pwrctrl-homeassistant/default.nix b/python/pkgs/anel-pwrctrl-homeassistant/default.nix index eb5ba9071..b05525f9a 100644 --- a/python/pkgs/anel-pwrctrl-homeassistant/default.nix +++ b/python/pkgs/anel-pwrctrl-homeassistant/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "anel-pwrctrl-homeassistant"; version = "0.0.1.dev2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "anel_pwrctrl-homeassistant"; hash = "sha256-AcsnYD9CeGAarm5QdweUF6CUFwUywhfmU46NG8+Cm4s="; }; + build-system = [ setuptools ]; + # No tests - doCheck = false; pythonImportsCheck = [ "anel_pwrctrl" ]; @@ -24,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/mweinelt/anel-pwrctrl"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aniso8601/default.nix b/python/pkgs/aniso8601/default.nix index c4523ff22..6871d6572 100644 --- a/python/pkgs/aniso8601/default.nix +++ b/python/pkgs/aniso8601/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aniso8601"; version = "10.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JUiPhmPdFSiuH1T5SsHqUa4ltNUxU5uLxwf+0YTRaEU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://bitbucket.org/nielsenb/aniso8601"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/anitopy/default.nix b/python/pkgs/anitopy/default.nix index b75c569a4..e75040242 100644 --- a/python/pkgs/anitopy/default.nix +++ b/python/pkgs/anitopy/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "anitopy"; version = "2.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "igorcmoura"; repo = "anitopy"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xXEf7AJKg7grDmkKfFuC4Fk6QYFJtezClyfA3vq8TfQ="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "anitopy" ]; meta = { @@ -22,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/igorcmoura/anitopy"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/anndata/default.nix b/python/pkgs/anndata/default.nix index f879e805a..5b8fc61dd 100644 --- a/python/pkgs/anndata/default.nix +++ b/python/pkgs/anndata/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { pname = "anndata"; version = "0.13.2"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "scverse"; diff --git a/python/pkgs/annexremote/default.nix b/python/pkgs/annexremote/default.nix index c0b528a27..7a9bb76d9 100644 --- a/python/pkgs/annexremote/default.nix +++ b/python/pkgs/annexremote/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "annexremote"; version = "1.6.6"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Lykos153"; repo = "AnnexRemote"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RShDcqAjG+ujGzWu5S9za24WSsIWctqi3nWQ8EU4DTo="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/Lykos153/AnnexRemote"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/annotated-doc/default.nix b/python/pkgs/annotated-doc/default.nix index 18f63bdf6..a69934258 100644 --- a/python/pkgs/annotated-doc/default.nix +++ b/python/pkgs/annotated-doc/default.nix @@ -5,7 +5,7 @@ pdm-backend, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "annotated-doc"; version = "0.0.5"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fastapi"; repo = "annotated-doc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Khgub17TKjp6GmLLyppFzcxFHcu/EBTCrnabu3Km2Yo="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/fastapi/annotated-doc"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/annotated-types/default.nix b/python/pkgs/annotated-types/default.nix index 2647061dc..7cfb6bb2b 100644 --- a/python/pkgs/annotated-types/default.nix +++ b/python/pkgs/annotated-types/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "annotated-types"; version = "0.8.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "annotated-types"; repo = "annotated-types"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3ztALuBF4zJ7Fc1UCWqWRMm/a8Y0I/al+M2B669D314="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/annotated-types/annotated-types"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/annotatedyaml/default.nix b/python/pkgs/annotatedyaml/default.nix index b1b4a83a5..b28028c8c 100644 --- a/python/pkgs/annotatedyaml/default.nix +++ b/python/pkgs/annotatedyaml/default.nix @@ -14,7 +14,7 @@ voluptuous, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "annotatedyaml"; version = "1.0.2"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "annotatedyaml"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+4H3StCZ58TDV6LSXyeC6+Vn56W19+bIO4AdsJEfHI0="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-libs/annotatedyaml"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/annoy/default.nix b/python/pkgs/annoy/default.nix index fe4e5cb60..5b5a617f1 100644 --- a/python/pkgs/annoy/default.nix +++ b/python/pkgs/annoy/default.nix @@ -14,7 +14,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "annoy"; version = "1.17.3"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spotify"; repo = "annoy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oJHW4lULRun2in35pBGOKg44s5kgLH2BKiMOzVu4rf4="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { lib.systems.inspect.patterns.isDarwin ]; }; -} +}) diff --git a/python/pkgs/anonip/default.nix b/python/pkgs/anonip/default.nix index cf47775fc..ac3b2bc60 100644 --- a/python/pkgs/anonip/default.nix +++ b/python/pkgs/anonip/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "anonip"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "DigitaleGesellschaft"; repo = "Anonip"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0cssdcridadjzichz1vv1ng7jwphqkn8ihh83hpz9mcjmxyb94qc"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov-stub @@ -33,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/DigitaleGesellschaft/Anonip"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/anonymizeip/default.nix b/python/pkgs/anonymizeip/default.nix index 9aa4425ed..ebd46a62f 100644 --- a/python/pkgs/anonymizeip/default.nix +++ b/python/pkgs/anonymizeip/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "anonymizeip"; version = "1.0.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "samuelmeuli"; repo = "anonymize-ip"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-54q2R14Pdnw4FAmBufeq5NozsqC7C4W6QQPcjTSkM48="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/samuelmeuli/anonymize-ip"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ansi/default.nix b/python/pkgs/ansi/default.nix index 5a5a13a75..8c928bff6 100644 --- a/python/pkgs/ansi/default.nix +++ b/python/pkgs/ansi/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ansi"; version = "0.3.7"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tehmaze"; repo = "ansi"; - tag = "ansi-${version}"; + tag = "ansi-${finalAttrs.version}"; hash = "sha256-PmgB1glksu4roQeZ1o7uilMJNm9xaYqw680N2z+tUUM="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/tehmaze/ansi/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ansi2html/default.nix b/python/pkgs/ansi2html/default.nix index 8d901f49a..1332b92f0 100644 --- a/python/pkgs/ansi2html/default.nix +++ b/python/pkgs/ansi2html/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ansi2html"; version = "1.9.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rhfpLx1srA5n02fgf7C6iiPayPGT/F16jIpQ/l3dlaQ="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/ralphbean/ansi2html"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/ansible-runner/default.nix b/python/pkgs/ansible-runner/default.nix index 2e311b337..b2c797f57 100644 --- a/python/pkgs/ansible-runner/default.nix +++ b/python/pkgs/ansible-runner/default.nix @@ -12,7 +12,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ansible-runner"; version = "2.4.3"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ansible"; repo = "ansible-runner"; - tag = version; + tag = finalAttrs.version; hash = "sha256-QKvc5T80lVt5hgIjylPpza3kJiw+epytimIsxy0oIK0="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "ansible-runner"; }; -} +}) diff --git a/python/pkgs/ansicolor/default.nix b/python/pkgs/ansicolor/default.nix index eecf2a88a..05b56af91 100644 --- a/python/pkgs/ansicolor/default.nix +++ b/python/pkgs/ansicolor/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ansicolor"; version = "0.3.3"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "numerodix"; repo = "ansicolor"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ndChpcHjsGWmlw0uvPF0RvRvi99b3cnajHRXudmQXBw="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/numerodix/ansicolor/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ansicolors/default.nix b/python/pkgs/ansicolors/default.nix index 7ab5e1280..3cbfd6b22 100644 --- a/python/pkgs/ansicolors/default.nix +++ b/python/pkgs/ansicolors/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ansicolors"; version = "1.1.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-mflPXjNIoLzUPILl/EQUATzMGdcL2TmtceATPOnDcuA="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/verigak/colors/"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/ansimarkup/default.nix b/python/pkgs/ansimarkup/default.nix index fcffb09a8..89d7c624a 100644 --- a/python/pkgs/ansimarkup/default.nix +++ b/python/pkgs/ansimarkup/default.nix @@ -7,7 +7,7 @@ colorama, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ansimarkup"; version = "2.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gvalkov"; repo = "python-ansimarkup"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+kZt8tv09RHrMRZtvJPBBiFaeCksXyrlHqIabPrXYDY="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/gvalkov/python-ansimarkup"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ansitable/default.nix b/python/pkgs/ansitable/default.nix index d50c15a4e..aa932cf7b 100644 --- a/python/pkgs/ansitable/default.nix +++ b/python/pkgs/ansitable/default.nix @@ -9,13 +9,13 @@ pandas, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ansitable"; version = "1.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ts0OLMuhxkAkZtnmpV+5Of7BUjmAO2J8irVM8u23DMk="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/ansitable/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/anthemav/default.nix b/python/pkgs/anthemav/default.nix index 5213c68be..8197f01b2 100644 --- a/python/pkgs/anthemav/default.nix +++ b/python/pkgs/anthemav/default.nix @@ -8,7 +8,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "anthemav"; version = "1.4.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nugget"; repo = "python-anthemav"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZjAt4oODx09Qij0PwBvLCplSjwdBx2fReiwjmKhdPa0="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/nugget/python-anthemav"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/anthropic/default.nix b/python/pkgs/anthropic/default.nix index 02a832f42..210df6585 100644 --- a/python/pkgs/anthropic/default.nix +++ b/python/pkgs/anthropic/default.nix @@ -28,7 +28,6 @@ buildPythonPackage (finalAttrs: { pname = "anthropic"; version = "1.4.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "anthropics"; diff --git a/python/pkgs/antlr4-python3-runtime/default.nix b/python/pkgs/antlr4-python3-runtime/default.nix index 09b6f315a..912e01dc1 100644 --- a/python/pkgs/antlr4-python3-runtime/default.nix +++ b/python/pkgs/antlr4-python3-runtime/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "antlr4-python3-runtime"; version = "4.13.2"; pyproject = true; src = fetchPypi { pname = "antlr4_python3_runtime"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-kJtkfh0vwrcBgKxYbfOTPjiRnIX5jMxlapbNPyXvORY="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://www.antlr.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/anyascii/default.nix b/python/pkgs/anyascii/default.nix index 32de96964..c1b8f5e3b 100644 --- a/python/pkgs/anyascii/default.nix +++ b/python/pkgs/anyascii/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "anyascii"; version = "0.3.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yU6d2dR7PZSU7KMF/vlEfQC0vxoyr/hap0b6Psf7lcM="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/anyascii/anyascii"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/anybadge/default.nix b/python/pkgs/anybadge/default.nix index c5202ab50..b1eb6c1f2 100644 --- a/python/pkgs/anybadge/default.nix +++ b/python/pkgs/anybadge/default.nix @@ -9,7 +9,7 @@ sh, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "anybadge"; version = "1.16.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jongracecox"; repo = "anybadge"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9qGmiIGzVdWHMyurMqTqEz+NKYlc/5zt6HPsssCH4Pk="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/jongracecox/anybadge"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/anyio/default.nix b/python/pkgs/anyio/default.nix index 9c43726d7..205dfaae6 100644 --- a/python/pkgs/anyio/default.nix +++ b/python/pkgs/anyio/default.nix @@ -16,7 +16,7 @@ trio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "anyio"; version = "4.15.1"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "agronholm"; repo = "anyio"; - tag = version; + tag = finalAttrs.version; hash = "sha256-cuTOVLyqLfp4LMuBd1BnFgey2gu3wehDk7VAb7yoqng="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/agronholm/anyio"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/anysqlite/default.nix b/python/pkgs/anysqlite/default.nix index 08826687d..187af4cf4 100644 --- a/python/pkgs/anysqlite/default.nix +++ b/python/pkgs/anysqlite/default.nix @@ -8,7 +8,7 @@ trio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "anysqlite"; version = "0.0.5"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "karpetrosyan"; repo = "anysqlite"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6kNN6kjkMHVNneMq/8zQxqMIXUxH/+eWLX8XhoHqFRU="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { hatchling ]; - propagatedBuildInputs = [ anyio ]; + dependencies = [ anyio ]; pythonImportsCheck = [ "anysqlite" ]; meta = { @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/karpetrosyan/anysqlite"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/anytree/default.nix b/python/pkgs/anytree/default.nix index e4ecba601..a358f4d66 100644 --- a/python/pkgs/anytree/default.nix +++ b/python/pkgs/anytree/default.nix @@ -14,7 +14,7 @@ fontconfig, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "anytree"; version = "2.13.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "c0fec0de"; repo = "anytree"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kFNYJMWagpqixs84+AaNkh/28asLBJhibTP8LEEe4XY="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/c0fec0de/anytree"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/anywidget/default.nix b/python/pkgs/anywidget/default.nix index 01b94eccb..5393d3e28 100644 --- a/python/pkgs/anywidget/default.nix +++ b/python/pkgs/anywidget/default.nix @@ -12,13 +12,13 @@ watchfiles, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "anywidget"; version = "0.11.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZpX775RJz4wn9CG5bFg3qjf5CewfYM+jOt0zPhtwsWk="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/manzt/anywidget"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/apache-beam/default.nix b/python/pkgs/apache-beam/default.nix index 61630b598..ca63c92a4 100644 --- a/python/pkgs/apache-beam/default.nix +++ b/python/pkgs/apache-beam/default.nix @@ -13,6 +13,7 @@ jsonschema, mypy-protobuf, redis, + pyyaml, setuptools, yapf, @@ -39,6 +40,7 @@ pytz, regex, requests, + sortedcontainers, typing-extensions, zstandard, @@ -51,7 +53,6 @@ buildPythonPackage (finalAttrs: { pname = "apache-beam"; version = "2.75.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "apache"; @@ -66,21 +67,15 @@ buildPythonPackage (finalAttrs: { substituteInPlace pyproject.toml \ --replace-fail "distlib==0.4.2" "distlib" \ --replace-fail "cython>=3.2.5,<4" "cython" \ + --replace-fail "numpy>=1.14.3,<2.5.0" "numpy>=1.14.3" \ --replace-fail "==" ">=" substituteInPlace setup.py \ --replace-fail " copy_tests_from_docs()" "" ''; - pythonRelaxDeps = [ - "cryptography" - "envoy-data-plane" - "httplib2" - "jsonpickle" - "objsize" - "protobuf" - "pyarrow" - ]; + pythonRelaxDeps = true; + pythonRemoveDeps = [ "pyarrow-hotfix" ]; build-system = [ cython @@ -91,6 +86,7 @@ buildPythonPackage (finalAttrs: { jsonschema mypy-protobuf redis + pyyaml setuptools yapf ]; @@ -118,6 +114,7 @@ buildPythonPackage (finalAttrs: { pytz regex requests + sortedcontainers typing-extensions zstandard ]; diff --git a/python/pkgs/apache-tvm-ffi/default.nix b/python/pkgs/apache-tvm-ffi/default.nix index 3dd00037c..676f5ff68 100644 --- a/python/pkgs/apache-tvm-ffi/default.nix +++ b/python/pkgs/apache-tvm-ffi/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { pname = "apache-tvm-ffi"; version = "0.1.13"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "apache"; diff --git a/python/pkgs/apeye-core/default.nix b/python/pkgs/apeye-core/default.nix index 2546e32a2..db19782f2 100644 --- a/python/pkgs/apeye-core/default.nix +++ b/python/pkgs/apeye-core/default.nix @@ -7,13 +7,13 @@ domdf-python-tools, idna, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "apeye-core"; version = "1.1.5"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "apeye_core"; hash = "sha256-Xecu09AMybIP6lXlS3q49e+FAOszpTaLwWKlWF4jilU="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/domdfcoding/apyey-core"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/apeye/default.nix b/python/pkgs/apeye/default.nix index 1f2e700d0..4b97a897d 100644 --- a/python/pkgs/apeye/default.nix +++ b/python/pkgs/apeye/default.nix @@ -8,13 +8,13 @@ requests, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "apeye"; version = "1.4.1"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "apeye"; hash = "sha256-FOpUL61onjv9vaIYmjVKSQjpCu5L+EwVq3XWhFPXajY="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/domdfcoding/apeye"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/apify-fingerprint-datapoints/default.nix b/python/pkgs/apify-fingerprint-datapoints/default.nix index 9a282d7e9..78ef0c8b1 100644 --- a/python/pkgs/apify-fingerprint-datapoints/default.nix +++ b/python/pkgs/apify-fingerprint-datapoints/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "apify_fingerprint_datapoints" ]; # Module has no tests - doCheck = false; meta = { description = "Browser fingerprint datapoints collected by Apify"; diff --git a/python/pkgs/apipkg/default.nix b/python/pkgs/apipkg/default.nix index 7f9c8eae7..27638995e 100644 --- a/python/pkgs/apipkg/default.nix +++ b/python/pkgs/apipkg/default.nix @@ -6,13 +6,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "apipkg"; version = "3.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-x6phpPgml/2qZn5wrxUFrPH3QoscJ7iR0gS6eoo8Xg0="; }; @@ -21,8 +21,6 @@ buildPythonPackage rec { hatchling ]; - doCheck = false; - pythonImportsCheck = [ "apipkg" ]; meta = { @@ -30,4 +28,4 @@ buildPythonPackage rec { description = "Namespace control and lazy-import mechanism"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/apispec/default.nix b/python/pkgs/apispec/default.nix index 0a6e6ba03..545c754dc 100644 --- a/python/pkgs/apispec/default.nix +++ b/python/pkgs/apispec/default.nix @@ -10,13 +10,13 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "apispec"; version = "6.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CoiFVc1KpftxdgQb4VaEFU/YlhBV4WcucDq/c36HYb8="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/marshmallow-code/apispec"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/apkinspector/default.nix b/python/pkgs/apkinspector/default.nix index b126a7f9e..da6fa78fa 100644 --- a/python/pkgs/apkinspector/default.nix +++ b/python/pkgs/apkinspector/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "apkinspector"; version = "1.3.7"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "erev0s"; repo = "apkInspector"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6efXoiyjTEzadZ5aut4lFbjth03Uyw8REIYQYjvWS/c="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "apkInspector"; }; -} +}) diff --git a/python/pkgs/apollo-fpga/default.nix b/python/pkgs/apollo-fpga/default.nix index e2f7475da..67460747f 100644 --- a/python/pkgs/apollo-fpga/default.nix +++ b/python/pkgs/apollo-fpga/default.nix @@ -14,7 +14,7 @@ pyxdg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "apollo-fpga"; version = "1.1.1"; pyproject = true; @@ -22,14 +22,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "apollo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EDI+bRDePEbkxfQKuDgRsJtlAE0jqcIoQHjpgW0jIoY="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools-git-versioning<2"' "" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ @@ -45,7 +45,6 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "apollo_fpga" @@ -56,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/greatscottgadgets/apollo"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/appdirs/default.nix b/python/pkgs/appdirs/default.nix index 25a2bc4f3..e6f8a7dd9 100644 --- a/python/pkgs/appdirs/default.nix +++ b/python/pkgs/appdirs/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "appdirs"; version = "1.4.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fV0BZ7KxuoIWR2Fq9Gp0nRxlN0DdDSQVEA/ibiev30E="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "appdirs" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ActiveState/appdirs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/appimage/default.nix b/python/pkgs/appimage/default.nix index e1d74df4a..acdd50c39 100644 --- a/python/pkgs/appimage/default.nix +++ b/python/pkgs/appimage/default.nix @@ -26,7 +26,6 @@ buildPythonPackage (finalAttrs: { build-system = [ hatchling ]; # Module has no test - doCheck = false; pythonImportsCheck = [ "appimage" ]; diff --git a/python/pkgs/apple-weatherkit/default.nix b/python/pkgs/apple-weatherkit/default.nix index 4dd79ce84..eb3818c65 100644 --- a/python/pkgs/apple-weatherkit/default.nix +++ b/python/pkgs/apple-weatherkit/default.nix @@ -30,7 +30,6 @@ buildPythonPackage (finalAttrs: { ++ pyjwt.optional-dependencies.crypto; # Module has no tests - doCheck = false; pythonImportsCheck = [ "apple_weatherkit" ]; diff --git a/python/pkgs/applicationinsights/default.nix b/python/pkgs/applicationinsights/default.nix index ea9ebf161..9e360e0b6 100644 --- a/python/pkgs/applicationinsights/default.nix +++ b/python/pkgs/applicationinsights/default.nix @@ -6,13 +6,13 @@ portalocker, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "applicationinsights"; version = "0.11.10"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-C3YfPvBoCs9HMZBt/BgH+qbypXFornRZLbAISmCZ97M="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/Microsoft/ApplicationInsights-Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/appnope/default.nix b/python/pkgs/appnope/default.nix index 41a6d074f..8e8bef4e4 100644 --- a/python/pkgs/appnope/default.nix +++ b/python/pkgs/appnope/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "appnope"; version = "0.1.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "minrk"; repo = "appnope"; - tag = version; + tag = finalAttrs.version; hash = "sha256-We7sZKVbQFIMdZpS+VMdi0RH1O/qtFNrfJNg/98tO5A="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/minrk/appnope"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/aprslib/default.nix b/python/pkgs/aprslib/default.nix index 647636f71..7ba4c2225 100644 --- a/python/pkgs/aprslib/default.nix +++ b/python/pkgs/aprslib/default.nix @@ -28,8 +28,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; - doCheck = false; # mox3 is not packaged - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "aprslib" ]; diff --git a/python/pkgs/apscheduler/default.nix b/python/pkgs/apscheduler/default.nix index 23b0273a1..947eded1d 100644 --- a/python/pkgs/apscheduler/default.nix +++ b/python/pkgs/apscheduler/default.nix @@ -11,7 +11,7 @@ tzlocal, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "apscheduler"; version = "4.0.0a6"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "agronholm"; repo = "apscheduler"; - tag = version; + tag = finalAttrs.version; hash = "sha256-1Gv8Cm0YA6/z2onJu1pSJj0v4lrBLeEfGo+qkJLUwWY="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/agronholm/apscheduler"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/apsw/default.nix b/python/pkgs/apsw/default.nix index d1416581b..af409f44a 100644 --- a/python/pkgs/apsw/default.nix +++ b/python/pkgs/apsw/default.nix @@ -13,14 +13,14 @@ let }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "apsw"; version = "3.53.4.0"; pyproject = true; # https://github.com/rogerbinns/apsw/issues/548 src = fetchurl { - url = "https://github.com/rogerbinns/apsw/releases/download/${version}/apsw-${version}.tar.gz"; + url = "https://github.com/rogerbinns/apsw/releases/download/${finalAttrs.version}/apsw-${finalAttrs.version}.tar.gz"; hash = "sha256-zVn2szMJS6zYArXleW8Xn1/WE2T5HniAdBGbXsZtxGs="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/rogerbinns/apsw"; license = lib.licenses.zlib; }; -} +}) diff --git a/python/pkgs/apsystems-ez1/default.nix b/python/pkgs/apsystems-ez1/default.nix index 6686569c0..96fdfe987 100644 --- a/python/pkgs/apsystems-ez1/default.nix +++ b/python/pkgs/apsystems-ez1/default.nix @@ -8,7 +8,7 @@ pytest-asyncio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "apsystems-ez1"; version = "2.7.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SonnenladenGmbH"; repo = "APsystems-EZ1-API"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ry3sQPkYnH0asmE41lEQA5G2tk07eTpsBiuJbVIjrXU="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/SonnenladenGmbH/APsystems-EZ1-API"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/apykuma/default.nix b/python/pkgs/apykuma/default.nix index 163887317..3582df4f2 100644 --- a/python/pkgs/apykuma/default.nix +++ b/python/pkgs/apykuma/default.nix @@ -27,7 +27,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "apykuma" diff --git a/python/pkgs/aqualogic/default.nix b/python/pkgs/aqualogic/default.nix index 872d968d0..95ab19616 100644 --- a/python/pkgs/aqualogic/default.nix +++ b/python/pkgs/aqualogic/default.nix @@ -33,7 +33,6 @@ buildPythonPackage (finalAttrs: { # With 3.4 the event loop is not terminated after the first test # https://github.com/swilson/aqualogic/issues/9 - doCheck = false; pythonImportsCheck = [ "aqualogic" ]; diff --git a/python/pkgs/ar/default.nix b/python/pkgs/ar/default.nix index 06b1f1d4d..6366ec0a3 100644 --- a/python/pkgs/ar/default.nix +++ b/python/pkgs/ar/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ar"; version = "1.0.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vidstige"; repo = "ar"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uaEkp2uCiRMj8pTBgA6NESJO3Eh5pVc+FfX/enIBcNA="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/vidstige/ar"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/arch/default.nix b/python/pkgs/arch/default.nix index 5fe6da04d..abc985df9 100644 --- a/python/pkgs/arch/default.nix +++ b/python/pkgs/arch/default.nix @@ -13,7 +13,7 @@ meson-python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "arch"; version = "8.0.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bashtage"; repo = "arch"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qw8sSgsMu6YTiQlzsrePnDKkFBtrxD9RK6ZZE5jFeX0="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/bashtage/arch"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/archinfo/default.nix b/python/pkgs/archinfo/default.nix index 8d732c96c..68013f9e4 100644 --- a/python/pkgs/archinfo/default.nix +++ b/python/pkgs/archinfo/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "archinfo"; version = "9.2.154"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = "archinfo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Vks7Rjd8x2zeHnJPs0laH56S4b8pnR1cK82SpK+XOgE="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/angr/archinfo"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/archspec/default.nix b/python/pkgs/archspec/default.nix index d328f89fb..28ef88505 100644 --- a/python/pkgs/archspec/default.nix +++ b/python/pkgs/archspec/default.nix @@ -6,7 +6,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "archspec"; version = "0.2.6"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "archspec"; repo = "archspec"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-vtOntxkHlkO0aRS6nRknz+9AYiKtHPoeG8iAw49QsvE="; }; @@ -28,11 +28,11 @@ buildPythonPackage rec { meta = { description = "Library for detecting, labeling, and reasoning about microarchitectures"; homepage = "https://archspec.readthedocs.io/"; - changelog = "https://github.com/archspec/archspec/releases/tag/${src.tag}"; + changelog = "https://github.com/archspec/archspec/releases/tag/${finalAttrs.src.tag}"; license = with lib.licenses; [ mit asl20 ]; mainProgram = "archspec"; }; -} +}) diff --git a/python/pkgs/area/default.nix b/python/pkgs/area/default.nix index b9fbb9322..9555482bb 100644 --- a/python/pkgs/area/default.nix +++ b/python/pkgs/area/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "1.1.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-yuu5Zmjd7dtQ5/Vu0jbaO4RFn262fwMGplLBTiuHZaI="; @@ -20,7 +18,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # tests not working on the package from pypi - doCheck = false; pythonImportsCheck = [ "area" ]; diff --git a/python/pkgs/argcomplete/default.nix b/python/pkgs/argcomplete/default.nix index fad549d59..76d4f297e 100644 --- a/python/pkgs/argcomplete/default.nix +++ b/python/pkgs/argcomplete/default.nix @@ -6,7 +6,7 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "argcomplete"; version = "3.7.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kislyuk"; repo = "argcomplete"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WKIhWlftH9xgdklljAOmW4XYMbclGrCFTtsxws2FRzg="; }; @@ -24,7 +24,6 @@ buildPythonPackage rec { ]; # Tries to build and install test packages which fails - doCheck = false; pythonImportsCheck = [ "argcomplete" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { downloadPage = "https://github.com/kislyuk/argcomplete"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/argh/default.nix b/python/pkgs/argh/default.nix index 0f090a64f..bbd22210a 100644 --- a/python/pkgs/argh/default.nix +++ b/python/pkgs/argh/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "argh"; version = "0.31.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8wAj2L4Uyl7msbPuq4KRUde72kZK4H3E3VNHkZxYkvk="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Unobtrusive argparse wrapper with natural syntax"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/argon2-cffi-bindings/default.nix b/python/pkgs/argon2-cffi-bindings/default.nix index f90a94e4c..0776277a8 100644 --- a/python/pkgs/argon2-cffi-bindings/default.nix +++ b/python/pkgs/argon2-cffi-bindings/default.nix @@ -10,7 +10,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "argon2-cffi-bindings"; version = "26.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hynek"; repo = "argon2-cffi-bindings"; - tag = version; + tag = finalAttrs.version; hash = "sha256-1938M2ALMcAIdTYTHCmJIAW1YyJPYhewZXOyFIJg/ZY="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/hynek/argon2-cffi-bindings"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/argon2-cffi/default.nix b/python/pkgs/argon2-cffi/default.nix index ed9b7f336..7d10d7e80 100644 --- a/python/pkgs/argon2-cffi/default.nix +++ b/python/pkgs/argon2-cffi/default.nix @@ -8,14 +8,14 @@ argon2-cffi-bindings, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "argon2-cffi"; version = "25.1.0"; pyproject = true; src = fetchPypi { pname = "argon2_cffi"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-aUrlzIpC9MTivyyg5k5R4joEDGpReoUHRoPTlZ4TRsE="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { hatch-fancy-pypi-readme ]; - propagatedBuildInputs = [ argon2-cffi-bindings ]; + dependencies = [ argon2-cffi-bindings ]; pythonImportsCheck = [ "argon2" ]; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://argon2-cffi.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/argparse-dataclass/default.nix b/python/pkgs/argparse-dataclass/default.nix index d85085afd..56a29df0e 100644 --- a/python/pkgs/argparse-dataclass/default.nix +++ b/python/pkgs/argparse-dataclass/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "argparse-dataclass"; version = "2.0.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mivade"; repo = "argparse_dataclass"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ASdP6LOEeTszyppYV6vRQX8BKOHYUimI36tMSZTQfTk="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/mivade/argparse_dataclass"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/argparse-manpage/default.nix b/python/pkgs/argparse-manpage/default.nix index 7715c366e..3fa3860fc 100644 --- a/python/pkgs/argparse-manpage/default.nix +++ b/python/pkgs/argparse-manpage/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "argparse-manpage"; version = "4.7"; pyproject = true; src = fetchPypi { pname = "argparse_manpage"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Heq3ayEqyHU8u2e50tK8CUm7wzi7HMNUfwiQyzQQizI="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/praiskup/argparse-manpage"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/args/default.nix b/python/pkgs/args/default.nix index c47116775..c9671b71d 100644 --- a/python/pkgs/args/default.nix +++ b/python/pkgs/args/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "args"; version = "0.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-p4W42DdiXpthw5EIUy2VuFJ0rNZ5aTtx67UVaEj8+BQ="; }; @@ -22,4 +22,4 @@ buildPythonPackage rec { homepage = "https://github.com/kennethreitz/args"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/arpeggio/default.nix b/python/pkgs/arpeggio/default.nix index 862c4a2d8..6d5fff99c 100644 --- a/python/pkgs/arpeggio/default.nix +++ b/python/pkgs/arpeggio/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "arpeggio"; version = "2.0.3"; pyproject = true; src = fetchPypi { pname = "Arpeggio"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-noWtNc/GyThnaBfHrpoQAKfHKjTHHbDGhxNsRg0SuF4="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/textX/Arpeggio"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/arpy/default.nix b/python/pkgs/arpy/default.nix index 8dcf5f188..ebcd9877e 100644 --- a/python/pkgs/arpy/default.nix +++ b/python/pkgs/arpy/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "arpy"; version = "2.4.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "viraptor"; repo = "arpy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-SOJuk2JY952g6O3Tn2YA4Z3mYOnusERXmsHbfzD44kE="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/viraptor/arpy"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/array-api-compat/default.nix b/python/pkgs/array-api-compat/default.nix index f34cee04e..a38cc66aa 100644 --- a/python/pkgs/array-api-compat/default.nix +++ b/python/pkgs/array-api-compat/default.nix @@ -11,7 +11,6 @@ buildPythonPackage (finalAttrs: { pname = "array-api-compat"; version = "1.15"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "data-apis"; diff --git a/python/pkgs/array-api-strict/default.nix b/python/pkgs/array-api-strict/default.nix index 911c86633..490c60e2c 100644 --- a/python/pkgs/array-api-strict/default.nix +++ b/python/pkgs/array-api-strict/default.nix @@ -8,7 +8,7 @@ hypothesis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "array-api-strict"; version = "2.6.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "data-apis"; repo = "array-api-strict"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0ccyNbp6GheG1KtImpa/2uboAG6Q+rHdwKaqupBuoPg="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { description = "Strict, minimal implementation of the Python array API"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/array-record/default.nix b/python/pkgs/array-record/default.nix index e2d12cb58..962ccbd1b 100644 --- a/python/pkgs/array-record/default.nix +++ b/python/pkgs/array-record/default.nix @@ -8,7 +8,7 @@ etils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "array-record"; version = "0.8.3"; format = "wheel"; @@ -20,7 +20,7 @@ buildPythonPackage rec { pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}"; in fetchPypi { - inherit version; + inherit (finalAttrs) version; format = "wheel"; pname = "array_record"; dist = pyShortVersion; @@ -34,7 +34,7 @@ buildPythonPackage rec { cp313 = "sha256-E98a7Js4r+mJc79f489SP4PKkEsEI9hTGZMIdxRbjyg="; cp314 = "sha256-idLPX0cJvjxsKzDA02YAUiM3VjP/zmbcsT2SegvcUig="; } - .${pyShortVersion} or (throw "${pname} is missing hash for ${pyShortVersion}"); + .${pyShortVersion} or (throw "${finalAttrs.pname} is missing hash for ${pyShortVersion}"); }; dependencies = [ @@ -51,4 +51,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/python/pkgs/arrayqueues/default.nix b/python/pkgs/arrayqueues/default.nix index 9b3b7b11f..0b5f64368 100644 --- a/python/pkgs/arrayqueues/default.nix +++ b/python/pkgs/arrayqueues/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "arrayqueues"; version = "1.4.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "portugueslab"; repo = "arrayqueues"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tqIfpkwbJNd9jMe0YvAWz9Z8rOO80qxVM2ZcJFeAmwo="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { description = "Multiprocessing queues for numpy arrays using shared memory"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/arris-tg2492lg/default.nix b/python/pkgs/arris-tg2492lg/default.nix index 34695e9d8..116407e6d 100644 --- a/python/pkgs/arris-tg2492lg/default.nix +++ b/python/pkgs/arris-tg2492lg/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "arris-tg2492lg"; version = "2.2.0"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vanbalken"; repo = "arris-tg2492lg"; - tag = version; + tag = finalAttrs.version; hash = "sha256-MQq9jMUoJgqaY0f9YIbhME2kO+ektPqBnT9REg3qDpg="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; nativeCheckInputs = [ pytest-aiohttp @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/vanbalken/arris-tg2492lg"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/arsenic/default.nix b/python/pkgs/arsenic/default.nix index 6d5408875..06b1a6e49 100644 --- a/python/pkgs/arsenic/default.nix +++ b/python/pkgs/arsenic/default.nix @@ -10,7 +10,7 @@ structlog, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "arsenic"; version = "21.8"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "HENNGE"; repo = "arsenic"; - tag = version; + tag = finalAttrs.version; hash = "sha256-fsLo22PR9WdX2FazPgr8B8dFq6EM1LLTpRFGEm/ymCE="; }; @@ -49,7 +49,6 @@ buildPythonPackage rec { ]; # Test depends on asyncio_extras which is not longer maintained - doCheck = false; pythonImportsCheck = [ "arsenic" ]; @@ -58,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/HENNGE/arsenic/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/art/default.nix b/python/pkgs/art/default.nix index 45c308319..38a440d13 100644 --- a/python/pkgs/art/default.nix +++ b/python/pkgs/art/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "art"; version = "6.5"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "art"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ub+hvxYRZznql/GZjA6QXrdHUbM+QCVEYiQfQ6IOJKE="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/sepandhaghighi/art"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/arxiv/default.nix b/python/pkgs/arxiv/default.nix index 4f5f7b65b..07457c143 100644 --- a/python/pkgs/arxiv/default.nix +++ b/python/pkgs/arxiv/default.nix @@ -15,7 +15,7 @@ # tests mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "arxiv"; version = "4.0.1"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lukasschwab"; repo = "arxiv.py"; - tag = version; + tag = finalAttrs.version; hash = "sha256-nZhi0dPEiv6VLpacvcGvZhvvDkLalrs4IJvMVzb5MJI="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/lukasschwab/arxiv.py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/arxiv2bib/default.nix b/python/pkgs/arxiv2bib/default.nix index 2c52b3468..82850261d 100644 --- a/python/pkgs/arxiv2bib/default.nix +++ b/python/pkgs/arxiv2bib/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.8"; pyproject = true; - __structuredAttrs = true; - # Missing tests on Pypi src = fetchFromGitHub { owner = "nathangrigg"; diff --git a/python/pkgs/asciimatics/default.nix b/python/pkgs/asciimatics/default.nix index e872edfdc..5401015f4 100644 --- a/python/pkgs/asciimatics/default.nix +++ b/python/pkgs/asciimatics/default.nix @@ -9,13 +9,13 @@ wcwidth, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asciimatics"; version = "1.15.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-z905gEJydRnYtz5iuO+CwL7P7U60IImcO5bJjQuWgho="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/peterbrittain/asciimatics"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/asciitree/default.nix b/python/pkgs/asciitree/default.nix index e9b98b3f6..5876a2bc4 100644 --- a/python/pkgs/asciitree/default.nix +++ b/python/pkgs/asciitree/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asciitree"; version = "0.3.3"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mbr"; repo = "asciitree"; - rev = version; + tag = finalAttrs.version; hash = "sha256-AaLDO27W6fGHGU11rRpBf5gg1we+9SS1MEJdFP2lPBw="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/mbr/asciitree"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/asdf-coordinates-schemas/default.nix b/python/pkgs/asdf-coordinates-schemas/default.nix index 56e734692..a2a2e5a00 100644 --- a/python/pkgs/asdf-coordinates-schemas/default.nix +++ b/python/pkgs/asdf-coordinates-schemas/default.nix @@ -31,7 +31,6 @@ buildPythonPackage (finalAttrs: { ]; # Circular dependency with asdf-astropy - doCheck = false; pythonImportsCheck = [ "asdf_coordinates_schemas" ]; diff --git a/python/pkgs/asdf-standard/default.nix b/python/pkgs/asdf-standard/default.nix index 1ffc73a0f..110233619 100644 --- a/python/pkgs/asdf-standard/default.nix +++ b/python/pkgs/asdf-standard/default.nix @@ -5,14 +5,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asdf-standard"; version = "1.5.0"; pyproject = true; src = fetchPypi { pname = "asdf_standard"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-WULK99FD859y9jRIQ3PH9AzkhXHR2zwnHhOFjjP+WWY="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/asdf-format/asdf-standard"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/asdf-transform-schemas/default.nix b/python/pkgs/asdf-transform-schemas/default.nix index 31dde1f86..571ce71a2 100644 --- a/python/pkgs/asdf-transform-schemas/default.nix +++ b/python/pkgs/asdf-transform-schemas/default.nix @@ -6,14 +6,14 @@ asdf-standard, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asdf-transform-schemas"; version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "asdf_transform_schemas"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-D1D44Jb//S0UucgplZASZu8lsj0N/8MK1Bu6RoUalzI="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/asdf-format/asdf-transform-schemas"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/asdf-wcs-schemas/default.nix b/python/pkgs/asdf-wcs-schemas/default.nix index f3ae8929f..6dfc7f8ce 100644 --- a/python/pkgs/asdf-wcs-schemas/default.nix +++ b/python/pkgs/asdf-wcs-schemas/default.nix @@ -12,7 +12,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asdf-wcs-schemas"; version = "0.5.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asdf-format"; repo = "asdf-wcs-schemas"; - tag = version; + tag = finalAttrs.version; hash = "sha256-S9SAQzy+FQ2idNDydYnexb3QJfd6vG/JKYg5z0tjkNo="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/asdf-format/asdf-wcs-schemas"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/asdf/default.nix b/python/pkgs/asdf/default.nix index ce1d29d03..1bc66586e 100644 --- a/python/pkgs/asdf/default.nix +++ b/python/pkgs/asdf/default.nix @@ -22,7 +22,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asdf"; version = "5.4.0"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asdf-format"; repo = "asdf"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kvo53BT/jCnMj772GiwI2v0KTQcRVQqbYTRIOyS7PRM="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://github.com/asdf-format/asdf"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/asgi-csrf/default.nix b/python/pkgs/asgi-csrf/default.nix index 8d6353eb1..494657d19 100644 --- a/python/pkgs/asgi-csrf/default.nix +++ b/python/pkgs/asgi-csrf/default.nix @@ -7,7 +7,7 @@ python-multipart, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asgi-csrf"; version = "0.11"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = "asgi-csrf"; - tag = version; + tag = finalAttrs.version; hash = "sha256-STitMWabAPz61AU+5gFJSHBBqf67Q8UtS6ks8Q/ZybY="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/simonw/asgi-csrf"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/asgi-lifespan/default.nix b/python/pkgs/asgi-lifespan/default.nix index 01bdfc508..2f769a6a9 100644 --- a/python/pkgs/asgi-lifespan/default.nix +++ b/python/pkgs/asgi-lifespan/default.nix @@ -7,7 +7,7 @@ sniffio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asgi-lifespan"; version = "2.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "florimondmanca"; repo = "asgi-lifespan"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Jgmd/4c1lxHM/qi3MJNN1aSSUJrI7CRNwwHrFwwcCkc="; }; @@ -30,8 +30,6 @@ buildPythonPackage rec { dependencies = [ sniffio ]; - doCheck = false; - pythonImportsCheck = [ "asgi_lifespan" ]; meta = { @@ -39,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/florimondmanca/asgi-lifespan"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/asgi-logger/default.nix b/python/pkgs/asgi-logger/default.nix index 37eb243e0..be5f168e3 100644 --- a/python/pkgs/asgi-logger/default.nix +++ b/python/pkgs/asgi-logger/default.nix @@ -6,21 +6,20 @@ asgiref, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asgi-logger"; version = "0.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-son1ML9J0UMgJCpWdYD/yK0FO6VmfuzifSWpeCLToKo="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ asgiref ]; + dependencies = [ asgiref ]; # tests are not in the pypi release, and there are no tags/release corresponding to the pypi releases in the github - doCheck = false; pythonImportsCheck = [ "asgi_logger" ]; meta = { @@ -28,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/Kludex/asgi-logger"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/asgineer/default.nix b/python/pkgs/asgineer/default.nix index ee7ac8f4a..c9f681eea 100644 --- a/python/pkgs/asgineer/default.nix +++ b/python/pkgs/asgineer/default.nix @@ -7,7 +7,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asgineer"; version = "0.9.5"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "almarklein"; repo = "asgineer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8qI5eHt+UmQGZNCn12Iup9dIVd+aI6r3Z1R+u+SziMc="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://asgineer.readthedocs.io"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/asgiref/default.nix b/python/pkgs/asgiref/default.nix index 36d6be075..b8f6deb9a 100644 --- a/python/pkgs/asgiref/default.nix +++ b/python/pkgs/asgiref/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "3.11.0"; pname = "asgiref"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "django"; repo = "asgiref"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2ZaUIWGF5cQVNj95b7WiKGsn2wYsoJmJ/CfPhIEZdjc="; }; - propagatedBuildInputs = [ typing-extensions ]; + build-system = [ setuptools ]; + + dependencies = [ typing-extensions ]; pythonImportsCheck = [ "asgiref" ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/django/asgiref"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/asn1/default.nix b/python/pkgs/asn1/default.nix index 631d5f0d9..b9e3ae2bb 100644 --- a/python/pkgs/asn1/default.nix +++ b/python/pkgs/asn1/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asn1"; version = "3.3.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "andrivet"; repo = "python-asn1"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gqFW+akhWwvtqJQb4LqcgjyJb6bcInl0gT6f2CMTtA0="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/andrivet/python-asn1"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/asn1ate/default.nix b/python/pkgs/asn1ate/default.nix index 0a5489652..75b5b8f33 100644 --- a/python/pkgs/asn1ate/default.nix +++ b/python/pkgs/asn1ate/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pyparsing, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asn1ate"; - format = "setuptools"; + pyproject = true; version = "0.6"; src = fetchFromGitHub { sha256 = "1p8hv4gsyqsdr0gafcq497n52pybiqmc22di8ai4nsj60fv0km45"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; owner = "schneider-electric"; repo = "asn1ate"; }; - propagatedBuildInputs = [ pyparsing ]; + build-system = [ setuptools ]; + + dependencies = [ pyparsing ]; meta = { description = "Python library for translating ASN.1 into other forms"; @@ -26,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/asn1crypto/default.nix b/python/pkgs/asn1crypto/default.nix index d3896fc04..4ea293b44 100644 --- a/python/pkgs/asn1crypto/default.nix +++ b/python/pkgs/asn1crypto/default.nix @@ -13,7 +13,7 @@ let if lib.versionOlder python.version "3.12" then rec { version = "1.5.1"; - rev = version; + tag = version; hash = "sha256-M8vASxhaJPgkiTrAckxz7gk/QHkrFlNz7fFbnLEBT+M="; } else diff --git a/python/pkgs/asn1tools/default.nix b/python/pkgs/asn1tools/default.nix index e72cfa7e8..765d28ee8 100644 --- a/python/pkgs/asn1tools/default.nix +++ b/python/pkgs/asn1tools/default.nix @@ -18,7 +18,7 @@ pytest-xdist, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asn1tools"; version = "0.167.0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "eerimoq"; repo = "asn1tools"; - tag = version; + tag = finalAttrs.version; hash = "sha256-86bdBYlAVJfd3EY8s0t6ZDRA/qZVWuHD4Jxa1n1Ke5E="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "asn1tools"; }; -} +}) diff --git a/python/pkgs/aspectlib/default.nix b/python/pkgs/aspectlib/default.nix index 459441619..19fb4e6de 100644 --- a/python/pkgs/aspectlib/default.nix +++ b/python/pkgs/aspectlib/default.nix @@ -7,14 +7,14 @@ fields, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aspectlib"; version = "2.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-pLRhudoLUxrry5PvzePegIpyxgIm3Y2QLEZ9E/r3zpI="; }; @@ -35,7 +35,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ fields ]; + dependencies = [ fields ]; pythonImportsCheck = [ "aspectlib" @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/ionelmc/python-aspectlib"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/assertpy/default.nix b/python/pkgs/assertpy/default.nix index a7db1dd53..57f121f74 100644 --- a/python/pkgs/assertpy/default.nix +++ b/python/pkgs/assertpy/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "assertpy"; version = "1.1"; pyproject = true; @@ -13,14 +13,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "assertpy"; repo = "assertpy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TmDnwYvOQIpjwBpMCCn+qg68HnKc0qzVP9fjygqBzkI="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "assertpy" ]; meta = { @@ -28,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/assertpy/assertpy"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/asserts/default.nix b/python/pkgs/asserts/default.nix index e3eaf3cc3..5ab779500 100644 --- a/python/pkgs/asserts/default.nix +++ b/python/pkgs/asserts/default.nix @@ -13,7 +13,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asserts"; version = "0.14.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "srittau"; repo = "python-asserts"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nSL28LaKWVkzOmyI1TpCXJxyKdqpvK/YHRLUJ77sRA8="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/srittau/python-asserts"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/asterisk-mbox/default.nix b/python/pkgs/asterisk-mbox/default.nix index d4ea91686..8843227ca 100644 --- a/python/pkgs/asterisk-mbox/default.nix +++ b/python/pkgs/asterisk-mbox/default.nix @@ -7,14 +7,14 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asterisk-mbox"; version = "0.5.0"; pyproject = true; src = fetchPypi { pname = "asterisk_mbox"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-BiT5q4XOnE1DZV+GU+hTn6EMgbYP17lLGhXc4wbCCIg="; }; @@ -29,10 +29,9 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ packaging ]; + dependencies = [ packaging ]; # no tests implemented - doCheck = false; pythonImportsCheck = [ "asterisk_mbox" ]; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/PhracturedBlue/asterisk_mbox"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/asteval/default.nix b/python/pkgs/asteval/default.nix index fbb448ed3..a6f9a164e 100644 --- a/python/pkgs/asteval/default.nix +++ b/python/pkgs/asteval/default.nix @@ -5,13 +5,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asteval"; version = "1.0.10"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RqTtE8wuSimiFBj4ne3VfbcNmOuW2w+0xEHU7bL1r+0="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/lmfit/asteval"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/astor/default.nix b/python/pkgs/astor/default.nix index 132448178..c7a35260a 100644 --- a/python/pkgs/astor/default.nix +++ b/python/pkgs/astor/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "astor"; version = "0.8.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-am7/2pP04c6fYYd5st0dnYTx4ygSwjops//2/X9j+l4="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "astor" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/berkerpeksag/astor"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/astral/default.nix b/python/pkgs/astral/default.nix index 45a01ed08..a23bdaece 100644 --- a/python/pkgs/astral/default.nix +++ b/python/pkgs/astral/default.nix @@ -5,13 +5,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "astral"; version = "3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-m3w7QS6eadFyz7JL4Oat3MnxvQGijbi+vmbXXMxTPYg="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/sffjunkie/astral/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/astropy-iers-data/default.nix b/python/pkgs/astropy-iers-data/default.nix index a642e4cc2..aa8f5675f 100644 --- a/python/pkgs/astropy-iers-data/default.nix +++ b/python/pkgs/astropy-iers-data/default.nix @@ -26,7 +26,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "astropy_iers_data" ]; # no tests - doCheck = false; meta = { description = "IERS data maintained by @astrofrog and astropy.utils.iers maintainers"; diff --git a/python/pkgs/astropy/default.nix b/python/pkgs/astropy/default.nix index c134592ee..d63f9f14e 100644 --- a/python/pkgs/astropy/default.nix +++ b/python/pkgs/astropy/default.nix @@ -14,7 +14,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "astropy"; version = "8.0.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astropy"; repo = "astropy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-q6GZp7gIDilSflUnFiBXhzlIBXsCPeUa/vGop3JXbK4="; }; @@ -45,8 +45,6 @@ buildPythonPackage rec { pyyaml ]; - doCheck = false; - pythonImportsCheck = [ "astropy" ]; meta = { @@ -55,4 +53,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/astroquery/default.nix b/python/pkgs/astroquery/default.nix index b022bcfb4..e7ed301d5 100644 --- a/python/pkgs/astroquery/default.nix +++ b/python/pkgs/astroquery/default.nix @@ -8,10 +8,11 @@ beautifulsoup4, html5lib, pyvo, - setuptools, + setuptools_80, + setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "astroquery"; version = "0.4.11"; pyproject = true; @@ -19,11 +20,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astropy"; repo = "astroquery"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BcdRBPnJfuW17p31xUhjBmP7Lv98CnmOTCO4aU0xpMM="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools_80 + setuptools-scm + ]; dependencies = [ astropy @@ -34,9 +38,15 @@ buildPythonPackage rec { pyvo ]; - # Disable automatic update of the astropy-helper module postPatch = '' - substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" + substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" + # Remove astropy_helpers dependency - use setuptools directly + cat > setup.py << 'EOF' + from setuptools import setup + setup() + EOF + # Remove extra directories that confuse flat-layout discovery + rm -rf astropy_helpers licenses ''; meta = { @@ -44,4 +54,4 @@ buildPythonPackage rec { homepage = "https://astroquery.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/asttokens/default.nix b/python/pkgs/asttokens/default.nix index 90ab2d375..bee448475 100644 --- a/python/pkgs/asttokens/default.nix +++ b/python/pkgs/asttokens/default.nix @@ -5,7 +5,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asttokens"; version = "3.0.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gristlabs"; repo = "asttokens"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qdjfhcU1Of07hEY9HZ8qUofPoYBixE4RnIohYMQWsqU="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/gristlabs/asttokens"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/astunparse/default.nix b/python/pkgs/astunparse/default.nix index a1c53171d..e10f1525f 100644 --- a/python/pkgs/astunparse/default.nix +++ b/python/pkgs/astunparse/default.nix @@ -7,13 +7,13 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "astunparse"; version = "1.6.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Wtk6hFbw0ITDRW0Fn9mpLM5meWMjLL92Pqw7xbeUCHI="; }; @@ -25,7 +25,6 @@ buildPythonPackage rec { ]; # tests not included with pypi release - doCheck = false; pythonImportsCheck = [ "astunparse" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/simonpercivall/astunparse"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/asusrouter/default.nix b/python/pkgs/asusrouter/default.nix index 15df5a1ea..f9c10bc9a 100644 --- a/python/pkgs/asusrouter/default.nix +++ b/python/pkgs/asusrouter/default.nix @@ -10,7 +10,7 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asusrouter"; version = "1.21.3"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Vaskivskyi"; repo = "asusrouter"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7OmuJ3VKBdg5hK8RAkA8DQGd4L+g9S17VT0B5JhNaSA="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/Vaskivskyi/asusrouter"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/asyauth/default.nix b/python/pkgs/asyauth/default.nix index 149a46bfb..9cc57e7ac 100644 --- a/python/pkgs/asyauth/default.nix +++ b/python/pkgs/asyauth/default.nix @@ -9,13 +9,13 @@ unicrypto, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyauth"; version = "0.0.23"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NvA4TdsrYloQMzNjyv4ZDW6cntF/0Hs+KIdkGjzGJvA="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/skelsec/asyauth"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/async-generator/default.nix b/python/pkgs/async-generator/default.nix index c82bc41d0..330a095a1 100644 --- a/python/pkgs/async-generator/default.nix +++ b/python/pkgs/async-generator/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "async-generator"; version = "1.10"; pyproject = true; src = fetchPypi { pname = "async_generator"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-brs9EGwSkgqq5CzLb3h+9e79zdFm6j1ij6hHar5xIUQ="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { asl20 ]; }; -} +}) diff --git a/python/pkgs/async-interrupt/default.nix b/python/pkgs/async-interrupt/default.nix index d17364955..27ccaad3b 100644 --- a/python/pkgs/async-interrupt/default.nix +++ b/python/pkgs/async-interrupt/default.nix @@ -7,7 +7,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "async-interrupt"; version = "1.2.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = "async_interrupt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-M0ftyHstBP7+6M2b6yV33mSuO4B8QF3ixRvNJ/WeSEA="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/bdraco/async_interrupt"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/async-lru/default.nix b/python/pkgs/async-lru/default.nix index ea6ab3e84..51229a959 100644 --- a/python/pkgs/async-lru/default.nix +++ b/python/pkgs/async-lru/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "async-lru"; version = "2.3.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "async-lru"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ytmh6tY6AS2VHajCnnRBSi0i57DUu+ikpbil/RwFyYA="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/wikibusiness/async_lru"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/async-stagger/default.nix b/python/pkgs/async-stagger/default.nix index 1a0d678aa..4e5a4442a 100644 --- a/python/pkgs/async-stagger/default.nix +++ b/python/pkgs/async-stagger/default.nix @@ -8,7 +8,7 @@ pytest-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "async-stagger"; version = "0.4.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "twisteroidambassador"; repo = "async_stagger"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qLeTP5FWHho/CbXth3OQNW15Y8uibOh35KqskoIUTHQ="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/twisteroidambassador/async_stagger"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/async-timeout/default.nix b/python/pkgs/async-timeout/default.nix index 232deb6a9..187cb0cf4 100644 --- a/python/pkgs/async-timeout/default.nix +++ b/python/pkgs/async-timeout/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "async-timeout"; version = "5.0.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "async-timeout"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lsSoIv2SnAJbv7V1eRognjv0cCQONwJMlb6fum9wQ/s="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/async_timeout/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/async-upnp-client/default.nix b/python/pkgs/async-upnp-client/default.nix index 06a70bf25..bdfd71701 100644 --- a/python/pkgs/async-upnp-client/default.nix +++ b/python/pkgs/async-upnp-client/default.nix @@ -11,7 +11,7 @@ voluptuous, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "async-upnp-client"; version = "0.48.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bORaKv0ntXubjGuVNKVRaWeKgqvmN5HEmTYqva8yobQ="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "upnp-client"; }; -} +}) diff --git a/python/pkgs/asyncarve/default.nix b/python/pkgs/asyncarve/default.nix index 3d540a62c..4acae9d34 100644 --- a/python/pkgs/asyncarve/default.nix +++ b/python/pkgs/asyncarve/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncarve"; version = "0.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5h56Sr0kPLrNPU70W90WsjmWax/N90dRMJ6lI5Mg86E="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # No tests in repo - doCheck = false; pythonImportsCheck = [ "asyncarve" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/arvetech/asyncarve"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/asyncclick/default.nix b/python/pkgs/asyncclick/default.nix index 8c4c93dca..c9bff22cc 100644 --- a/python/pkgs/asyncclick/default.nix +++ b/python/pkgs/asyncclick/default.nix @@ -8,7 +8,7 @@ trio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncclick"; version = "8.3.0.5"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-trio"; repo = "asyncclick"; - tag = "${version}+async"; + tag = "${finalAttrs.version}+async"; hash = "sha256-gKtxwI/vDB2pDrhiA+e1TClwW5nXvBRCMF3oCNoLaDo="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-trio/asyncclick"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/asynccmd/default.nix b/python/pkgs/asynccmd/default.nix index ed3a51e86..934947023 100644 --- a/python/pkgs/asynccmd/default.nix +++ b/python/pkgs/asynccmd/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asynccmd"; version = "0.2.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "valentinmk"; repo = "asynccmd"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0AjOKAEiwHi3AkzMGRvE/czTCfShXQAm8mDz98EESgs="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; # Tests are outdated - doCheck = false; pythonImportsCheck = [ "asynccmd" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/valentinmk/asynccmd"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/asyncer/default.nix b/python/pkgs/asyncer/default.nix index 613d0c0c9..374e01418 100644 --- a/python/pkgs/asyncer/default.nix +++ b/python/pkgs/asyncer/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncer"; version = "0.0.18"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fastapi"; repo = "asyncer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-PoIyE+Mv+Uo74R6mXv2unKU396UW3/8085zvR1jYVvQ="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/fastapi/asyncer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/asyncinotify/default.nix b/python/pkgs/asyncinotify/default.nix index 6c81d4d67..fd4542455 100644 --- a/python/pkgs/asyncinotify/default.nix +++ b/python/pkgs/asyncinotify/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncinotify"; version = "4.4.4"; pyproject = true; @@ -13,14 +13,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "absperf"; repo = "asyncinotify"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NncqHS6JK9OYv/155PXYi0Sg4oX7p0WAGZ9wnvoYlgE="; }; build-system = [ flit-core ]; - doCheck = false; - pythonImportsCheck = [ "asyncinotify" ]; meta = { @@ -28,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/absperf/asyncinotify"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/asyncio-rlock/default.nix b/python/pkgs/asyncio-rlock/default.nix index e5abd7949..3bd0cfcf1 100644 --- a/python/pkgs/asyncio-rlock/default.nix +++ b/python/pkgs/asyncio-rlock/default.nix @@ -19,7 +19,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # no tests on PyPI, no tags on GitLab - doCheck = false; pythonImportsCheck = [ "asyncio_rlock" ]; diff --git a/python/pkgs/asyncmy/default.nix b/python/pkgs/asyncmy/default.nix index fb319cfac..5c1b9eafc 100644 --- a/python/pkgs/asyncmy/default.nix +++ b/python/pkgs/asyncmy/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncmy"; version = "0.2.14"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "long2ice"; repo = "asyncmy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bUpuFHfHW5mDtcbLk7Ro2gGq48sw3v3adY8tQ23e460="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # Not running tests as aiomysql is missing support for pymysql>=0.9.3 - doCheck = false; pythonImportsCheck = [ "asyncmy" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/long2ice/asyncmy"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/asyncpg/default.nix b/python/pkgs/asyncpg/default.nix index b4b9bcbb6..f7b831b48 100644 --- a/python/pkgs/asyncpg/default.nix +++ b/python/pkgs/asyncpg/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncpg"; version = "0.31.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yYk4bIOUC/vXhxgPKxUZQV4tPWJ3pw2dDwFFrHNQBzU="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { ''; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/asyncpysupla/default.nix b/python/pkgs/asyncpysupla/default.nix index a1c23359b..6723a8ee9 100644 --- a/python/pkgs/asyncpysupla/default.nix +++ b/python/pkgs/asyncpysupla/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncpysupla"; version = "0.0.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-sRw4qAkHPIIc27FtxIe2vOvSK9PPBJYOZzDLgGYapDc="; }; @@ -21,7 +21,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; # Tests require API credentials and network access - doCheck = false; pythonImportsCheck = [ "asyncpysupla" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/mwegrzynek/asyncpysupla"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/asyncserial/default.nix b/python/pkgs/asyncserial/default.nix index 88c8dea14..eb6bb4c01 100644 --- a/python/pkgs/asyncserial/default.nix +++ b/python/pkgs/asyncserial/default.nix @@ -6,7 +6,7 @@ pyserial, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncserial"; version = "1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "m-labs"; repo = "asyncserial"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ZHzgJnbsDVxVcp09LXq9JZp46+dorgdP8bAiTB59K28="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/m-labs/asyncserial"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/asyncsleepiq/default.nix b/python/pkgs/asyncsleepiq/default.nix index eddbde6be..4aff3b3ac 100644 --- a/python/pkgs/asyncsleepiq/default.nix +++ b/python/pkgs/asyncsleepiq/default.nix @@ -6,22 +6,21 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncsleepiq"; version = "1.7.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gOg1cxd2OsDRg5jtc6MfEMsK9T0Croo8K1jzsvbAbdY="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; # upstream has no tests - doCheck = false; pythonImportsCheck = [ "asyncsleepiq" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/kbickar/asyncsleepiq"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/asyncssh/default.nix b/python/pkgs/asyncssh/default.nix index 4a8f377ed..875ace948 100644 --- a/python/pkgs/asyncssh/default.nix +++ b/python/pkgs/asyncssh/default.nix @@ -19,13 +19,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncssh"; version = "2.24.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QGTFkOWc4ujYKi9m018xINdlgotN9ePb+we0qMJGhsk="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { gpl2Plus ]; }; -} +}) diff --git a/python/pkgs/asyncstdlib/default.nix b/python/pkgs/asyncstdlib/default.nix index 1230663bb..ba35b8b6b 100644 --- a/python/pkgs/asyncstdlib/default.nix +++ b/python/pkgs/asyncstdlib/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncstdlib"; version = "3.14.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+ZOWmSo7unSV2M9sgyv+jIcn9hITIz01aaWpy9HAQ4U="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://asyncstdlib.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/asysocks/default.nix b/python/pkgs/asysocks/default.nix index fb00138d8..7ec8a5482 100644 --- a/python/pkgs/asysocks/default.nix +++ b/python/pkgs/asysocks/default.nix @@ -8,13 +8,13 @@ h11, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asysocks"; version = "0.2.18"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zGGW6CyK3Is84jId3fY1UAx2AxbaS3zKMhtTLLs9/fU="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/skelsec/asysocks"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/atom/default.nix b/python/pkgs/atom/default.nix index 0cb8fd5cb..4409b58af 100644 --- a/python/pkgs/atom/default.nix +++ b/python/pkgs/atom/default.nix @@ -6,7 +6,7 @@ cppy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "atom"; version = "0.12.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nucleic"; repo = "atom"; - tag = version; + tag = finalAttrs.version; hash = "sha256-XFJujJrxubtdCLTr1oaM7h0LNS1Ep08f8+1tRzARBqs="; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Memory efficient Python objects"; homepage = "https://github.com/nucleic/atom"; - changelog = "https://github.com/nucleic/atom/releases/tag/${version}"; + changelog = "https://github.com/nucleic/atom/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/atomiclong/default.nix b/python/pkgs/atomiclong/default.nix index f52cd48dc..762be3b3b 100644 --- a/python/pkgs/atomiclong/default.nix +++ b/python/pkgs/atomiclong/default.nix @@ -6,13 +6,13 @@ cffi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "atomiclong"; version = "0.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yxN4xM1nbW8kNkHFDid1BKv0X3Dx6nbkRu/Nu2liS74="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/dreid/atomiclong"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/atomicwrites/default.nix b/python/pkgs/atomicwrites/default.nix index b81464573..b4c7f493b 100644 --- a/python/pkgs/atomicwrites/default.nix +++ b/python/pkgs/atomicwrites/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "atomicwrites"; version = "1.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gbLJBxpJNnp/dwFw5e7Iy2ZWfPu8jHPSDOXKSo1xzxE="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/atomicwrites/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/atopile-easyeda2kicad/default.nix b/python/pkgs/atopile-easyeda2kicad/default.nix index 8cfd82aa0..354a27f68 100644 --- a/python/pkgs/atopile-easyeda2kicad/default.nix +++ b/python/pkgs/atopile-easyeda2kicad/default.nix @@ -40,8 +40,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "easyeda2kicad" ]; - doCheck = false; # no tests - meta = { description = "Convert any LCSC components (including EasyEDA) to KiCad library"; homepage = "https://github.com/atopile/easyeda2kicad.py"; diff --git a/python/pkgs/atpublic/default.nix b/python/pkgs/atpublic/default.nix index 94f52f01b..efc918bc8 100644 --- a/python/pkgs/atpublic/default.nix +++ b/python/pkgs/atpublic/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "atpublic"; version = "8.0.0a1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-e9s+g9p6bnQdDH7m0nFDRnxoxXJ34f/q/oAEJZZ+ozM="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://public.readthedocs.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/atsim-potentials/default.nix b/python/pkgs/atsim-potentials/default.nix index 0bc9c58b6..85ab480b8 100644 --- a/python/pkgs/atsim-potentials/default.nix +++ b/python/pkgs/atsim-potentials/default.nix @@ -16,7 +16,7 @@ sympy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "atsim-potentials"; version = "0.4.1"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mjdrushton"; repo = "atsim-potentials"; - tag = version; + tag = finalAttrs.version; hash = "sha256-G7lNqwEUwAT0f7M2nUTCxpXOAl6FWKlh7tcsvbur1eM="; }; @@ -71,4 +71,4 @@ buildPythonPackage rec { mainProgram = "potable"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/attr/default.nix b/python/pkgs/attr/default.nix index 1a733fdd0..3032b201e 100644 --- a/python/pkgs/attr/default.nix +++ b/python/pkgs/attr/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "attr"; version = "0.3.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "denis-ryzhkov"; repo = "attr"; - rev = version; + tag = finalAttrs.version; hash = "sha256-1gOAONDuZb7xEPFZJc00BRtFF06uX65S8b3RRRNGeSo="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/denis-ryzhkov/attr"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/attrdict/default.nix b/python/pkgs/attrdict/default.nix index 867498153..3a3318b44 100644 --- a/python/pkgs/attrdict/default.nix +++ b/python/pkgs/attrdict/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "attrdict"; version = "2.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NckGmLVcaDlGCRF3F3qenAcToIYPDgSf69cmSczXe3A="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/bcj/AttrDict"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/attrs/default.nix b/python/pkgs/attrs/default.nix index 57b685c09..6be6a43e2 100644 --- a/python/pkgs/attrs/default.nix +++ b/python/pkgs/attrs/default.nix @@ -6,19 +6,19 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "attrs"; version = "26.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0DzricsyKo/XBtT7kZQHN7ZkKqNpmP4TCpvJbJhe/zI="; }; patches = [ (replaceVars ./remove-hatch-plugins.patch { - inherit version; + inherit (finalAttrs) version; }) ]; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-attrs/attrs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/audible/default.nix b/python/pkgs/audible/default.nix index ac40b0b6f..4d4c4557f 100644 --- a/python/pkgs/audible/default.nix +++ b/python/pkgs/audible/default.nix @@ -18,7 +18,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "audible"; version = "0.10.0"; pyproject = true; @@ -26,13 +26,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkb79"; repo = "Audible"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ILGhjuPIxpRxu/dVDmz531FUgMWosk4P+onPJltuPIs="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ pillow beautifulsoup4 httpx @@ -50,4 +50,4 @@ buildPythonPackage rec { license = lib.licenses.agpl3Only; homepage = "https://github.com/mkb79/Audible"; }; -} +}) diff --git a/python/pkgs/audioop-lts/default.nix b/python/pkgs/audioop-lts/default.nix index 309fa24d9..6db438ab6 100644 --- a/python/pkgs/audioop-lts/default.nix +++ b/python/pkgs/audioop-lts/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "audioop-lts"; version = "0.2.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AbstractUmbra"; repo = "audioop"; - tag = version; + tag = finalAttrs.version; hash = "sha256-C1z24kH5t0RSVqjT8SBdrilMtVs7pTI1vd+iwMk3RXE="; }; @@ -25,9 +25,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "audioop" ]; meta = { - changelog = "https://github.com/AbstractUmbra/audioop/releases/tag/${version}"; + changelog = "https://github.com/AbstractUmbra/audioop/releases/tag/${finalAttrs.version}"; description = "LTS port of Python's audioop module"; homepage = "https://github.com/AbstractUmbra/audioop"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/auditwheel/default.nix b/python/pkgs/auditwheel/default.nix index ef8cb7fff..ae109504b 100644 --- a/python/pkgs/auditwheel/default.nix +++ b/python/pkgs/auditwheel/default.nix @@ -7,13 +7,13 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "auditwheel"; version = "6.8.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0AfE/YycS1ETaQqwsVngXFqpstMbae/ECHWCbMCVWUs="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { mainProgram = "auditwheel"; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/augmax/default.nix b/python/pkgs/augmax/default.nix index a98f020a2..1a48e1e7f 100644 --- a/python/pkgs/augmax/default.nix +++ b/python/pkgs/augmax/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "augmax"; version = "0.3.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "khdlr"; repo = "augmax"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FXgkhZEAR1Y2LvVvV+IWMSQDWrLulLDsSKKuw4ER5wg="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/khdlr/augmax"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/auroranoaa/default.nix b/python/pkgs/auroranoaa/default.nix index 9db83e617..8b17e39a8 100644 --- a/python/pkgs/auroranoaa/default.nix +++ b/python/pkgs/auroranoaa/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "auroranoaa"; version = "0.0.5"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "djtimca"; repo = "aurora-api"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bQDFSbYFsGtvPuJNMykynOpBTIeloUoCVRtIuHXR4n0="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "auroranoaa" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/djtimca/aurora-api"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/auth0-python/default.nix b/python/pkgs/auth0-python/default.nix index 91d197ae5..71f6e5cb1 100644 --- a/python/pkgs/auth0-python/default.nix +++ b/python/pkgs/auth0-python/default.nix @@ -18,7 +18,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "auth0-python"; version = "6.4.0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "auth0"; repo = "auth0-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-T3JxjDbaM/33fzywHJs9mfj3Qn7/v/yzeK9IcMAL4ys="; }; @@ -35,7 +35,7 @@ buildPythonPackage rec { poetry-dynamic-versioning ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp cryptography httpx @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/auth0/auth0-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/authcaptureproxy/default.nix b/python/pkgs/authcaptureproxy/default.nix index 676d22403..a3d3638ea 100644 --- a/python/pkgs/authcaptureproxy/default.nix +++ b/python/pkgs/authcaptureproxy/default.nix @@ -19,7 +19,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "authcaptureproxy"; version = "1.3.7"; pyproject = true; @@ -27,13 +27,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3osyh4Er0bZ8dvOtDV1w66zOWuzECIWeL8M90gqi+D8="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp beautifulsoup4 httpx @@ -63,4 +63,4 @@ buildPythonPackage rec { homepage = "https://github.com/alandtse/auth_capture_proxy"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/authheaders/default.nix b/python/pkgs/authheaders/default.nix index 7bc8450fd..d2fa0e78b 100644 --- a/python/pkgs/authheaders/default.nix +++ b/python/pkgs/authheaders/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "authheaders"; version = "0.16.3"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ValiMail"; repo = "authentication-headers"; - tag = version; + tag = finalAttrs.version; hash = "sha256-BFMZpSJ4qCEL42xTiM/D5dkatxohiCrOWAkNZHFUhac="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "dmarc-policy-find"; }; -} +}) diff --git a/python/pkgs/authres/default.nix b/python/pkgs/authres/default.nix index 911f19d17..24d6bfc6b 100644 --- a/python/pkgs/authres/default.nix +++ b/python/pkgs/authres/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "authres"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-k9G5la184h5i22SfNhBIEl3WAiVjoK6KI5CUZfH9Jbc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://launchpad.net/authentication-results-python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/autobahn/default.nix b/python/pkgs/autobahn/default.nix index a99d9bf03..fd9060c11 100644 --- a/python/pkgs/autobahn/default.nix +++ b/python/pkgs/autobahn/default.nix @@ -93,6 +93,13 @@ buildPythonPackage (finalAttrs: { ]; }); + pythonRemoveDeps = [ + "cbor2" + "msgpack" + "py-ubjson" + "ujson" + ]; + pythonImportsCheck = [ "autobahn" ]; meta = { diff --git a/python/pkgs/autocommand/default.nix b/python/pkgs/autocommand/default.nix index f9bf9e88a..30c378556 100644 --- a/python/pkgs/autocommand/default.nix +++ b/python/pkgs/autocommand/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "autocommand"; version = "2.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-h43pQjxVlkkRZyJcKkVQQ8MTD7W3KGrINEPUXnSVXzQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Autocommand turns a python function into a CLI program"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/autodocsumm/default.nix b/python/pkgs/autodocsumm/default.nix index fc055d80f..d484081b8 100644 --- a/python/pkgs/autodocsumm/default.nix +++ b/python/pkgs/autodocsumm/default.nix @@ -7,13 +7,13 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "autodocsumm"; version = "0.2.15"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6vQx56WjnkGiFTERc8i5XoOFkFnfHM87ecZL89VYKzw="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/Chilipp/autodocsumm"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/autoflake/default.nix b/python/pkgs/autoflake/default.nix index d8efb406c..2017698b0 100644 --- a/python/pkgs/autoflake/default.nix +++ b/python/pkgs/autoflake/default.nix @@ -5,19 +5,19 @@ hatchling, pyflakes, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "autoflake"; version = "2.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-73xJbZvOnSzvBJ8k5ILR0wkMN/vUTl6F37ANs8eO4Ww="; }; nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ pyflakes ]; + dependencies = [ pyflakes ]; pythonImportsCheck = [ "autoflake" ]; meta = { description = "Tool to remove unused imports and unused variables"; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/myint/autoflake"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/autograd-gamma/default.nix b/python/pkgs/autograd-gamma/default.nix index 988a76db4..c10c6e2fc 100644 --- a/python/pkgs/autograd-gamma/default.nix +++ b/python/pkgs/autograd-gamma/default.nix @@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "autograd_gamma" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { homepage = "https://github.com/CamDavidsonPilon/autograd-gamma"; diff --git a/python/pkgs/autograd/default.nix b/python/pkgs/autograd/default.nix index e1b2b766f..4724ae5ef 100644 --- a/python/pkgs/autograd/default.nix +++ b/python/pkgs/autograd/default.nix @@ -14,7 +14,7 @@ pytest-xdist, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "autograd"; version = "1.9.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "HIPS"; repo = "autograd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2sMOrhtNmp1dahN9SLRaAPZgaAnHzeviGIcXT617YDA="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/HIPS/autograd"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/autoit-ripper/default.nix b/python/pkgs/autoit-ripper/default.nix index 7ed4a7354..4410ceb9b 100644 --- a/python/pkgs/autoit-ripper/default.nix +++ b/python/pkgs/autoit-ripper/default.nix @@ -6,22 +6,21 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "autoit-ripper"; version = "1.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+BHWDkeVewoRUgaHln5TyoajpCvJiowCiC2dFYyp1MA="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ pefile ]; + dependencies = [ pefile ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "autoit_ripper" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/nazywam/AutoIt-Ripper"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/automat/default.nix b/python/pkgs/automat/default.nix index 98718cee8..05fa73a7b 100644 --- a/python/pkgs/automat/default.nix +++ b/python/pkgs/automat/default.nix @@ -7,13 +7,13 @@ attrs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "automat"; version = "25.4.16"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ABdZGlR3Bm6Q0msOaW3cFDuq/Ye1iM+sgQC8a+ljTeA="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { description = "Self-service finite-state machines for the programmer on the go"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/automx2/default.nix b/python/pkgs/automx2/default.nix index 7bda96bbd..7af5a360b 100644 --- a/python/pkgs/automx2/default.nix +++ b/python/pkgs/automx2/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "automx2"; version = "2026.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rseichter"; repo = "automx2"; - tag = version; + tag = finalAttrs.version; hash = "sha256-MT295HIcYJSsBmGaAK6V1yH49pj2A7e2E9H4QB955yc="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://rseichter.github.io/automx2/"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/autopage/default.nix b/python/pkgs/autopage/default.nix index 3fee88d74..3e76728dc 100644 --- a/python/pkgs/autopage/default.nix +++ b/python/pkgs/autopage/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "autopage"; version = "0.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QtB96Q3mPoN2KCgCi/1W0ZkGoY98lR727vPprUijBx0="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Library to provide automatic paging for console output"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/autopep8/default.nix b/python/pkgs/autopep8/default.nix index 151dc5d5f..74666a6af 100644 --- a/python/pkgs/autopep8/default.nix +++ b/python/pkgs/autopep8/default.nix @@ -6,13 +6,13 @@ pycodestyle, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "autopep8"; version = "2.3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iUQKT5aRl7aamV5M4GYbAx9FWp93bSxbo9vYNGaTF1g="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { dependencies = [ pycodestyle ]; - doCheck = false; - pythonImportsCheck = [ "autopep8" ]; meta = { @@ -30,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "autopep8"; }; -} +}) diff --git a/python/pkgs/autopxd2/default.nix b/python/pkgs/autopxd2/default.nix index 10ee759fd..ec2aa6aac 100644 --- a/python/pkgs/autopxd2/default.nix +++ b/python/pkgs/autopxd2/default.nix @@ -9,15 +9,14 @@ cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-autopxd2"; version = "3.2.3"; pyproject = true; - __structuredAttrs = true; src = fetchPypi { pname = "autopxd2"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Zf44gmkuWvp8lfrScq4GAhOisLYu4scyuNp1Cn3lnVc="; }; @@ -52,4 +51,4 @@ buildPythonPackage rec { license = lib.licenses.mit; description = "Generates .pxd files automatically from .h files"; }; -} +}) diff --git a/python/pkgs/autoslot/default.nix b/python/pkgs/autoslot/default.nix index bb9d75604..f66166dbb 100644 --- a/python/pkgs/autoslot/default.nix +++ b/python/pkgs/autoslot/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "autoslot"; version = "2025.11.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cjrh"; repo = "autoslot"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mPGfBUSKkskiiokqo/TJWdDzuvcg/LDULx+Gx8LexV8="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/cjrh/autoslot"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/av/default.nix b/python/pkgs/av/default.nix index 200656fdd..8b43ebe7b 100644 --- a/python/pkgs/av/default.nix +++ b/python/pkgs/av/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { pname = "av"; version = "18.1.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "PyAV-Org"; diff --git a/python/pkgs/avro-python3/default.nix b/python/pkgs/avro-python3/default.nix index 758da18a4..5e1872ff4 100644 --- a/python/pkgs/avro-python3/default.nix +++ b/python/pkgs/avro-python3/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { pycodestyle isort ]; - doCheck = false; # No such file or directory: './run_tests.py meta = { description = "Serialization and RPC framework"; diff --git a/python/pkgs/avro/default.nix b/python/pkgs/avro/default.nix index aa62aa4fe..b5a601130 100644 --- a/python/pkgs/avro/default.nix +++ b/python/pkgs/avro/default.nix @@ -5,13 +5,13 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "avro"; version = "1.12.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6QDntZpHgfY9npNeiPbsUMTWC+P0rfnGO1HtOdV4/gg="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "avro"; }; -} +}) diff --git a/python/pkgs/awacs/default.nix b/python/pkgs/awacs/default.nix index d138763ab..f4c0c5528 100644 --- a/python/pkgs/awacs/default.nix +++ b/python/pkgs/awacs/default.nix @@ -6,13 +6,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "awacs"; version = "2.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eRmxXir9X08+YEVE+Bxa+OuasPokgcUoc1SJWGeRJ58="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/cloudtools/awacs"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/awesomeversion/default.nix b/python/pkgs/awesomeversion/default.nix index 1053eb498..c8ed9eb75 100644 --- a/python/pkgs/awesomeversion/default.nix +++ b/python/pkgs/awesomeversion/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "awesomeversion"; version = "25.8.0"; pyproject = true; @@ -13,13 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = "awesomeversion"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2CEuJagUkYwtjzpQLYLlz+V5e2feEU6di3wI0+uWuy4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "0"' 'version = "${version}"' + --replace-fail 'version = "0"' 'version = "${finalAttrs.version}"' ''; build-system = [ hatchling ]; @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "Python module to deal with versions"; homepage = "https://github.com/ludeeus/awesomeversion"; - changelog = "https://github.com/ludeeus/awesomeversion/releases/tag/${src.tag}"; + changelog = "https://github.com/ludeeus/awesomeversion/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/awkward-cpp/default.nix b/python/pkgs/awkward-cpp/default.nix index fd4d893df..2ba31b815 100644 --- a/python/pkgs/awkward-cpp/default.nix +++ b/python/pkgs/awkward-cpp/default.nix @@ -19,7 +19,6 @@ buildPythonPackage (finalAttrs: { pname = "awkward-cpp"; version = "56"; pyproject = true; - __structuredAttrs = true; src = fetchPypi { pname = "awkward_cpp"; diff --git a/python/pkgs/awkward/default.nix b/python/pkgs/awkward/default.nix index ec5a32c27..78b874a09 100644 --- a/python/pkgs/awkward/default.nix +++ b/python/pkgs/awkward/default.nix @@ -16,7 +16,6 @@ buildPythonPackage (finalAttrs: { pname = "awkward"; version = "2.13.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "scikit-hep"; diff --git a/python/pkgs/aws-adfs/default.nix b/python/pkgs/aws-adfs/default.nix index 0b79dcd89..002c8277c 100644 --- a/python/pkgs/aws-adfs/default.nix +++ b/python/pkgs/aws-adfs/default.nix @@ -16,7 +16,7 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aws-adfs"; version = "2.13.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "venth"; repo = "aws-adfs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FqE4v6Ao8Gc0S1w4GN9rytXqIt2CMQOlO81mXe8xZtM="; }; @@ -68,4 +68,4 @@ buildPythonPackage rec { license = lib.licenses.psfl; mainProgram = "aws-adfs"; }; -} +}) diff --git a/python/pkgs/aws-error-utils/default.nix b/python/pkgs/aws-error-utils/default.nix index 4c5b297e4..13532075c 100644 --- a/python/pkgs/aws-error-utils/default.nix +++ b/python/pkgs/aws-error-utils/default.nix @@ -6,14 +6,14 @@ botocore, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aws-error-utils"; version = "2.7.0"; pyproject = true; src = fetchPypi { pname = "aws_error_utils"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-BxB68qLCZwbNlSW3/77UPy0HtQ0n45+ekVbBGy6ZPJc="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/aws-error-utils/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aws-lambda-builders/default.nix b/python/pkgs/aws-lambda-builders/default.nix index 29da12696..b8b532bda 100644 --- a/python/pkgs/aws-lambda-builders/default.nix +++ b/python/pkgs/aws-lambda-builders/default.nix @@ -11,7 +11,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aws-lambda-builders"; version = "1.67.0"; pyproject = true; @@ -19,13 +19,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eCnjqIZxnbMawKlCSk4khfYcX3I/+bAX8ODe2kFxNsE="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail "version=read_version()," 'version="${version}",' + --replace-fail "version=read_version()," 'version="${finalAttrs.version}",' ''; build-system = [ setuptools ]; @@ -79,4 +79,4 @@ buildPythonPackage rec { ''; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aws-request-signer/default.nix b/python/pkgs/aws-request-signer/default.nix index 9a30cb83e..23e30316f 100644 --- a/python/pkgs/aws-request-signer/default.nix +++ b/python/pkgs/aws-request-signer/default.nix @@ -7,13 +7,13 @@ requests-toolbelt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aws-request-signer"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "aws_request_signer"; hash = "sha256-DVorDO0wz94Fhduax7VsQZ5B5SnBfsHQoLoW4m6Ce+U="; }; @@ -31,11 +31,9 @@ buildPythonPackage rec { requests-toolbelt ]; - doCheck = false; - meta = { description = "Python library to sign AWS requests using AWS Signature V4"; homepage = "https://github.com/iksteen/aws-request-signer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/aws-sam-translator/default.nix b/python/pkgs/aws-sam-translator/default.nix index 653c46721..d4c6ac0dd 100644 --- a/python/pkgs/aws-sam-translator/default.nix +++ b/python/pkgs/aws-sam-translator/default.nix @@ -15,7 +15,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aws-sam-translator"; version = "1.113.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws"; repo = "serverless-application-model"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gEW7oOysAD9Czk8MDziyrnW5bDw4GCYpA0aZOHXnEEI="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/aws/serverless-application-model"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aws-secretsmanager-caching/default.nix b/python/pkgs/aws-secretsmanager-caching/default.nix index ff8af3d25..cbd87f13e 100644 --- a/python/pkgs/aws-secretsmanager-caching/default.nix +++ b/python/pkgs/aws-secretsmanager-caching/default.nix @@ -9,14 +9,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aws-secretsmanager-caching"; version = "1.1.3"; pyproject = true; src = fetchPypi { pname = "aws_secretsmanager_caching"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-9tbsnUPg2+T21d6982tMtpHRWpZ7NYsldfXZGXSmwP8="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { ''; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aws-sso-lib/default.nix b/python/pkgs/aws-sso-lib/default.nix index ddf0d44e5..7084a4c87 100644 --- a/python/pkgs/aws-sso-lib/default.nix +++ b/python/pkgs/aws-sso-lib/default.nix @@ -7,14 +7,14 @@ boto3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aws-sso-lib"; version = "1.14.0"; pyproject = true; src = fetchPypi { pname = "aws_sso_lib"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-sCA6ZMy2a6ePme89DrZpr/57wyP2q5yqyX81whoDzqU="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/aws-sso-lib/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/aws-xray-sdk/default.nix b/python/pkgs/aws-xray-sdk/default.nix index 55577d659..05f92e848 100644 --- a/python/pkgs/aws-xray-sdk/default.nix +++ b/python/pkgs/aws-xray-sdk/default.nix @@ -9,7 +9,7 @@ wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aws-xray-sdk"; version = "2.15.0"; pyproject = true; @@ -17,13 +17,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws"; repo = "aws-xray-sdk-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Zu2+awB6Ynxp6hkY1bB1f6u+KpDvCcoGxDWanSH+yBY="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ botocore jsonpickle requests @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/aws/aws-xray-sdk-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/awscrt/default.nix b/python/pkgs/awscrt/default.nix index aeb0f8d0a..1850370cf 100644 --- a/python/pkgs/awscrt/default.nix +++ b/python/pkgs/awscrt/default.nix @@ -32,7 +32,6 @@ buildPythonPackage (finalAttrs: { # Unable to import test module # https://github.com/awslabs/aws-crt-python/issues/281 - doCheck = false; meta = { homepage = "https://github.com/awslabs/aws-crt-python"; diff --git a/python/pkgs/awsiotpythonsdk/default.nix b/python/pkgs/awsiotpythonsdk/default.nix index a4b0ebd6f..4d08e1d39 100644 --- a/python/pkgs/awsiotpythonsdk/default.nix +++ b/python/pkgs/awsiotpythonsdk/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ setuptools ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "AWSIoTPythonSDK" ]; diff --git a/python/pkgs/awsipranges/default.nix b/python/pkgs/awsipranges/default.nix index 7bb4d2256..4fb972e8b 100644 --- a/python/pkgs/awsipranges/default.nix +++ b/python/pkgs/awsipranges/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "awsipranges"; version = "0.3.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws-samples"; repo = "awsipranges"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ve1+0zkDDUGswtQoXhfESMcBzoNgUutxEhz43HXL4H8="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/aws-samples/awsipranges"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/awslambdaric/default.nix b/python/pkgs/awslambdaric/default.nix index ee351aad8..d6fb0f22c 100644 --- a/python/pkgs/awslambdaric/default.nix +++ b/python/pkgs/awslambdaric/default.nix @@ -13,7 +13,7 @@ simplejson, snapshot-restore-py, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "awslambdaric"; version = "4.0.2"; pyproject = true; @@ -21,11 +21,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-bEkaZUAAtilHLuUUvKloeF25DuesAr8RpKcxZq8Tqts="; }; - propagatedBuildInputs = [ + dependencies = [ simplejson snapshot-restore-py ]; @@ -53,4 +53,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/axisregistry/default.nix b/python/pkgs/axisregistry/default.nix index f235c276d..0e1de3e96 100644 --- a/python/pkgs/axisregistry/default.nix +++ b/python/pkgs/axisregistry/default.nix @@ -8,13 +8,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "axisregistry"; version = "0.4.16"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eohwtlFSTuttPv0PsOy1uezGT1NNlwm8ZunVJd1a9zo="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/googlefonts/axisregistry"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ayla-iot-unofficial/default.nix b/python/pkgs/ayla-iot-unofficial/default.nix index 7f19399f8..e91a4a6a0 100644 --- a/python/pkgs/ayla-iot-unofficial/default.nix +++ b/python/pkgs/ayla-iot-unofficial/default.nix @@ -10,7 +10,7 @@ ujson, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ayla-iot-unofficial"; version = "1.5.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rewardone"; repo = "ayla-iot-unofficial"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-reKXctSmGk1H3kEnvcC7AiDWLwr2fdezZqM5HI2qdYU="; }; @@ -40,11 +40,10 @@ buildPythonPackage rec { enabledTestPaths = [ "tests/ayla_iot_unofficial.py" ]; # tests interact with the actual API - doCheck = false; meta = { description = "Unofficial python library for interacting with the Ayla IoT API"; homepage = "https://github.com/rewardone/ayla-iot-unofficial"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-ai-agents/default.nix b/python/pkgs/azure-ai-agents/default.nix index 61a03af9e..eb1841796 100644 --- a/python/pkgs/azure-ai-agents/default.nix +++ b/python/pkgs/azure-ai-agents/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-ai-agents"; version = "1.2.0b6"; pyproject = true; src = fetchPypi { pname = "azure_ai_agents"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-08EISMOxneyYopL4wQzuS6SqwQUNT6q/nC4kVrcn9Sg="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/azure-ai-agents"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-ai-documentintelligence/default.nix b/python/pkgs/azure-ai-documentintelligence/default.nix index dd9f3ad61..b370fe743 100644 --- a/python/pkgs/azure-ai-documentintelligence/default.nix +++ b/python/pkgs/azure-ai-documentintelligence/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-ai-documentintelligence"; version = "1.0.2"; pyproject = true; src = fetchPypi { pname = "azure_ai_documentintelligence"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-TXWiUT8oOTZeurwODhdy9WAbOoyaceddoSRA2hO2NIQ="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # Tests are not shipped - doCheck = false; pythonImportsCheck = [ "azure.ai.documentintelligence" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/documentintelligence/azure-ai-documentintelligence/azure/ai/documentintelligence"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-ai-projects/default.nix b/python/pkgs/azure-ai-projects/default.nix index 2fb371f32..55a27461d 100644 --- a/python/pkgs/azure-ai-projects/default.nix +++ b/python/pkgs/azure-ai-projects/default.nix @@ -12,14 +12,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-ai-projects"; version = "1.0.0"; pyproject = true; src = fetchPypi { pname = "azure_ai_projects"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-tfAwJMzw/VQ/vg9avMdORbFezMHHGrh/xxxjBh2f1jw="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/azure-ai-projects/#history"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-ai-vision-imageanalysis/default.nix b/python/pkgs/azure-ai-vision-imageanalysis/default.nix index f3a0f6041..ced37daf7 100644 --- a/python/pkgs/azure-ai-vision-imageanalysis/default.nix +++ b/python/pkgs/azure-ai-vision-imageanalysis/default.nix @@ -32,8 +32,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "azure.ai.vision.imageanalysis" ]; - doCheck = false; # cannot import 'devtools_testutils' - meta = { description = "Azure Image Analysis client library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/vision/azure-ai-vision-imageanalysis"; diff --git a/python/pkgs/azure-appconfiguration/default.nix b/python/pkgs/azure-appconfiguration/default.nix index c7c81ec65..30a098a72 100644 --- a/python/pkgs/azure-appconfiguration/default.nix +++ b/python/pkgs/azure-appconfiguration/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-appconfiguration"; version = "1.9.0"; pyproject = true; src = fetchPypi { pname = "azure_appconfiguration"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-OZZ39WNI6RB9epen5H22cjx9LGF/7b6miB7ae47tmVs="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { ]; # Tests are not shipped - doCheck = false; pythonImportsCheck = [ "azure.appconfiguration" ]; @@ -35,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/appconfiguration/azure-appconfiguration"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-applicationinsights/default.nix b/python/pkgs/azure-applicationinsights/default.nix index d1219691a..f43f4f888 100644 --- a/python/pkgs/azure-applicationinsights/default.nix +++ b/python/pkgs/azure-applicationinsights/default.nix @@ -26,7 +26,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Application Insights Client Library"; diff --git a/python/pkgs/azure-batch/default.nix b/python/pkgs/azure-batch/default.nix index 79aa7defe..898edb565 100644 --- a/python/pkgs/azure-batch/default.nix +++ b/python/pkgs/azure-batch/default.nix @@ -7,25 +7,24 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-batch"; version = "14.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-x5Jn1sPT/hShakIqtbv6vL1o7QtYtrvN+gyDRcTHhTI="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-common msrestazure ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.batch" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/batch/azure-batch"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-common/default.nix b/python/pkgs/azure-common/default.nix index a7f9927af..05fe46bdb 100644 --- a/python/pkgs/azure-common/default.nix +++ b/python/pkgs/azure-common/default.nix @@ -28,8 +28,6 @@ buildPythonPackage (finalAttrs: { echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/__init__.py ''; - doCheck = false; - meta = { description = "This is the Microsoft Azure common code"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/python/pkgs/azure-containerregistry/default.nix b/python/pkgs/azure-containerregistry/default.nix index d1abb9313..f4ea7aa2e 100644 --- a/python/pkgs/azure-containerregistry/default.nix +++ b/python/pkgs/azure-containerregistry/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { # tests require azure-devtools which are not published (since 2020) # https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/containerregistry/azure-containerregistry/dev_requirements.txt - doCheck = false; pythonImportsCheck = [ "azure.core" diff --git a/python/pkgs/azure-core/default.nix b/python/pkgs/azure-core/default.nix index 2c53fda3f..869e5b82a 100644 --- a/python/pkgs/azure-core/default.nix +++ b/python/pkgs/azure-core/default.nix @@ -10,7 +10,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "1.41.0"; pname = "azure-core"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_core"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-9G/1380jDyXPHBnoo0uNwIozeyUD4mi7YAoWwA24rVo="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-cosmos/default.nix b/python/pkgs/azure-cosmos/default.nix index de67d13f7..2fe41f413 100644 --- a/python/pkgs/azure-cosmos/default.nix +++ b/python/pkgs/azure-cosmos/default.nix @@ -7,14 +7,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-cosmos"; version = "4.16.4"; pyproject = true; src = fetchPypi { pname = "azure_cosmos"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-WpjTPObVOakm9HxnsUWH+7i6T9ZidR/4sOvn+dN2Wi4="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { pythonNamespaces = [ "azure" ]; # Requires an active Azure Cosmos service - doCheck = false; pythonImportsCheck = [ "azure.cosmos" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/cosmos/azure-cosmos"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-cosmosdb-nspkg/default.nix b/python/pkgs/azure-cosmosdb-nspkg/default.nix index f729e7d08..2e8d6b544 100644 --- a/python/pkgs/azure-cosmosdb-nspkg/default.nix +++ b/python/pkgs/azure-cosmosdb-nspkg/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ azure-nspkg ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure CosmosDB namespace package"; diff --git a/python/pkgs/azure-cosmosdb-table/default.nix b/python/pkgs/azure-cosmosdb-table/default.nix index bc0232378..c8a9c3c3b 100644 --- a/python/pkgs/azure-cosmosdb-table/default.nix +++ b/python/pkgs/azure-cosmosdb-table/default.nix @@ -32,7 +32,6 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals (!isPy3k) [ futures ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Log Analytics Client Library"; diff --git a/python/pkgs/azure-data-tables/default.nix b/python/pkgs/azure-data-tables/default.nix index 010eb6915..0ab11d080 100644 --- a/python/pkgs/azure-data-tables/default.nix +++ b/python/pkgs/azure-data-tables/default.nix @@ -9,14 +9,14 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-data-tables"; version = "12.7.0"; pyproject = true; src = fetchPypi { pname = "azure_data_tables"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-sU/JSjIjooNf9WiOF9jhB7J8fNfEEUE48qyBNzcjcF0="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.data.tables" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-datalake-store/default.nix b/python/pkgs/azure-datalake-store/default.nix index 025525f14..3924fd4f1 100644 --- a/python/pkgs/azure-datalake-store/default.nix +++ b/python/pkgs/azure-datalake-store/default.nix @@ -30,7 +30,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; meta = { description = "This project is the Python filesystem library for Azure Data Lake Store"; diff --git a/python/pkgs/azure-eventgrid/default.nix b/python/pkgs/azure-eventgrid/default.nix index 7b4e7e77a..3e8e5f25a 100644 --- a/python/pkgs/azure-eventgrid/default.nix +++ b/python/pkgs/azure-eventgrid/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-eventgrid"; version = "4.22.1"; pyproject = true; src = fetchPypi { pname = "azure_eventgrid"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-IHc4dE4B4HPgR1trO8EuMDfg5W2AaPQ+783tbeTeZ7U="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.eventgrid" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventgrid/azure-eventgrid"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-eventhub/default.nix b/python/pkgs/azure-eventhub/default.nix index 4b42ad759..3d95a016e 100644 --- a/python/pkgs/azure-eventhub/default.nix +++ b/python/pkgs/azure-eventhub/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-eventhub"; version = "5.15.0"; pyproject = true; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-python"; - tag = "azure-eventhub_${version}"; + tag = "azure-eventhub_${finalAttrs.version}"; hash = "sha256-zpj1DUeFCXgVw44LcBCYtuFcQtA9BnrDKAxKSYzu4ts="; }; - sourceRoot = "${src.name}/sdk/eventhub/azure-eventhub"; + sourceRoot = "${finalAttrs.src.name}/sdk/eventhub/azure-eventhub"; build-system = [ setuptools ]; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/eventhub/azure-eventhub"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-graphrbac/default.nix b/python/pkgs/azure-graphrbac/default.nix index d16c97b14..cdffc40aa 100644 --- a/python/pkgs/azure-graphrbac/default.nix +++ b/python/pkgs/azure-graphrbac/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-graphrbac"; version = "0.61.2"; pyproject = true; src = fetchPypi { pname = "azure_graphrbac"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-+yWwMwfhf3Ocga1r0+m1fFeENoYDHw8hS2UVhEfHc90="; }; @@ -28,11 +28,10 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Graph RBAC Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/graphrbac/azure-graphrbac"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-identity/default.nix b/python/pkgs/azure-identity/default.nix index eb532f16c..42c7316c2 100644 --- a/python/pkgs/azure-identity/default.nix +++ b/python/pkgs/azure-identity/default.nix @@ -10,14 +10,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-identity"; version = "1.25.3"; pyproject = true; src = fetchPypi { pname = "azure_identity"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-qyPA1jAV9QtjDvbGzzlecmL0Oc4G5dB6ZOh0xyT42eY="; }; @@ -33,11 +33,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "azure.identity" ]; - doCheck = false; - meta = { description = "Microsoft Azure Identity Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-keyvault-administration/default.nix b/python/pkgs/azure-keyvault-administration/default.nix index 788b632be..24346d92c 100644 --- a/python/pkgs/azure-keyvault-administration/default.nix +++ b/python/pkgs/azure-keyvault-administration/default.nix @@ -8,27 +8,26 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-keyvault-administration"; version = "4.7.1"; pyproject = true; src = fetchPypi { pname = "azure_keyvault_administration"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-yz702VYFhHp+07rdj2f92OpqiAyLZxLPRt4mnTOW6F4="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-core typing-extensions isodate ]; # Tests require checkout from mono-repo - doCheck = false; pythonNamespaces = [ "azure.keyvault" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-administration"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-keyvault-certificates/default.nix b/python/pkgs/azure-keyvault-certificates/default.nix index 25828093f..78e4f2248 100644 --- a/python/pkgs/azure-keyvault-certificates/default.nix +++ b/python/pkgs/azure-keyvault-certificates/default.nix @@ -9,20 +9,20 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-keyvault-certificates"; version = "4.11.2"; pyproject = true; src = fetchPypi { pname = "azure_keyvault_certificates"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-H7wd8a4bm1tJpbWRX4JuwLFmLs/ukJzHV601IIOYv70="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-common azure-core isodate @@ -32,7 +32,6 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.keyvault" ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.keyvault.certificates" ]; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-certificates"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-keyvault-keys/default.nix b/python/pkgs/azure-keyvault-keys/default.nix index eb41f76e1..49079bf20 100644 --- a/python/pkgs/azure-keyvault-keys/default.nix +++ b/python/pkgs/azure-keyvault-keys/default.nix @@ -10,14 +10,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-keyvault-keys"; version = "4.11.2"; pyproject = true; src = fetchPypi { pname = "azure_keyvault_keys"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-hFnIZULRA/i2esuEX65RaAKbb36w/XZ47YYox7kord8="; }; @@ -34,7 +34,6 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.keyvault" ]; # Tests require relative paths to utilities in the mono-repo - doCheck = false; pythonImportsCheck = [ "azure" @@ -49,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-keys"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-keyvault-nspkg/default.nix b/python/pkgs/azure-keyvault-nspkg/default.nix index 99a77cb21..6ff9dc506 100644 --- a/python/pkgs/azure-keyvault-nspkg/default.nix +++ b/python/pkgs/azure-keyvault-nspkg/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -27,7 +25,6 @@ buildPythonPackage (finalAttrs: { # Just a namespace package, no tests exist: # https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/keyvault/tests.yml - doCheck = false; meta = { description = "Microsoft Azure Key Vault Namespace Package [Internal]"; diff --git a/python/pkgs/azure-keyvault-secrets/default.nix b/python/pkgs/azure-keyvault-secrets/default.nix index 2e45760d8..6b4bebbed 100644 --- a/python/pkgs/azure-keyvault-secrets/default.nix +++ b/python/pkgs/azure-keyvault-secrets/default.nix @@ -8,20 +8,20 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-keyvault-secrets"; version = "4.11.2"; pyproject = true; src = fetchPypi { pname = "azure_keyvault_secrets"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-wNhtsBqK400duS7Gue+S2aKu9/uxpnwJVlE9Rrhdets="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-core isodate typing-extensions @@ -30,11 +30,10 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.keyvault" ]; # Tests require checkout from mono-repo - doCheck = false; meta = { description = "Microsoft Azure Key Vault Secrets Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-secrets"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-keyvault-securitydomain/default.nix b/python/pkgs/azure-keyvault-securitydomain/default.nix index e49820b5f..38d518ed2 100644 --- a/python/pkgs/azure-keyvault-securitydomain/default.nix +++ b/python/pkgs/azure-keyvault-securitydomain/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-keyvault-securitydomain"; version = "1.0.0b1"; pyproject = true; src = fetchPypi { pname = "azure_keyvault_securitydomain"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-MpGhked4qUfkso7QEyeJKpOu3PjgoN1nTPEWyxEEN3Y="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/azure-keyvault-securitydomain/1.0.0b1/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-keyvault/default.nix b/python/pkgs/azure-keyvault/default.nix index bf422f357..18620f9aa 100644 --- a/python/pkgs/azure-keyvault/default.nix +++ b/python/pkgs/azure-keyvault/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "4.2.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -30,7 +28,6 @@ buildPythonPackage (finalAttrs: { ]; # this is just a meta package, which contains keys and secrets packages - doCheck = false; doBuild = false; pythonImportsCheck = [ diff --git a/python/pkgs/azure-kusto-data/default.nix b/python/pkgs/azure-kusto-data/default.nix index 0bb99fc50..4708357d6 100644 --- a/python/pkgs/azure-kusto-data/default.nix +++ b/python/pkgs/azure-kusto-data/default.nix @@ -33,7 +33,6 @@ buildPythonPackage (finalAttrs: { pname = "azure-kusto-data"; version = "6.0.4"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "Azure"; diff --git a/python/pkgs/azure-kusto-ingest/default.nix b/python/pkgs/azure-kusto-ingest/default.nix index b29657fd8..7e081a9db 100644 --- a/python/pkgs/azure-kusto-ingest/default.nix +++ b/python/pkgs/azure-kusto-ingest/default.nix @@ -14,7 +14,7 @@ tenacity, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-kusto-ingest"; version = "6.0.4"; pyproject = true; @@ -22,11 +22,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Azure"; repo = "azure-kusto-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iggsVxLmDbP6+oSPaIiujPLsZAWwm5VLZSl+HYm0DIQ="; }; - sourceRoot = "${src.name}/${pname}"; + sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pname}"; postPatch = '' substituteInPlace pyproject.toml \ @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-kusto-python/tree/master/azure-kusto-ingest"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-loganalytics/default.nix b/python/pkgs/azure-loganalytics/default.nix index 6ace5d632..6fa921b8a 100644 --- a/python/pkgs/azure-loganalytics/default.nix +++ b/python/pkgs/azure-loganalytics/default.nix @@ -11,7 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.1"; pyproject = true; - __structuredAttrs = true; pname = "azure-loganalytics"; src = fetchPypi { @@ -30,7 +29,6 @@ buildPythonPackage (finalAttrs: { pythonNamespaces = [ "azure" ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.loganalytics" ]; diff --git a/python/pkgs/azure-mgmt-advisor/default.nix b/python/pkgs/azure-mgmt-advisor/default.nix index 224850354..3dece5384 100644 --- a/python/pkgs/azure-mgmt-advisor/default.nix +++ b/python/pkgs/azure-mgmt-advisor/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-advisor"; version = "9.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-/ECLNzFf6EeBtRkST4yxuKwQsvQkHkOdDT4l/WyhjXs="; }; @@ -30,11 +30,10 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Advisor Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-apimanagement/default.nix b/python/pkgs/azure-mgmt-apimanagement/default.nix index f1e90cf7f..c0091be92 100644 --- a/python/pkgs/azure-mgmt-apimanagement/default.nix +++ b/python/pkgs/azure-mgmt-apimanagement/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-apimanagement"; version = "6.0.0b1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_apimanagement"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-/8ZPGH8pNwd2JLoFxwWelHYa8yyWBfyTRYCJ35duuU8="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # no tests included - doCheck = false; pythonImportsCheck = [ "azure.common" @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/apimanagement/azure-mgmt-apimanagement"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-appconfiguration/default.nix b/python/pkgs/azure-mgmt-appconfiguration/default.nix index 562a15217..12cd60f34 100644 --- a/python/pkgs/azure-mgmt-appconfiguration/default.nix +++ b/python/pkgs/azure-mgmt-appconfiguration/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-appconfiguration"; version = "6.0.0b1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_appconfiguration"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-zBaEyScWadchaKV5fhg1EmVWa/oSPre/gY3h1vNa5d4="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # no tests included - doCheck = false; pythonNamespaces = [ "azure.mgmt" ]; @@ -42,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/appconfiguration/azure-mgmt-appconfiguration"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-appcontainers/default.nix b/python/pkgs/azure-mgmt-appcontainers/default.nix index ec8e08527..1d20cc8b3 100644 --- a/python/pkgs/azure-mgmt-appcontainers/default.nix +++ b/python/pkgs/azure-mgmt-appcontainers/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-appcontainers"; version = "5.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_appcontainers"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-o8tZJ0Hwmi2NY6aKIC62Ki2q8LHELCvBYMIBjls0Dv4="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # no tests included - doCheck = false; pythonImportsCheck = [ "azure.mgmt.appcontainers" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/appcontainers/azure-mgmt-appcontainers"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-applicationinsights/default.nix b/python/pkgs/azure-mgmt-applicationinsights/default.nix index f31cec4b2..784ee64bf 100644 --- a/python/pkgs/azure-mgmt-applicationinsights/default.nix +++ b/python/pkgs/azure-mgmt-applicationinsights/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-applicationinsights"; version = "5.0.0b2"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_applicationinsights"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-JffPFxZQg/yYh0wJ71VKt+ibT87VWV0U08pUlSXg5HY="; }; @@ -30,11 +30,10 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Application Insights Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/applicationinsights/azure-mgmt-applicationinsights"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-authorization/default.nix b/python/pkgs/azure-mgmt-authorization/default.nix index a29acafac..d4eb1aef0 100644 --- a/python/pkgs/azure-mgmt-authorization/default.nix +++ b/python/pkgs/azure-mgmt-authorization/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "4.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -35,7 +33,6 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.authorization" ]; diff --git a/python/pkgs/azure-mgmt-automation/default.nix b/python/pkgs/azure-mgmt-automation/default.nix index 3ab5efd14..feedcdb56 100644 --- a/python/pkgs/azure-mgmt-automation/default.nix +++ b/python/pkgs/azure-mgmt-automation/default.nix @@ -28,7 +28,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.automation" ]; diff --git a/python/pkgs/azure-mgmt-batch/default.nix b/python/pkgs/azure-mgmt-batch/default.nix index 2d47fba47..8692c08e7 100644 --- a/python/pkgs/azure-mgmt-batch/default.nix +++ b/python/pkgs/azure-mgmt-batch/default.nix @@ -8,27 +8,26 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-batch"; version = "19.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_batch"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-J1SD+jlAkzxzwipCtZ0bWwUxkdjwH2wsCa8O71LzGlw="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-common azure-mgmt-core isodate ]; # Tests are only available in mono repo - doCheck = false; pythonImportsCheck = [ "azure.mgmt.batch" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/batch/azure-mgmt-batch"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-batchai/default.nix b/python/pkgs/azure-mgmt-batchai/default.nix index 0fa8981eb..87ad1f8cc 100644 --- a/python/pkgs/azure-mgmt-batchai/default.nix +++ b/python/pkgs/azure-mgmt-batchai/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "7.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) version; pname = "azure_mgmt_batchai"; @@ -32,7 +30,6 @@ buildPythonPackage (finalAttrs: { pythonNamespaces = [ "azure.mgmt" ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Batch AI Management Client Library"; diff --git a/python/pkgs/azure-mgmt-billing/default.nix b/python/pkgs/azure-mgmt-billing/default.nix index 71d613dfe..7543d8b53 100644 --- a/python/pkgs/azure-mgmt-billing/default.nix +++ b/python/pkgs/azure-mgmt-billing/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-billing"; version = "8.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_billing"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-j5AvIdJJPm/Fw8iU1SoHg/w0gPRYDjWUiVgDFvfO98Y="; }; @@ -32,11 +32,10 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; # Module has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Billing Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/billing/azure-mgmt-billing"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-botservice/default.nix b/python/pkgs/azure-mgmt-botservice/default.nix index 7a543364b..ab70026a8 100644 --- a/python/pkgs/azure-mgmt-botservice/default.nix +++ b/python/pkgs/azure-mgmt-botservice/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-botservice"; version = "2.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hsBNJ8UnwZ2WAKiCFfriulJNxnRFU4ew0OUXIrWm1ro="; extension = "zip"; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # no tests included - doCheck = false; pythonImportsCheck = [ "azure.common" @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/botservice/azure-mgmt-botservice"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-cdn/default.nix b/python/pkgs/azure-mgmt-cdn/default.nix index 41cb64990..c7c36a7d0 100644 --- a/python/pkgs/azure-mgmt-cdn/default.nix +++ b/python/pkgs/azure-mgmt-cdn/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "13.1.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-RmMwTzG2Zy3sMgx857qXFcK5nn2LaEs3XwtO/9qQIQw="; @@ -29,7 +27,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.cdn" ]; diff --git a/python/pkgs/azure-mgmt-cognitiveservices/default.nix b/python/pkgs/azure-mgmt-cognitiveservices/default.nix index be640e5b9..5cca9d1dd 100644 --- a/python/pkgs/azure-mgmt-cognitiveservices/default.nix +++ b/python/pkgs/azure-mgmt-cognitiveservices/default.nix @@ -10,14 +10,14 @@ msrest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-cognitiveservices"; version = "15.0.0b1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_cognitiveservices"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-3ydbAI1IkiIuwnQbd6829kZv9IgFkqTFwG155l58JFQ="; }; @@ -32,7 +32,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.cognitiveservices" ]; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/cognitiveservices/azure-mgmt-cognitiveservices"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-commerce/default.nix b/python/pkgs/azure-mgmt-commerce/default.nix index 87ea2422b..2656da1ef 100644 --- a/python/pkgs/azure-mgmt-commerce/default.nix +++ b/python/pkgs/azure-mgmt-commerce/default.nix @@ -9,13 +9,13 @@ azure-mgmt-nspkg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-commerce"; version = "6.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; sha256 = "6f5447395503b2318f451d24f8021ee08db1cac44f1c3337ea690700419626b6"; }; @@ -37,7 +37,6 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.commerce" ]; meta = { @@ -45,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-common/default.nix b/python/pkgs/azure-mgmt-common/default.nix index 342b78316..86ef4ae69 100644 --- a/python/pkgs/azure-mgmt-common/default.nix +++ b/python/pkgs/azure-mgmt-common/default.nix @@ -15,7 +15,6 @@ buildPythonPackage (finalAttrs: { version = "0.20.0"; pyproject = true; - __structuredAttrs = true; pname = "azure-mgmt-common"; src = fetchPypi { @@ -38,8 +37,6 @@ buildPythonPackage (finalAttrs: { echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/__init__.py ''; - doCheck = false; - pythonImportsCheck = [ "azure.mgmt.common" ]; meta = { diff --git a/python/pkgs/azure-mgmt-compute/default.nix b/python/pkgs/azure-mgmt-compute/default.nix index bcaf77d5c..36ec46a7b 100644 --- a/python/pkgs/azure-mgmt-compute/default.nix +++ b/python/pkgs/azure-mgmt-compute/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-compute"; version = "38.3.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_compute"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-IxDmCPePs6TTi+IG7CX/B9Z7HJI2/UVo+FevZ0yxdzo="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.compute" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/compute/azure-mgmt-compute"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-consumption/default.nix b/python/pkgs/azure-mgmt-consumption/default.nix index 24d1b4cd0..ca777a4f8 100644 --- a/python/pkgs/azure-mgmt-consumption/default.nix +++ b/python/pkgs/azure-mgmt-consumption/default.nix @@ -9,13 +9,13 @@ azure-mgmt-nspkg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-consumption"; version = "10.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-BqCGQ2wXN/d6uGiU1R9Zc7bg+l7fVlWOTCllieurkTA="; }; @@ -36,11 +36,10 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Consumption Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-containerinstance/default.nix b/python/pkgs/azure-mgmt-containerinstance/default.nix index 2be683d27..7f4b23f76 100644 --- a/python/pkgs/azure-mgmt-containerinstance/default.nix +++ b/python/pkgs/azure-mgmt-containerinstance/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, msrest, msrestazure, azure-common, azure-mgmt-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-containerinstance"; version = "10.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest msrestazure azure-common @@ -27,7 +31,6 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.containerinstance" ]; @@ -36,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-containerregistry/default.nix b/python/pkgs/azure-mgmt-containerregistry/default.nix index 545be733a..7dc5a4c2f 100644 --- a/python/pkgs/azure-mgmt-containerregistry/default.nix +++ b/python/pkgs/azure-mgmt-containerregistry/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-containerregistry"; version = "15.1.0b1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_containerregistry"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-h7sN4yuZ4aSTqlLUz083PvDaFoHdjmmhH4dhvpNAkLE="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # no tests included - doCheck = false; pythonImportsCheck = [ "azure.common" @@ -42,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/containerregistry/azure-mgmt-containerregistry"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-containerregistrytasks/default.nix b/python/pkgs/azure-mgmt-containerregistrytasks/default.nix index dc20c9374..a2d0ed500 100644 --- a/python/pkgs/azure-mgmt-containerregistrytasks/default.nix +++ b/python/pkgs/azure-mgmt-containerregistrytasks/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-containerregistrytasks"; version = "1.0.0b1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_containerregistrytasks"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-1nMN1cm/yp/fD+D5M3BtPH+4VcoQxWhQZQsHDpxsr1E="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # no tests included - doCheck = false; pythonImportsCheck = [ "azure.mgmt.containerregistrytasks" @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/containerregistry/azure-mgmt-containerregistrytasks"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-containerservice/default.nix b/python/pkgs/azure-mgmt-containerservice/default.nix index 21f484b99..10942ca14 100644 --- a/python/pkgs/azure-mgmt-containerservice/default.nix +++ b/python/pkgs/azure-mgmt-containerservice/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-containerservice"; version = "41.6.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_containerservice"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-WSyDKI2csIIuoDHYgV0dMP4wcn2m+nVS0eglxFDsymo="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.containerservice" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/containerservice/azure-mgmt-containerservice"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-core/default.nix b/python/pkgs/azure-mgmt-core/default.nix index 04b2bbd4c..048476763 100644 --- a/python/pkgs/azure-mgmt-core/default.nix +++ b/python/pkgs/azure-mgmt-core/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "1.6.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "azure_mgmt_core"; inherit (finalAttrs) version; @@ -31,7 +29,6 @@ buildPythonPackage (finalAttrs: { pythonNamespaces = "azure.mgmt"; # not included - doCheck = false; pythonImportsCheck = [ "azure.mgmt.core" diff --git a/python/pkgs/azure-mgmt-cosmosdb/default.nix b/python/pkgs/azure-mgmt-cosmosdb/default.nix index 8962b18f2..8ca4546b3 100644 --- a/python/pkgs/azure-mgmt-cosmosdb/default.nix +++ b/python/pkgs/azure-mgmt-cosmosdb/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-cosmosdb"; version = "10.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_cosmosdb"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-+fXpy8mErTzz+b37hT7D6Giw6J6cJZfeTUKfpmAsqNk="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.cosmosdb" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-dashboard/default.nix b/python/pkgs/azure-mgmt-dashboard/default.nix index a8d4f77b7..6aca5e332 100644 --- a/python/pkgs/azure-mgmt-dashboard/default.nix +++ b/python/pkgs/azure-mgmt-dashboard/default.nix @@ -8,21 +8,21 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-dashboard"; version = "2.0.0"; format = "wheel"; src = fetchPypi { pname = "azure_mgmt_dashboard"; - inherit version; + inherit (finalAttrs) version; format = "wheel"; python = "py3"; dist = "py3"; hash = "sha256-1LASBzs+biyDDQPoCujcvLhK3iyNaHLU8VCtBSdTJxg="; }; - propagatedBuildInputs = [ + dependencies = [ azure-common azure-mgmt-core isodate @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.dashboard" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-databoxedge/default.nix b/python/pkgs/azure-mgmt-databoxedge/default.nix index 18fe42208..e5ac85da6 100644 --- a/python/pkgs/azure-mgmt-databoxedge/default.nix +++ b/python/pkgs/azure-mgmt-databoxedge/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-databoxedge"; version = "3.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_databoxedge"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-dyJm7i3ObN3n0oueehU7P9V9J/ErRzdXQuI7P5/aJOs="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # no tests in pypi tarball - doCheck = false; pythonImportsCheck = [ "azure.mgmt.databoxedge" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/databox/azure-mgmt-databox"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-databricks/default.nix b/python/pkgs/azure-mgmt-databricks/default.nix index cc800fd00..a1cc64b41 100644 --- a/python/pkgs/azure-mgmt-databricks/default.nix +++ b/python/pkgs/azure-mgmt-databricks/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-databricks"; version = "2.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-cNETYtwtF/X7HbDP5lwa9VuPE28aDbmltR56z3YM9bk="; }; @@ -28,11 +28,10 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; meta = { description = "Microsoft Azure Data Bricks Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/databricks/azure-mgmt-databricks"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-datafactory/default.nix b/python/pkgs/azure-mgmt-datafactory/default.nix index 43c7fc6ea..cd23eef3e 100644 --- a/python/pkgs/azure-mgmt-datafactory/default.nix +++ b/python/pkgs/azure-mgmt-datafactory/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-datafactory"; version = "10.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_datafactory"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-yD7rKwksHx5bskmf+7pv14CaEnRzmTD52x4zYnNAVYc="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.datafactory" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-datalake-analytics/default.nix b/python/pkgs/azure-mgmt-datalake-analytics/default.nix index f954e60c2..08b6006b0 100644 --- a/python/pkgs/azure-mgmt-datalake-analytics/default.nix +++ b/python/pkgs/azure-mgmt-datalake-analytics/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.0b2"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -34,7 +32,6 @@ buildPythonPackage (finalAttrs: { pythonNamespaces = [ "azure.mgmt.datalake" ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.datalake.analytics" ]; diff --git a/python/pkgs/azure-mgmt-datalake-nspkg/default.nix b/python/pkgs/azure-mgmt-datalake-nspkg/default.nix index 789e5bb15..347393338 100644 --- a/python/pkgs/azure-mgmt-datalake-nspkg/default.nix +++ b/python/pkgs/azure-mgmt-datalake-nspkg/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "3.0.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -24,7 +22,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ azure-mgmt-nspkg ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Data Lake Management namespace package"; diff --git a/python/pkgs/azure-mgmt-datalake-store/default.nix b/python/pkgs/azure-mgmt-datalake-store/default.nix index 3defd469e..5e9cf8cf8 100644 --- a/python/pkgs/azure-mgmt-datalake-store/default.nix +++ b/python/pkgs/azure-mgmt-datalake-store/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, msrestazure, azure-common, azure-mgmt-datalake-nspkg, azure-mgmt-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-datalake-store"; version = "1.1.0b1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-WidXaLwb2RjKoOZd+brii3Tm/fPcnqfiSu11/7SZy2Q="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrestazure azure-common azure-mgmt-core @@ -29,11 +33,10 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt.datalake" ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Data Lake Store Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-datamigration/default.nix b/python/pkgs/azure-mgmt-datamigration/default.nix index 72bbaf833..988f50eb6 100644 --- a/python/pkgs/azure-mgmt-datamigration/default.nix +++ b/python/pkgs/azure-mgmt-datamigration/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-datamigration"; version = "11.0.0b1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_datamigration"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-m0NOmFDxtl+4my5ztq55XBxbRhMWinKomG5zl5odxLo="; }; @@ -32,11 +32,10 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Data Migration Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/datamigration/azure-mgmt-datamigration"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-deploymentmanager/default.nix b/python/pkgs/azure-mgmt-deploymentmanager/default.nix index bda4fe099..18a743d2d 100644 --- a/python/pkgs/azure-mgmt-deploymentmanager/default.nix +++ b/python/pkgs/azure-mgmt-deploymentmanager/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-deploymentmanager"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-m623aGFyCRScM+aMouWcNbHT0RQn4paYcvLiNuFO7ng="; extension = "zip"; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # no tests included - doCheck = false; pythonImportsCheck = [ "azure.common" @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/deploymentmanager/azure-mgmt-deploymentmanager"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-devspaces/default.nix b/python/pkgs/azure-mgmt-devspaces/default.nix index a0fb79013..c4ebda1ac 100644 --- a/python/pkgs/azure-mgmt-devspaces/default.nix +++ b/python/pkgs/azure-mgmt-devspaces/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "0.2.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -30,7 +28,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.devspaces" ]; diff --git a/python/pkgs/azure-mgmt-devtestlabs/default.nix b/python/pkgs/azure-mgmt-devtestlabs/default.nix index 00c6eb47b..61d0288dd 100644 --- a/python/pkgs/azure-mgmt-devtestlabs/default.nix +++ b/python/pkgs/azure-mgmt-devtestlabs/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "9.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -39,7 +37,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "azure.mgmt.devtestlabs" ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure DevTestLabs Management Client Library"; diff --git a/python/pkgs/azure-mgmt-dns/default.nix b/python/pkgs/azure-mgmt-dns/default.nix index 1a26b1ffc..0e03d570e 100644 --- a/python/pkgs/azure-mgmt-dns/default.nix +++ b/python/pkgs/azure-mgmt-dns/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-dns"; version = "10.0.0b1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_dns"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-4mYqKLWRN2tZbFvylNJHSw84ThOSf+8cx2jfbUe7vpQ="; }; @@ -33,11 +33,10 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; # Tests are only available in the mono-repo - doCheck = false; meta = { description = "This is the Microsoft Azure DNS Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/network/azure-mgmt-dns"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-domainregistration/default.nix b/python/pkgs/azure-mgmt-domainregistration/default.nix index 7e0ee3d80..ae99f89cb 100644 --- a/python/pkgs/azure-mgmt-domainregistration/default.nix +++ b/python/pkgs/azure-mgmt-domainregistration/default.nix @@ -14,7 +14,6 @@ buildPythonPackage (finalAttrs: { pname = "azure-mgmt-domainregistration"; version = "1.0.0b1"; pyproject = true; - __structuredAttrs = true; src = fetchPypi { pname = "azure_mgmt_domainregistration"; diff --git a/python/pkgs/azure-mgmt-eventgrid/default.nix b/python/pkgs/azure-mgmt-eventgrid/default.nix index 0ec68e27c..9fd4bee2b 100644 --- a/python/pkgs/azure-mgmt-eventgrid/default.nix +++ b/python/pkgs/azure-mgmt-eventgrid/default.nix @@ -10,14 +10,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-eventgrid"; version = "10.5.0b2"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_eventgrid"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Dtsm4wB48QRsCNtGcXW4284Ju9j2TW1C9GTxzfBmf4w="; }; @@ -32,7 +32,6 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.eventgrid" ]; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventgrid/azure-mgmt-eventgrid"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-eventhub/default.nix b/python/pkgs/azure-mgmt-eventhub/default.nix index 8a5b0ea2b..8455863df 100644 --- a/python/pkgs/azure-mgmt-eventhub/default.nix +++ b/python/pkgs/azure-mgmt-eventhub/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-eventhub"; version = "12.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_eventhub"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-hrHlqmTquqa3imeceRHxYtXcFjPzacceD2Qv+4iboZ8="; }; @@ -30,11 +30,10 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure EventHub Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventhub/azure-mgmt-eventhub"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-extendedlocation/default.nix b/python/pkgs/azure-mgmt-extendedlocation/default.nix index 44f78adb1..a761b0871 100644 --- a/python/pkgs/azure-mgmt-extendedlocation/default.nix +++ b/python/pkgs/azure-mgmt-extendedlocation/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-extendedlocation"; version = "3.0.0b1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_extendedlocation"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-jO0iYpPCUwReAcdVPtRyhdh2UWK/YsP7fsFYGXX07hg="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # Tests are only available in mono repo - doCheck = false; pythonImportsCheck = [ "azure.mgmt.extendedlocation" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/extendedlocation/azure-mgmt-extendedlocation"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-frontdoor/default.nix b/python/pkgs/azure-mgmt-frontdoor/default.nix index d89fd40ba..e324ae4cc 100644 --- a/python/pkgs/azure-mgmt-frontdoor/default.nix +++ b/python/pkgs/azure-mgmt-frontdoor/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-frontdoor"; version = "2.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_frontdoor"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-YsYB33KB+EpIvKtADTn6sQ0Tr8NsJ/q3LsFa1e/yGQk="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # Tests are only available in mono repo - doCheck = false; pythonImportsCheck = [ "azure.mgmt.frontdoor" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/network/azure-mgmt-frontdoor"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-hanaonazure/default.nix b/python/pkgs/azure-mgmt-hanaonazure/default.nix index 6d1aa9e99..65aeb9cbc 100644 --- a/python/pkgs/azure-mgmt-hanaonazure/default.nix +++ b/python/pkgs/azure-mgmt-hanaonazure/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -35,7 +33,6 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.hanaonazure" ]; diff --git a/python/pkgs/azure-mgmt-hdinsight/default.nix b/python/pkgs/azure-mgmt-hdinsight/default.nix index 8739771fe..cf7135aaa 100644 --- a/python/pkgs/azure-mgmt-hdinsight/default.nix +++ b/python/pkgs/azure-mgmt-hdinsight/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-hdinsight"; version = "9.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QevcacDR+B0l3TBDjBT/9DMfZmOfVYBbkYuWSer/54o="; extension = "zip"; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # no tests included - doCheck = false; pythonNamespaces = [ "azure.mgmt" ]; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/hdinsight/azure-mgmt-hdinsight"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-hybridcompute/default.nix b/python/pkgs/azure-mgmt-hybridcompute/default.nix index b590bfb23..f9426e0a6 100644 --- a/python/pkgs/azure-mgmt-hybridcompute/default.nix +++ b/python/pkgs/azure-mgmt-hybridcompute/default.nix @@ -9,21 +9,21 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-hybridcompute"; version = "10.0.0"; format = "wheel"; src = fetchPypi { pname = "azure_mgmt_hybridcompute"; - inherit version; + inherit (finalAttrs) version; format = "wheel"; python = "py3"; dist = "py3"; hash = "sha256-XRCJM+DHVPOvhpOq4J6JjbPPkTBOuQ/9C9DxcTWCIWs="; }; - propagatedBuildInputs = [ + dependencies = [ azure-common azure-mgmt-core isodate @@ -31,7 +31,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.hybridcompute" ]; @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-imagebuilder/default.nix b/python/pkgs/azure-mgmt-imagebuilder/default.nix index d9de34e7e..5c54cfc9a 100644 --- a/python/pkgs/azure-mgmt-imagebuilder/default.nix +++ b/python/pkgs/azure-mgmt-imagebuilder/default.nix @@ -20,14 +20,13 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-common azure-mgmt-core isodate ]; # No tests included - doCheck = false; pythonImportsCheck = [ "azure.common" diff --git a/python/pkgs/azure-mgmt-iotcentral/default.nix b/python/pkgs/azure-mgmt-iotcentral/default.nix index 82a511dd2..fe4dc23d9 100644 --- a/python/pkgs/azure-mgmt-iotcentral/default.nix +++ b/python/pkgs/azure-mgmt-iotcentral/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "9.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -35,7 +33,6 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.iotcentral" ]; diff --git a/python/pkgs/azure-mgmt-iothub/default.nix b/python/pkgs/azure-mgmt-iothub/default.nix index 4a9a6c4d6..a4dbd7986 100644 --- a/python/pkgs/azure-mgmt-iothub/default.nix +++ b/python/pkgs/azure-mgmt-iothub/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-iothub"; version = "5.0.0b4"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_iothub"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-bRyfCFbJNB4yRr3hr0D+hwdxkc6QF5eO7DH0L9jsHuY="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.iothub" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/iothub/azure-mgmt-iothub"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-iothubprovisioningservices/default.nix b/python/pkgs/azure-mgmt-iothubprovisioningservices/default.nix index 887a41c9c..7a44a28d7 100644 --- a/python/pkgs/azure-mgmt-iothubprovisioningservices/default.nix +++ b/python/pkgs/azure-mgmt-iothubprovisioningservices/default.nix @@ -15,8 +15,6 @@ buildPythonPackage (finalAttrs: { version = "1.1.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -36,7 +34,6 @@ buildPythonPackage (finalAttrs: { pythonNamespaces = [ "azure.mgmt" ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.iothubprovisioningservices" ]; diff --git a/python/pkgs/azure-mgmt-keyvault/default.nix b/python/pkgs/azure-mgmt-keyvault/default.nix index 3d4652e00..0f54fb37b 100644 --- a/python/pkgs/azure-mgmt-keyvault/default.nix +++ b/python/pkgs/azure-mgmt-keyvault/default.nix @@ -8,14 +8,14 @@ isodate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-keyvault"; version = "14.0.1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_keyvault"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-0UGoCErkx8W9HK/spJqPP768WNxbxSkPMi6nPYswfvc="; }; @@ -32,11 +32,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "azure.mgmt.keyvault" ]; # Module has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Key Vault Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-kusto/default.nix b/python/pkgs/azure-mgmt-kusto/default.nix index 95ec8d5f9..4ff992ae5 100644 --- a/python/pkgs/azure-mgmt-kusto/default.nix +++ b/python/pkgs/azure-mgmt-kusto/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-kusto"; version = "4.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_kusto"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-osN6N5zsZQukc/81g1hzJ15lYnAv0VezEjGh3a2FLn0="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # no tests included - doCheck = false; pythonImportsCheck = [ "azure.common" @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-loganalytics/default.nix b/python/pkgs/azure-mgmt-loganalytics/default.nix index a035d90e0..24ffa8c08 100644 --- a/python/pkgs/azure-mgmt-loganalytics/default.nix +++ b/python/pkgs/azure-mgmt-loganalytics/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "12.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -34,7 +32,6 @@ buildPythonPackage (finalAttrs: { pythonNamespaces = [ "azure.mgmt" ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.loganalytics" ]; diff --git a/python/pkgs/azure-mgmt-logic/default.nix b/python/pkgs/azure-mgmt-logic/default.nix index 6c3377edc..2d8865feb 100644 --- a/python/pkgs/azure-mgmt-logic/default.nix +++ b/python/pkgs/azure-mgmt-logic/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-logic"; version = "10.1.0b1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-WCuNRE7pjNmecva6IE7Oez1KiQuMSWtRBC2ktzPWQk4="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonNamespaces = [ "azure.mgmt" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-machinelearningcompute/default.nix b/python/pkgs/azure-mgmt-machinelearningcompute/default.nix index fb51544ac..a4218f638 100644 --- a/python/pkgs/azure-mgmt-machinelearningcompute/default.nix +++ b/python/pkgs/azure-mgmt-machinelearningcompute/default.nix @@ -15,8 +15,6 @@ buildPythonPackage (finalAttrs: { version = "0.4.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -34,7 +32,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Machine Learning Compute Management Client Library"; diff --git a/python/pkgs/azure-mgmt-managedservices/default.nix b/python/pkgs/azure-mgmt-managedservices/default.nix index f74c2e766..416350145 100644 --- a/python/pkgs/azure-mgmt-managedservices/default.nix +++ b/python/pkgs/azure-mgmt-managedservices/default.nix @@ -30,7 +30,6 @@ buildPythonPackage (finalAttrs: { ]; # no tests included - doCheck = false; pythonImportsCheck = [ "azure.common" diff --git a/python/pkgs/azure-mgmt-managementgroups/default.nix b/python/pkgs/azure-mgmt-managementgroups/default.nix index 049911ed0..93704db40 100644 --- a/python/pkgs/azure-mgmt-managementgroups/default.nix +++ b/python/pkgs/azure-mgmt-managementgroups/default.nix @@ -30,7 +30,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Management Groups Client Library"; diff --git a/python/pkgs/azure-mgmt-managementpartner/default.nix b/python/pkgs/azure-mgmt-managementpartner/default.nix index 4d5e4acf9..fcacd3b53 100644 --- a/python/pkgs/azure-mgmt-managementpartner/default.nix +++ b/python/pkgs/azure-mgmt-managementpartner/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -32,7 +30,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.managementpartner" ]; diff --git a/python/pkgs/azure-mgmt-maps/default.nix b/python/pkgs/azure-mgmt-maps/default.nix index b2be53087..2e78a393a 100644 --- a/python/pkgs/azure-mgmt-maps/default.nix +++ b/python/pkgs/azure-mgmt-maps/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "2.1.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-XVaml4UuVBanYYHxjB1YT/PvExzgAPbD4gI3Hbc0dI0="; @@ -33,7 +31,6 @@ buildPythonPackage (finalAttrs: { pythonNamespaces = [ "azure.mgmt" ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.maps" ]; diff --git a/python/pkgs/azure-mgmt-marketplaceordering/default.nix b/python/pkgs/azure-mgmt-marketplaceordering/default.nix index 0e90648e5..69e4d2fe9 100644 --- a/python/pkgs/azure-mgmt-marketplaceordering/default.nix +++ b/python/pkgs/azure-mgmt-marketplaceordering/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "1.1.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -35,7 +33,6 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.marketplaceordering" ]; diff --git a/python/pkgs/azure-mgmt-media/default.nix b/python/pkgs/azure-mgmt-media/default.nix index c33b68463..bbccaa103 100644 --- a/python/pkgs/azure-mgmt-media/default.nix +++ b/python/pkgs/azure-mgmt-media/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, msrest, msrestazure, azure-common, azure-mgmt-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-media"; version = "10.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-TVq/6dHttDGIUFzn8KTVeDTwcBMmphz3zrsGK7ux4aU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest msrestazure azure-common @@ -27,7 +31,6 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.media" ]; @@ -36,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-monitor/default.nix b/python/pkgs/azure-mgmt-monitor/default.nix index 7e63a8e41..71af530f8 100644 --- a/python/pkgs/azure-mgmt-monitor/default.nix +++ b/python/pkgs/azure-mgmt-monitor/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-monitor"; version = "8.0.0b3"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_monitor"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Nk26yjMNW+OJx9+Fdcp0KTzSv+VEV2fhm0ExcNolOaI="; }; @@ -30,11 +30,10 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; # Module has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Monitor Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-msi/default.nix b/python/pkgs/azure-mgmt-msi/default.nix index b13d89d7b..da0f5ec9b 100644 --- a/python/pkgs/azure-mgmt-msi/default.nix +++ b/python/pkgs/azure-mgmt-msi/default.nix @@ -8,14 +8,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-msi"; version = "8.0.0b2"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_msi"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-9m+tyMcIw94Lhn2UFsVaTcjgUD9dPEE374vE8DlPQDs="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.msi" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-msi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-mysqlflexibleservers/default.nix b/python/pkgs/azure-mgmt-mysqlflexibleservers/default.nix index d64d5b025..cc54ae189 100644 --- a/python/pkgs/azure-mgmt-mysqlflexibleservers/default.nix +++ b/python/pkgs/azure-mgmt-mysqlflexibleservers/default.nix @@ -11,14 +11,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-mysqlflexibleservers"; version = "1.1.0b3"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_mysqlflexibleservers"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-15uNv6MKuHxuXxeQYWbpmWQVhmkmzCYjeGkSIamGWAM="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/azure-mgmt-mysqlflexibleservers/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-netapp/default.nix b/python/pkgs/azure-mgmt-netapp/default.nix index 4a88e90f9..2d6598300 100644 --- a/python/pkgs/azure-mgmt-netapp/default.nix +++ b/python/pkgs/azure-mgmt-netapp/default.nix @@ -28,7 +28,6 @@ buildPythonPackage (finalAttrs: { ]; # no tests included - doCheck = false; pythonImportsCheck = [ "azure.common" diff --git a/python/pkgs/azure-mgmt-network/default.nix b/python/pkgs/azure-mgmt-network/default.nix index cccc47cc1..d9bd88ed5 100644 --- a/python/pkgs/azure-mgmt-network/default.nix +++ b/python/pkgs/azure-mgmt-network/default.nix @@ -30,7 +30,6 @@ buildPythonPackage (finalAttrs: { ]; # Module has no tests - doCheck = false; pythonNamespaces = [ "azure.mgmt" ]; diff --git a/python/pkgs/azure-mgmt-notificationhubs/default.nix b/python/pkgs/azure-mgmt-notificationhubs/default.nix index e393ffe13..27204a7e9 100644 --- a/python/pkgs/azure-mgmt-notificationhubs/default.nix +++ b/python/pkgs/azure-mgmt-notificationhubs/default.nix @@ -15,8 +15,6 @@ buildPythonPackage (finalAttrs: { version = "8.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -34,7 +32,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.notificationhubs" ]; diff --git a/python/pkgs/azure-mgmt-nspkg/default.nix b/python/pkgs/azure-mgmt-nspkg/default.nix index df4c2f05e..46f84f36c 100644 --- a/python/pkgs/azure-mgmt-nspkg/default.nix +++ b/python/pkgs/azure-mgmt-nspkg/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "3.0.2"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -23,8 +21,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ azure-nspkg ]; - doCheck = false; - meta = { description = "Microsoft Azure SDK for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/python/pkgs/azure-mgmt-policyinsights/default.nix b/python/pkgs/azure-mgmt-policyinsights/default.nix index d543efdef..e455597cb 100644 --- a/python/pkgs/azure-mgmt-policyinsights/default.nix +++ b/python/pkgs/azure-mgmt-policyinsights/default.nix @@ -30,7 +30,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.policyinsights" ]; diff --git a/python/pkgs/azure-mgmt-postgresqlflexibleservers/default.nix b/python/pkgs/azure-mgmt-postgresqlflexibleservers/default.nix index 3431c4d58..eefe7d3f5 100644 --- a/python/pkgs/azure-mgmt-postgresqlflexibleservers/default.nix +++ b/python/pkgs/azure-mgmt-postgresqlflexibleservers/default.nix @@ -11,14 +11,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-postgresqlflexibleservers"; version = "3.0.0b1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_postgresqlflexibleservers"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Vo1/vuxAAgVznCppDZCTygNFAMl5uopc3QbiEeFbLv8="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/azure-mgmt-postgresqlflexibleservers/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-powerbiembedded/default.nix b/python/pkgs/azure-mgmt-powerbiembedded/default.nix index 163e4dbb6..cf39f69df 100644 --- a/python/pkgs/azure-mgmt-powerbiembedded/default.nix +++ b/python/pkgs/azure-mgmt-powerbiembedded/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-powerbiembedded"; version = "3.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yz2D3WfQKEdkTm10ZKIhZMi4y6GF6yz+L1+nB/VFofo="; }; @@ -27,11 +27,10 @@ buildPythonPackage rec { ]; # Module has only tests in mono-repo - doCheck = false; meta = { description = "This is the Microsoft Azure Power BI Embedded Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/powerbiembedded/azure-mgmt-powerbiembedded"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-privatedns/default.nix b/python/pkgs/azure-mgmt-privatedns/default.nix index db8332a83..f87773230 100644 --- a/python/pkgs/azure-mgmt-privatedns/default.nix +++ b/python/pkgs/azure-mgmt-privatedns/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-privatedns"; version = "2.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_privatedns"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-4GTSIhFTgkk8dr4QluTYMA6zGp70XBmKoZGZM8uQoSQ="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # no tests included - doCheck = false; pythonImportsCheck = [ "azure.common" @@ -42,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/network/azure-mgmt-privatedns"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-rdbms/default.nix b/python/pkgs/azure-mgmt-rdbms/default.nix index 79c889bd2..dc467f169 100644 --- a/python/pkgs/azure-mgmt-rdbms/default.nix +++ b/python/pkgs/azure-mgmt-rdbms/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "10.1.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -35,7 +33,6 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.rdbms" ]; meta = { diff --git a/python/pkgs/azure-mgmt-recoveryservices/default.nix b/python/pkgs/azure-mgmt-recoveryservices/default.nix index 573c7532f..f9b202e2d 100644 --- a/python/pkgs/azure-mgmt-recoveryservices/default.nix +++ b/python/pkgs/azure-mgmt-recoveryservices/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-recoveryservices"; version = "4.2.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_recoveryservices"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-qJJRGC8a0Mo5NZcOOptkHj6qVNhnaveYtYUeMes7bZg="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.recoveryservices" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-recoveryservicesbackup/default.nix b/python/pkgs/azure-mgmt-recoveryservicesbackup/default.nix index d3ddecadb..c007eb66a 100644 --- a/python/pkgs/azure-mgmt-recoveryservicesbackup/default.nix +++ b/python/pkgs/azure-mgmt-recoveryservicesbackup/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-recoveryservicesbackup"; version = "11.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_recoveryservicesbackup"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Czjim5iddTF0H6mCSFZ8zGOEqArUaj3jY8njOkCXHvs="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.recoveryservicesbackup" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-redhatopenshift/default.nix b/python/pkgs/azure-mgmt-redhatopenshift/default.nix index 2739b29e2..7f0a20b20 100644 --- a/python/pkgs/azure-mgmt-redhatopenshift/default.nix +++ b/python/pkgs/azure-mgmt-redhatopenshift/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-redhatopenshift"; version = "4.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_redhatopenshift"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-cuPnbKvj4iZIBnkbF7IRoaB3qJxgtLfT6JSgjRcdZrI="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { pythonNamespaces = "azure.mgmt"; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.redhatopenshift" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-redis/default.nix b/python/pkgs/azure-mgmt-redis/default.nix index ce7e9a737..179882d53 100644 --- a/python/pkgs/azure-mgmt-redis/default.nix +++ b/python/pkgs/azure-mgmt-redis/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "15.0.0b1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) version; pname = "azure_mgmt_redis"; @@ -30,7 +28,6 @@ buildPythonPackage (finalAttrs: { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.redis" ]; diff --git a/python/pkgs/azure-mgmt-relay/default.nix b/python/pkgs/azure-mgmt-relay/default.nix index ac29fc515..a8c81b5be 100644 --- a/python/pkgs/azure-mgmt-relay/default.nix +++ b/python/pkgs/azure-mgmt-relay/default.nix @@ -8,13 +8,13 @@ msrest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-relay"; version = "1.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; sha256 = "c93b7550e64b6734bf23ce57ca974a3ea929b734c58d1fe3669728c4fd2d2eb3"; }; @@ -34,7 +34,6 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.relay" ]; meta = { @@ -42,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-reservations/default.nix b/python/pkgs/azure-mgmt-reservations/default.nix index ae442cd82..4b6aad8c7 100644 --- a/python/pkgs/azure-mgmt-reservations/default.nix +++ b/python/pkgs/azure-mgmt-reservations/default.nix @@ -8,13 +8,13 @@ azure-mgmt-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-reservations"; version = "2.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-BHCFEFst5jfyIEo0hm86belpxW7EygZCBJ8PTqzqHKc="; }; @@ -28,11 +28,10 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Reservations Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-resource-deployments/default.nix b/python/pkgs/azure-mgmt-resource-deployments/default.nix index 800d1fdb0..a05fae00d 100644 --- a/python/pkgs/azure-mgmt-resource-deployments/default.nix +++ b/python/pkgs/azure-mgmt-resource-deployments/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-resource-deployments"; version = "1.0.0b2"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_resource_deployments"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-RVBRTFK4uwZH213SRLSUs0gl0cV8CRph0RZOGQQOw+I="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonNamespaces = [ "azure.mgmt" @@ -45,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Microsoft Azure SDK for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-resource-deployments"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource-deployments_${version}/sdk/resources/azure-mgmt-resource-deployments/CHANGELOG.md"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource-deployments_${finalAttrs.version}/sdk/resources/azure-mgmt-resource-deployments/CHANGELOG.md"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-resource-deploymentscripts/default.nix b/python/pkgs/azure-mgmt-resource-deploymentscripts/default.nix index 0fd43eb0f..8cdc11316 100644 --- a/python/pkgs/azure-mgmt-resource-deploymentscripts/default.nix +++ b/python/pkgs/azure-mgmt-resource-deploymentscripts/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-resource-deploymentscripts"; version = "1.0.0b1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_resource_deploymentscripts"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Vm2FWVPpSbsrNMtD4ecwVKqnkoHHRhO3Rf/duCyAI3U="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonNamespaces = [ "azure.mgmt" @@ -44,7 +43,7 @@ buildPythonPackage rec { meta = { description = "Microsoft Azure SDK for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-resource-deploymentscripts"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource-deploymentscripts_${version}/sdk/resources/azure-mgmt-resource-deploymentscripts/CHANGELOG.md"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource-deploymentscripts_${finalAttrs.version}/sdk/resources/azure-mgmt-resource-deploymentscripts/CHANGELOG.md"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-resource-deploymentstacks/default.nix b/python/pkgs/azure-mgmt-resource-deploymentstacks/default.nix index a5599bf65..b5994752e 100644 --- a/python/pkgs/azure-mgmt-resource-deploymentstacks/default.nix +++ b/python/pkgs/azure-mgmt-resource-deploymentstacks/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-resource-deploymentstacks"; version = "1.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_resource_deploymentstacks"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-gI3N1xc36cpOfLhLxip079VFe2ptsOVgfNNshv1YLcc="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonNamespaces = [ "azure.mgmt" @@ -44,7 +43,7 @@ buildPythonPackage rec { meta = { description = "Microsoft Azure SDK for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-resource-deploymentstacks"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource-deploymentstacks_${version}/sdk/resources/azure-mgmt-resource-deploymentstacks/CHANGELOG.md"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource-deploymentstacks_${finalAttrs.version}/sdk/resources/azure-mgmt-resource-deploymentstacks/CHANGELOG.md"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-resource-templatespecs/default.nix b/python/pkgs/azure-mgmt-resource-templatespecs/default.nix index 60cf3ceb4..c47a3134e 100644 --- a/python/pkgs/azure-mgmt-resource-templatespecs/default.nix +++ b/python/pkgs/azure-mgmt-resource-templatespecs/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-resource-templatespecs"; version = "1.0.0b1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_resource_templatespecs"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-D55zmrQ9sq2HDq5d8bXEv6BQC76hxuWKpeLpw4X6y8U="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonNamespaces = [ "azure.mgmt" @@ -44,7 +43,7 @@ buildPythonPackage rec { meta = { description = "Microsoft Azure SDK for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-resource-templatespecs"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource-templatespecs_${version}/sdk/resources/azure-mgmt-resource-templatespecs/CHANGELOG.md"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource-templatespecs_${finalAttrs.version}/sdk/resources/azure-mgmt-resource-templatespecs/CHANGELOG.md"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-resource/default.nix b/python/pkgs/azure-mgmt-resource/default.nix index 5ff6bfcca..1d9fb8d15 100644 --- a/python/pkgs/azure-mgmt-resource/default.nix +++ b/python/pkgs/azure-mgmt-resource/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-resource"; version = "26.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_resource"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-VCJ8XbBtO+TdS3etiFsnPp6yYG0d5lPFtTQGbPu2DAw="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonNamespaces = [ "azure.mgmt" ]; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-resource"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-scheduler/default.nix b/python/pkgs/azure-mgmt-scheduler/default.nix index 1d28acf79..850a72fde 100644 --- a/python/pkgs/azure-mgmt-scheduler/default.nix +++ b/python/pkgs/azure-mgmt-scheduler/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-scheduler"; version = "7.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_scheduler"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-hzabrRKnOzxk2e0/HlJvS7QvWnibgLfqn8EW+vsFH6U="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.scheduler" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-scheduler_7.0.0/sdk/scheduler/azure-mgmt-scheduler/CHANGELOG.md"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-search/default.nix b/python/pkgs/azure-mgmt-search/default.nix index af9fc66ce..f45b32144 100644 --- a/python/pkgs/azure-mgmt-search/default.nix +++ b/python/pkgs/azure-mgmt-search/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-search"; version = "10.0.0b1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_search"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-mtiAjukojtK5hqYfmzTNz142ul6R6qPbfQ5mQpvtsaQ="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.search" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-security/default.nix b/python/pkgs/azure-mgmt-security/default.nix index 8d75a7c67..f5f1a9f0f 100644 --- a/python/pkgs/azure-mgmt-security/default.nix +++ b/python/pkgs/azure-mgmt-security/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-security"; version = "7.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-WRLu1+nTdY/cqNJuHcJrQZQ9xHAyCKEYQmbiwlLhrWY="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # no tests included - doCheck = false; pythonImportsCheck = [ "azure.common" @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/security/azure-mgmt-security"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-servicebus/default.nix b/python/pkgs/azure-mgmt-servicebus/default.nix index f58b090e5..cc342b926 100644 --- a/python/pkgs/azure-mgmt-servicebus/default.nix +++ b/python/pkgs/azure-mgmt-servicebus/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-servicebus"; version = "8.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-i+kgjxQdmnifaNuNIZdU/3gGn9j5OQ6fdkS7laO+nsI="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonNamespaces = [ "azure.mgmt" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-servicefabric/default.nix b/python/pkgs/azure-mgmt-servicefabric/default.nix index dd26b88ef..7fdcab8f3 100644 --- a/python/pkgs/azure-mgmt-servicefabric/default.nix +++ b/python/pkgs/azure-mgmt-servicefabric/default.nix @@ -8,19 +8,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-servicefabric"; version = "2.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-oIQzBJVUQ2yQhEvIqWgg6INplITm/8mQMv0lcfjF99Y="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ isodate azure-common azure-mgmt-core @@ -29,11 +29,10 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; # Module has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Service Fabric Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/servicefabric/azure-mgmt-servicefabric"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-servicefabricmanagedclusters/default.nix b/python/pkgs/azure-mgmt-servicefabricmanagedclusters/default.nix index 4b391165f..36e7ab613 100644 --- a/python/pkgs/azure-mgmt-servicefabricmanagedclusters/default.nix +++ b/python/pkgs/azure-mgmt-servicefabricmanagedclusters/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-servicefabricmanagedclusters"; version = "3.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_servicefabricmanagedclusters"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-6JcaQubkkT9IWr9NRRQBGwvYbNQeFQovh9yHWO/P984="; }; @@ -30,11 +30,10 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; # Module has tests in mono-repo - doCheck = false; meta = { description = "This is the Microsoft Azure Service Fabric Cluster Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/servicefabricmanagedclusters/azure-mgmt-servicefabricmanagedclusters"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-servicelinker/default.nix b/python/pkgs/azure-mgmt-servicelinker/default.nix index 0d5d91249..8902caa51 100644 --- a/python/pkgs/azure-mgmt-servicelinker/default.nix +++ b/python/pkgs/azure-mgmt-servicelinker/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "1.1.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-QVw6Y9HachwBRwCbF0cSGLCAkSJtNnXBvsj5YX1TmJU="; @@ -32,7 +30,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "azure.mgmt.servicelinker" ]; # no tests with sdist - doCheck = false; meta = { description = "Microsoft Azure Servicelinker Management Client Library for Python"; diff --git a/python/pkgs/azure-mgmt-signalr/default.nix b/python/pkgs/azure-mgmt-signalr/default.nix index 712478868..c745d0681 100644 --- a/python/pkgs/azure-mgmt-signalr/default.nix +++ b/python/pkgs/azure-mgmt-signalr/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "1.2.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -32,7 +30,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.signalr" ]; diff --git a/python/pkgs/azure-mgmt-sql/default.nix b/python/pkgs/azure-mgmt-sql/default.nix index de2750de6..3daddbfaf 100644 --- a/python/pkgs/azure-mgmt-sql/default.nix +++ b/python/pkgs/azure-mgmt-sql/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "3.0.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -35,7 +33,6 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.sql" ]; diff --git a/python/pkgs/azure-mgmt-sqlvirtualmachine/default.nix b/python/pkgs/azure-mgmt-sqlvirtualmachine/default.nix index 22df2174c..485abd9b8 100644 --- a/python/pkgs/azure-mgmt-sqlvirtualmachine/default.nix +++ b/python/pkgs/azure-mgmt-sqlvirtualmachine/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-sqlvirtualmachine"; version = "0.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-talCNRKnsShErAFDZqHVPIEBehTzlna+7fAEpTKqKq0="; extension = "zip"; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # no tests included - doCheck = false; pythonImportsCheck = [ "azure.common" @@ -42,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/sql/azure-mgmt-sqlvirtualmachine"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-storage/default.nix b/python/pkgs/azure-mgmt-storage/default.nix index 92f9d86ee..e76e18eb4 100644 --- a/python/pkgs/azure-mgmt-storage/default.nix +++ b/python/pkgs/azure-mgmt-storage/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-storage"; version = "25.1.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_storage"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-zEvSFY/Q3YBjkUKvBtxwwRm7/W951T2kSC4LLISa98o="; }; @@ -32,11 +32,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "azure.mgmt.storage" ]; # Module has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Storage Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-subscription/default.nix b/python/pkgs/azure-mgmt-subscription/default.nix index e4a80416e..2030472b4 100644 --- a/python/pkgs/azure-mgmt-subscription/default.nix +++ b/python/pkgs/azure-mgmt-subscription/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "3.1.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -35,7 +33,6 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.subscription" ]; meta = { diff --git a/python/pkgs/azure-mgmt-synapse/default.nix b/python/pkgs/azure-mgmt-synapse/default.nix index 7635d98d9..b3e7a7cbb 100644 --- a/python/pkgs/azure-mgmt-synapse/default.nix +++ b/python/pkgs/azure-mgmt-synapse/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-synapse"; version = "2.1.0b7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-9diBVPWUofEa1LJytaDOU2FKB7nFDpayWgmnq3lx6dY="; extension = "zip"; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-mgmt-synapse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-mgmt-trafficmanager/default.nix b/python/pkgs/azure-mgmt-trafficmanager/default.nix index 469f82296..12fd62907 100644 --- a/python/pkgs/azure-mgmt-trafficmanager/default.nix +++ b/python/pkgs/azure-mgmt-trafficmanager/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "1.1.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -35,7 +33,6 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.mgmt.trafficmanager" ]; diff --git a/python/pkgs/azure-mgmt-web/default.nix b/python/pkgs/azure-mgmt-web/default.nix index a0b009055..b0c3e70aa 100644 --- a/python/pkgs/azure-mgmt-web/default.nix +++ b/python/pkgs/azure-mgmt-web/default.nix @@ -10,14 +10,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-web"; version = "11.0.1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_web"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-HOjtf9aeHdTIIKKXZWQ+k5S1j0KLUBM2QT1RfAJ6FFk="; }; @@ -32,11 +32,10 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; meta = { description = "This is the Microsoft Azure Web Apps Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-monitor-ingestion/default.nix b/python/pkgs/azure-monitor-ingestion/default.nix index 7c1aaff24..e55cce6da 100644 --- a/python/pkgs/azure-monitor-ingestion/default.nix +++ b/python/pkgs/azure-monitor-ingestion/default.nix @@ -8,14 +8,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-monitor-ingestion"; version = "1.1.0"; pyproject = true; src = fetchPypi { pname = "azure_monitor_ingestion"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-l6/ueA2a4waRKM3ncCfUzGL6gk/mTVusiArEpksKDE4="; }; @@ -33,11 +33,10 @@ buildPythonPackage rec { ]; # requires checkout from mono-repo and a mock account - doCheck = false; meta = { description = "Send custom logs to Azure Monitor using the Logs Ingestion API"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/monitor/azure-monitor-ingestion"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-monitor-query/default.nix b/python/pkgs/azure-monitor-query/default.nix index ab6befccb..71027a209 100644 --- a/python/pkgs/azure-monitor-query/default.nix +++ b/python/pkgs/azure-monitor-query/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-monitor-query"; version = "2.0.0"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_monitor_query"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ewXy/KxPtn/J93p9TF2YoPMJn7c7V8aewbCAdzmUZxs="; }; @@ -34,9 +34,9 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-monitor-query_${version}/sdk/monitor/azure-monitor-query/CHANGELOG.md"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-monitor-query_${finalAttrs.version}/sdk/monitor/azure-monitor-query/CHANGELOG.md"; description = "Microsoft Azure Monitor Query Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/monitor/azure-monitor-query"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-multiapi-storage/default.nix b/python/pkgs/azure-multiapi-storage/default.nix index 45a4dc9e2..20ff45645 100644 --- a/python/pkgs/azure-multiapi-storage/default.nix +++ b/python/pkgs/azure-multiapi-storage/default.nix @@ -11,14 +11,14 @@ python-dateutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-multiapi-storage"; version = "1.7.0b1"; pyproject = true; src = fetchPypi { pname = "azure_multiapi_storage"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-yM6mFM2XBkar1KUxsEzKs4h/OK8jFrYlUWH/S/gpn1w="; }; @@ -37,7 +37,6 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.multiapi" ]; # no tests included - doCheck = false; pythonImportsCheck = [ "azure.multiapi.storagev2" @@ -48,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-multiapi-storage-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-nspkg/default.nix b/python/pkgs/azure-nspkg/default.nix index d62ffc0b7..929904b5d 100644 --- a/python/pkgs/azure-nspkg/default.nix +++ b/python/pkgs/azure-nspkg/default.nix @@ -9,7 +9,6 @@ buildPythonPackage (finalAttrs: { version = "3.0.2"; pyproject = true; - __structuredAttrs = true; pname = "azure-nspkg"; src = fetchPypi { @@ -20,8 +19,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; - doCheck = false; - meta = { description = "Microsoft Azure SDK for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/python/pkgs/azure-search-documents/default.nix b/python/pkgs/azure-search-documents/default.nix index c0a3429c8..fecc91803 100644 --- a/python/pkgs/azure-search-documents/default.nix +++ b/python/pkgs/azure-search-documents/default.nix @@ -9,7 +9,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-search-documents"; version = "11.5.2"; pyproject = true; @@ -17,11 +17,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-python"; - tag = "azure_search_documents_${version}"; + tag = "azure_search_documents_${finalAttrs.version}"; hash = "sha256-RcVdqI50lsYed9L6Kz7faNLec1Y9zq685SGnwaEw6Qc="; }; - sourceRoot = "${src.name}/sdk/search/azure-search-documents"; + sourceRoot = "${finalAttrs.src.name}/sdk/search/azure-search-documents"; build-system = [ setuptools ]; @@ -34,7 +34,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "azure.search.documents" ]; # require devtools_testutils which is a internal package for azure-sdk - doCheck = false; passthru = { # multiple packages in the repo and the updater picks the wrong tag @@ -46,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/search/azure-search-documents"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-servicebus/default.nix b/python/pkgs/azure-servicebus/default.nix index b1ebd94e6..f497e7112 100644 --- a/python/pkgs/azure-servicebus/default.nix +++ b/python/pkgs/azure-servicebus/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-servicebus"; version = "7.15.0b2"; pyproject = true; src = fetchPypi { pname = "azure_servicebus"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-HsPFicWRz7UfBuWDKT5+D6OxxJ1snBXY9qie7cvFZF8="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # Tests require dev-tools - doCheck = false; pythonImportsCheck = [ "azure.servicebus" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/servicebus/azure-servicebus"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-servicefabric/default.nix b/python/pkgs/azure-servicefabric/default.nix index 89d97106e..a65ae7624 100644 --- a/python/pkgs/azure-servicefabric/default.nix +++ b/python/pkgs/azure-servicefabric/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "8.2.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; extension = "zip"; @@ -28,7 +26,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.servicefabric" ]; diff --git a/python/pkgs/azure-servicemanagement-legacy/default.nix b/python/pkgs/azure-servicemanagement-legacy/default.nix index 380611300..ced84a4c3 100644 --- a/python/pkgs/azure-servicemanagement-legacy/default.nix +++ b/python/pkgs/azure-servicemanagement-legacy/default.nix @@ -7,17 +7,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-servicemanagement-legacy"; version = "0.20.8"; pyproject = true; src = fetchPypi { pname = "azure_servicemanagement_legacy"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-42neKpeBjx26GTIzeBTyjTmj5tcNklNQoaBoEDjC+Xc="; }; + pythonRemoveDeps = [ "azure-nspkg" ]; + build-system = [ setuptools ]; dependencies = [ @@ -28,7 +30,6 @@ buildPythonPackage rec { pythonNamespaces = [ "azure" ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "azure.servicemanagement" ]; @@ -37,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-servicemanagement-legacy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-storage-blob/default.nix b/python/pkgs/azure-storage-blob/default.nix index 2bf674d79..548c0ba82 100644 --- a/python/pkgs/azure-storage-blob/default.nix +++ b/python/pkgs/azure-storage-blob/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-storage-blob"; version = "12.30.1"; pyproject = true; src = fetchPypi { pname = "azure_storage_blob"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-eiT5eMUdVqA3W+6//L6EU+Wa45DSaVcFhI7cdQg+QYQ="; }; @@ -30,11 +30,10 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; meta = { description = "Client library for Microsoft Azure Storage services containing the blob service APIs"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-storage-common/default.nix b/python/pkgs/azure-storage-common/default.nix index 260db0bf3..ea32c65e5 100644 --- a/python/pkgs/azure-storage-common/default.nix +++ b/python/pkgs/azure-storage-common/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "2.1.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-zO3vXGcie8TWZw/9N87Bj7UpobfDpeU+QJbrDPI9xz8="; @@ -34,7 +32,6 @@ buildPythonPackage (finalAttrs: { ++ lib.optional (!isPy3k) azure-storage-nspkg; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.storage.common" ]; diff --git a/python/pkgs/azure-storage-file-datalake/default.nix b/python/pkgs/azure-storage-file-datalake/default.nix index 68a90445a..935788a04 100644 --- a/python/pkgs/azure-storage-file-datalake/default.nix +++ b/python/pkgs/azure-storage-file-datalake/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-storage-file-datalake"; version = "12.25.0"; pyproject = true; src = fetchPypi { pname = "azure_storage_file_datalake"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-NIE8bz6b8WNomM7GJSndLO0YnNLGdxYOxp74jDty2n8="; }; @@ -36,11 +36,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "azure.storage.filedatalake" ]; # Tests are only available in mono repo - doCheck = false; meta = { description = "Microsoft Azure File DataLake Storage Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-file-datalake"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-storage-file-share/default.nix b/python/pkgs/azure-storage-file-share/default.nix index e91d615c6..c8db7912f 100644 --- a/python/pkgs/azure-storage-file-share/default.nix +++ b/python/pkgs/azure-storage-file-share/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-storage-file-share"; version = "12.26.0"; pyproject = true; src = fetchPypi { pname = "azure_storage_file_share"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-CM+LxDbfUyzbm/3857sQxfHYPVE2CVTNju9Wy8z0MAo="; }; @@ -34,7 +34,6 @@ buildPythonPackage rec { }; # Tests require checkout from monorepo - doCheck = false; pythonImportsCheck = [ "azure.core" @@ -46,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-file-share"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-storage-file/default.nix b/python/pkgs/azure-storage-file/default.nix index a6b5fe6f2..f22bd7b08 100644 --- a/python/pkgs/azure-storage-file/default.nix +++ b/python/pkgs/azure-storage-file/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "2.1.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-NVm5x6sTRQxm6oM+uCwoIzvuJPG9jKGap9J/jCPVvFM="; @@ -30,7 +28,6 @@ buildPythonPackage (finalAttrs: { ++ lib.optional (!isPy3k) futures; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.storage.file" ]; diff --git a/python/pkgs/azure-storage-nspkg/default.nix b/python/pkgs/azure-storage-nspkg/default.nix index 5a3245a15..5e722bb1f 100644 --- a/python/pkgs/azure-storage-nspkg/default.nix +++ b/python/pkgs/azure-storage-nspkg/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "3.1.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-bzu+hlLV9UJ2fYQz5/lrjff1GHdAVax8ku18qF9lOBE="; @@ -23,7 +21,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ azure-nspkg ]; # has no tests - doCheck = false; meta = { description = "Client library for Microsoft Azure Storage services owning the azure.storage namespace, user should not use this directly"; diff --git a/python/pkgs/azure-storage-queue/default.nix b/python/pkgs/azure-storage-queue/default.nix index 4bf6aa42d..e20ed6352 100644 --- a/python/pkgs/azure-storage-queue/default.nix +++ b/python/pkgs/azure-storage-queue/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-storage-queue"; version = "12.17.0"; pyproject = true; src = fetchPypi { pname = "azure_storage_queue"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-brEIqIVUvjcf6y66lxX6Dj97rKez8AwZ7EF/x85bODQ="; }; @@ -34,7 +34,6 @@ buildPythonPackage rec { }; # has no tests - doCheck = false; pythonImportsCheck = [ "azure.storage.queue" ]; @@ -43,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-synapse-accesscontrol/default.nix b/python/pkgs/azure-synapse-accesscontrol/default.nix index 34a36c052..6278e3c04 100644 --- a/python/pkgs/azure-synapse-accesscontrol/default.nix +++ b/python/pkgs/azure-synapse-accesscontrol/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-synapse-accesscontrol"; version = "0.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VlqiYzbVYMAod16K5Q0GkapwielhcOeDQjcbdz2jE3w="; extension = "zip"; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # zero tests run - doCheck = false; pythonImportsCheck = [ "azure.synapse.accesscontrol" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-accesscontrol"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-synapse-artifacts/default.nix b/python/pkgs/azure-synapse-artifacts/default.nix index af8763fc2..4aabdcc26 100644 --- a/python/pkgs/azure-synapse-artifacts/default.nix +++ b/python/pkgs/azure-synapse-artifacts/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "0.22.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "azure_synapse_artifacts"; inherit (finalAttrs) version; @@ -32,7 +30,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests are only available in mono-repo - doCheck = false; pythonImportsCheck = [ "azure.synapse.artifacts" ]; diff --git a/python/pkgs/azure-synapse-managedprivateendpoints/default.nix b/python/pkgs/azure-synapse-managedprivateendpoints/default.nix index 276d29864..4ebd84db8 100644 --- a/python/pkgs/azure-synapse-managedprivateendpoints/default.nix +++ b/python/pkgs/azure-synapse-managedprivateendpoints/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-synapse-managedprivateendpoints"; version = "0.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-kA6urM/9zQEBKySKfQSQCMkoB7dJ7dHJB0ypJIVUwX4="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-managedprivateendpoints"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/azure-synapse-spark/default.nix b/python/pkgs/azure-synapse-spark/default.nix index b9e5363e0..30fe9358b 100644 --- a/python/pkgs/azure-synapse-spark/default.nix +++ b/python/pkgs/azure-synapse-spark/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-synapse-spark"; version = "0.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hvopRjokt8NwJf8hUJtw42tNrOKOXZIAG8kgSINQrNU="; extension = "zip"; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-spark"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/b2sdk/default.nix b/python/pkgs/b2sdk/default.nix index d4acb3665..e608cacaa 100644 --- a/python/pkgs/b2sdk/default.nix +++ b/python/pkgs/b2sdk/default.nix @@ -19,7 +19,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "b2sdk"; version = "2.12.0"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Backblaze"; repo = "b2-sdk-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JzJ83+W9k5ys8dj0Q3X4MY+GH4m8/crvKmeQKOttspM="; }; @@ -70,4 +70,4 @@ buildPythonPackage rec { homepage = "https://github.com/Backblaze/b2-sdk-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/babel/default.nix b/python/pkgs/babel/default.nix index ba4dde311..2c68c3b6d 100644 --- a/python/pkgs/babel/default.nix +++ b/python/pkgs/babel/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "babel"; version = "2.18.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uAuZoUvQhfys+hXJFl9lH7s0BuZsxgOr8RxXUJN8mS0="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "pybabel"; }; -} +}) diff --git a/python/pkgs/babelfish/default.nix b/python/pkgs/babelfish/default.nix index b62d836cd..351e2890a 100644 --- a/python/pkgs/babelfish/default.nix +++ b/python/pkgs/babelfish/default.nix @@ -5,20 +5,18 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "babelfish"; version = "0.6.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3stnpGYIiNSEgKtpmDCYNxdBWNDxqmO+uxwuEaq5eqs="; }; build-system = [ poetry-core ]; - doCheck = false; - pythonImportsCheck = [ "babelfish" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/Diaoul/babelfish"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/babelgladeextractor/default.nix b/python/pkgs/babelgladeextractor/default.nix index 1feb34a9e..45295a2ff 100644 --- a/python/pkgs/babelgladeextractor/default.nix +++ b/python/pkgs/babelgladeextractor/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "0.7.0"; pyproject = true; - __structuredAttrs = true; - disabled = (!isPy3k); # uses python3 specific file io in setup.py src = fetchPypi { diff --git a/python/pkgs/backcall/default.nix b/python/pkgs/backcall/default.nix index f4c67f475..452f5f65a 100644 --- a/python/pkgs/backcall/default.nix +++ b/python/pkgs/backcall/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "backcall"; version = "0.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XL2/J75efPrbRIuvCqlVCPkfK7xsZDfNnNBuKkwhXh4="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/takluyver/backcall"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/backoff/default.nix b/python/pkgs/backoff/default.nix index efc5beade..b4ee2b3e2 100644 --- a/python/pkgs/backoff/default.nix +++ b/python/pkgs/backoff/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "backoff"; version = "2.2.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "litl"; repo = "backoff"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/litl/backoff"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/backports-datetime-fromisoformat/default.nix b/python/pkgs/backports-datetime-fromisoformat/default.nix index c4af45b8c..ae2adf761 100644 --- a/python/pkgs/backports-datetime-fromisoformat/default.nix +++ b/python/pkgs/backports-datetime-fromisoformat/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "backports-datetime-fromisoformat"; version = "2.0.3"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "movermeyer"; repo = "backports.datetime_fromisoformat"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-G1JMHa7r8KEOuIopXNBsPxu7yopFF1YlL5GUEmfuxqQ="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/movermeyer/backports.datetime_fromisoformat"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/backports-entry-points-selectable/default.nix b/python/pkgs/backports-entry-points-selectable/default.nix index 9a94918f0..3d4af7c1b 100644 --- a/python/pkgs/backports-entry-points-selectable/default.nix +++ b/python/pkgs/backports-entry-points-selectable/default.nix @@ -5,14 +5,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "backports-entry-points-selectable"; version = "1.3.0"; pyproject = true; src = fetchPypi { pname = "backports.entry_points_selectable"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-F6i0SucA+6VIaG3SdN3JHAYDcVZc1jgGwgodM5EXRuY="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/backports.entry_points_selectable"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/backports-tarfile/default.nix b/python/pkgs/backports-tarfile/default.nix index 7b531a26e..5ee9f8a2a 100644 --- a/python/pkgs/backports-tarfile/default.nix +++ b/python/pkgs/backports-tarfile/default.nix @@ -7,35 +7,31 @@ wheel, }: -let - self = buildPythonPackage rec { - pname = "backports-tarfile"; - version = "1.2.0"; - pyproject = true; +buildPythonPackage (finalAttrs: { + pname = "backports-tarfile"; + version = "1.2.0"; + pyproject = true; - src = fetchFromGitHub { - owner = "jaraco"; - repo = "backports.tarfile"; - rev = "v${version}"; - hash = "sha256-X3rkL35aDG+DnIOq0fI7CFoWGNtgLkLjtT9y6+23oto="; - }; + src = fetchFromGitHub { + owner = "jaraco"; + repo = "backports.tarfile"; + tag = "v${finalAttrs.version}"; + hash = "sha256-X3rkL35aDG+DnIOq0fI7CFoWGNtgLkLjtT9y6+23oto="; + }; - build-system = [ - setuptools - setuptools-scm - wheel - ]; + build-system = [ + setuptools + setuptools-scm + wheel + ]; - doCheck = false; - pythonImportsCheck = [ "backports.tarfile" ]; + pythonImportsCheck = [ "backports.tarfile" ]; - passthru.tests.pytest = self.overridePythonAttrs { doCheck = true; }; + passthru.tests.pytest = finalAttrs.finalPackage.overridePythonAttrs { doCheck = true; }; - meta = { - description = "Backport of CPython tarfile module"; - homepage = "https://github.com/jaraco/backports.tarfile"; - license = lib.licenses.mit; - }; + meta = { + description = "Backport of CPython tarfile module"; + homepage = "https://github.com/jaraco/backports.tarfile"; + license = lib.licenses.mit; }; -in -self +}) diff --git a/python/pkgs/backports-zstd/default.nix b/python/pkgs/backports-zstd/default.nix index 4a1789c8c..2ea14da8d 100644 --- a/python/pkgs/backports-zstd/default.nix +++ b/python/pkgs/backports-zstd/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "backports-zstd"; version = "1.3.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rogdham"; repo = "backports.zstd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; postFetch = '' rm -r "$out/src/c/zstd" @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/rogdham/backports.zstd"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/backrefs/default.nix b/python/pkgs/backrefs/default.nix index b6d4a4cc9..b97fb2dcf 100644 --- a/python/pkgs/backrefs/default.nix +++ b/python/pkgs/backrefs/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "backrefs"; version = "8.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "facelessuser"; repo = "backrefs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-SwZ/gam+/mK+Emm26G20SLmA4es9jZOKMxLgfNZKelM="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Wrapper around re or regex that adds additional back references"; homepage = "https://github.com/facelessuser/backrefs"; - changelog = "https://github.com/facelessuser/backrefs/releases/tag/${src.tag}"; + changelog = "https://github.com/facelessuser/backrefs/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/backtesting/default.nix b/python/pkgs/backtesting/default.nix index 8d1838e0c..10d92f984 100644 --- a/python/pkgs/backtesting/default.nix +++ b/python/pkgs/backtesting/default.nix @@ -9,13 +9,13 @@ bokeh, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "backtesting"; version = "0.6.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hErxHJYfoPR7/dsEtEhBb5OwK3Mfqt+j34uYpECB/Qs="; }; @@ -36,11 +36,10 @@ buildPythonPackage rec { ]; # No tests - doCheck = false; meta = { description = "Backtest trading strategies in Python"; homepage = "https://kernc.github.io/backtesting.py/"; license = lib.licenses.agpl3Only; }; -} +}) diff --git a/python/pkgs/baidu-aip/default.nix b/python/pkgs/baidu-aip/default.nix index 1b3c4f1ff..52e032bf4 100644 --- a/python/pkgs/baidu-aip/default.nix +++ b/python/pkgs/baidu-aip/default.nix @@ -7,13 +7,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "baidu-aip"; version = "4.16.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zNYjEVVwhqFAR7w7CR3rWYefUZcM+sPZ87KYfDDLxN0="; }; @@ -25,7 +25,6 @@ buildPythonPackage rec { ]; # Package has no tests - doCheck = false; pythonImportsCheck = [ "aip" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/Baidu-AIP/python-sdk"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/baize/default.nix b/python/pkgs/baize/default.nix index 417d255aa..3041f6b52 100644 --- a/python/pkgs/baize/default.nix +++ b/python/pkgs/baize/default.nix @@ -9,7 +9,7 @@ starlette, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "baize"; version = "0.23.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "abersheeran"; repo = "baize"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TclyTLqJ+r9Spg6VgmsqhhVj/Mp/HqFrkXjZy5f2BR0="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/abersheeran/baize"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/banal/default.nix b/python/pkgs/banal/default.nix index 880662a13..315df2d4f 100644 --- a/python/pkgs/banal/default.nix +++ b/python/pkgs/banal/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "banal"; version = "1.0.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-L+AskwX1MWhEGUj0oD37+i6sxz2zDbSpMwkIPLDiUKU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/pudo/banal"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bandit/default.nix b/python/pkgs/bandit/default.nix index a88d66f7b..d8b470439 100644 --- a/python/pkgs/bandit/default.nix +++ b/python/pkgs/bandit/default.nix @@ -10,13 +10,13 @@ stevedore, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bandit"; version = "1.9.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tYnl3ir+cL1NU/oMHaYZn0CFr2Zv3gDooDTxUqUs1ig="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://bandit.readthedocs.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/bangla/default.nix b/python/pkgs/bangla/default.nix index ff9b6948d..21a5f066f 100644 --- a/python/pkgs/bangla/default.nix +++ b/python/pkgs/bangla/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bangla"; version = "0.0.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-r/5AaVajaWNRwTRkY3O59+aWewrJ2Rnclnc29n3GCxs="; }; @@ -20,11 +20,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "bangla" ]; # https://github.com/arsho/bangla/issues/5 - doCheck = false; meta = { description = "Bangla is a package for Bangla language users with various functionalities including Bangla date and Bangla numeric conversation"; homepage = "https://github.com/arsho/bangla"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/base36/default.nix b/python/pkgs/base36/default.nix index 9d695a563..219c405f5 100644 --- a/python/pkgs/base36/default.nix +++ b/python/pkgs/base36/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.1"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "tonyseek"; repo = "python-base36"; diff --git a/python/pkgs/base58/default.nix b/python/pkgs/base58/default.nix index b24df7d7e..202de9247 100644 --- a/python/pkgs/base58/default.nix +++ b/python/pkgs/base58/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "base58"; version = "2.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xdDLP1tugejjXaV1Q4jdzG0NFLbGoTLLk9ae1YCnJ4w="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/keis/base58"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/base58check/default.nix b/python/pkgs/base58check/default.nix index d7f6e31fb..c88ec07e3 100644 --- a/python/pkgs/base58check/default.nix +++ b/python/pkgs/base58check/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.2"; pyproject = true; - __structuredAttrs = true; - build-system = [ setuptools ]; src = fetchFromGitHub { diff --git a/python/pkgs/baseline/default.nix b/python/pkgs/baseline/default.nix index 8a974e574..12552e6d0 100644 --- a/python/pkgs/baseline/default.nix +++ b/python/pkgs/baseline/default.nix @@ -12,8 +12,6 @@ buildPythonPackage { version = "1.2.1"; pyproject = true; - __structuredAttrs = true; - disabled = !isPy3k; src = fetchFromGitHub { diff --git a/python/pkgs/bash-kernel/default.nix b/python/pkgs/bash-kernel/default.nix index b8ffbf259..f94057647 100644 --- a/python/pkgs/bash-kernel/default.nix +++ b/python/pkgs/bash-kernel/default.nix @@ -12,7 +12,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bash-kernel"; version = "0.10.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "takluyver"; repo = "bash_kernel"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ugFMcQx1B1nKoO9rhb6PMllRcoZi0O4B9um8dOu5DU4="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/takluyver/bash_kernel"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/bashlex/default.nix b/python/pkgs/bashlex/default.nix index 4ca7e0e66..11bba2e27 100644 --- a/python/pkgs/bashlex/default.nix +++ b/python/pkgs/bashlex/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bashlex"; version = "0.18"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-W7A6AcbVZ2M4w2/RAoAJyK0H59Ydihzj9RO3//Unlu4="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/idank/bashlex"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/batchgenerators/default.nix b/python/pkgs/batchgenerators/default.nix index 7dfb63c70..98cee3bf2 100644 --- a/python/pkgs/batchgenerators/default.nix +++ b/python/pkgs/batchgenerators/default.nix @@ -13,7 +13,7 @@ threadpoolctl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "batchgenerators"; version = "0.25.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MIC-DKFZ"; repo = "batchgenerators"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lvsen2AFRwFjLMgxXBQ9/xxmCOBx2D2PBIl0KpOzR70="; }; @@ -38,7 +38,10 @@ buildPythonPackage rec { ]; # see https://github.com/MIC-DKFZ/batchgenerators/pull/78 - pythonRemoveDeps = [ "unittest2" ]; + pythonRemoveDeps = [ + "pandas" + "unittest2" + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -59,4 +62,4 @@ buildPythonPackage rec { homepage = "https://github.com/MIC-DKFZ/batchgenerators"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/batinfo/default.nix b/python/pkgs/batinfo/default.nix index 8da7181aa..41290283e 100644 --- a/python/pkgs/batinfo/default.nix +++ b/python/pkgs/batinfo/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "batinfo"; version = "0.4.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nicolargo"; repo = "batinfo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GgAJJA8bzQJLAU+nxmkDa5LFTHc4NGi+nj9PfKyw8/M="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl3Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/baycomp/default.nix b/python/pkgs/baycomp/default.nix index 19af36a8b..53d84fdce 100644 --- a/python/pkgs/baycomp/default.nix +++ b/python/pkgs/baycomp/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.3"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-MrJa17FtWyUd259hEKMtezlTuYcJbaHSXvJ3k10l2uw="; diff --git a/python/pkgs/bayesian-optimization/default.nix b/python/pkgs/bayesian-optimization/default.nix index 96c7fddb3..e65ec40c9 100644 --- a/python/pkgs/bayesian-optimization/default.nix +++ b/python/pkgs/bayesian-optimization/default.nix @@ -22,7 +22,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bayesian-optimization"; version = "3.3.0"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bayesian-optimization"; repo = "BayesianOptimization"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tehmtySHiwXQBFZDcj87DAP0WMyp3kDXW0LZApkHZwY="; }; @@ -66,4 +66,4 @@ buildPythonPackage rec { homepage = "https://github.com/bayesian-optimization/BayesianOptimization"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bbox/default.nix b/python/pkgs/bbox/default.nix index b9d922b69..13c96f3e5 100644 --- a/python/pkgs/bbox/default.nix +++ b/python/pkgs/bbox/default.nix @@ -31,7 +31,7 @@ buildPythonPackage { --replace-warn round_ round ''; - propagatedBuildInputs = [ + dependencies = [ pyquaternion numpy ]; diff --git a/python/pkgs/bc-jsonpath-ng/default.nix b/python/pkgs/bc-jsonpath-ng/default.nix index fbc8bd8ae..adc688a11 100644 --- a/python/pkgs/bc-jsonpath-ng/default.nix +++ b/python/pkgs/bc-jsonpath-ng/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "1.6.1"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "bridgecrewio"; repo = "jsonpath-ng"; diff --git a/python/pkgs/bc-python-hcl2/default.nix b/python/pkgs/bc-python-hcl2/default.nix index ca1054f08..ae14e0e55 100644 --- a/python/pkgs/bc-python-hcl2/default.nix +++ b/python/pkgs/bc-python-hcl2/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bc-python-hcl2"; version = "0.4.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bridgecrewio"; repo = "python-hcl2"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Auk5xDLw2UhMzWa7YMKzwUSjhD9s6xHt8RcXMzzL8M0="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ lark ]; # This fork of python-hcl2 doesn't ship tests - doCheck = false; pythonImportsCheck = [ "hcl2" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "hcl2tojson"; }; -} +}) diff --git a/python/pkgs/bcdoc/default.nix b/python/pkgs/bcdoc/default.nix index b635bb96b..a40d719d7 100644 --- a/python/pkgs/bcdoc/default.nix +++ b/python/pkgs/bcdoc/default.nix @@ -7,13 +7,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bcdoc"; version = "0.16.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-9WjBguBog77PcZbyJwUkNc/9RWBHAMgjYsp300J7YgI="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/boto/bcdoc"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/bcg/default.nix b/python/pkgs/bcg/default.nix index bc285e9a5..34edb2439 100644 --- a/python/pkgs/bcg/default.nix +++ b/python/pkgs/bcg/default.nix @@ -19,8 +19,6 @@ buildPythonPackage (finalAttrs: { version = "1.17.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "hardwario"; repo = "bch-gateway"; diff --git a/python/pkgs/bch/default.nix b/python/pkgs/bch/default.nix index 47324f022..dfb59b4b6 100644 --- a/python/pkgs/bch/default.nix +++ b/python/pkgs/bch/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "1.2.1"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "hardwario"; repo = "bch-control-tool"; diff --git a/python/pkgs/bcrypt/3.nix b/python/pkgs/bcrypt/3.nix index 0b210e3dc..5ad81293b 100644 --- a/python/pkgs/bcrypt/3.nix +++ b/python/pkgs/bcrypt/3.nix @@ -8,19 +8,19 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bcrypt"; version = "3.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QzxBDCF3BXcF2iqfLNAd0VdJOyp6wUyFk6FrPatra/s="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ six cffi ]; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyca/bcrypt/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/bcrypt/default.nix b/python/pkgs/bcrypt/default.nix index 49ce5aa5f..d3fbf8745 100644 --- a/python/pkgs/bcrypt/default.nix +++ b/python/pkgs/bcrypt/default.nix @@ -9,7 +9,7 @@ fetchFromGitHub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bcrypt"; version = "5.0.0"; pyproject = true; @@ -17,13 +17,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyca"; repo = "bcrypt"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7Dp07xoq6h+fiP7d7/TRRoYszWsyQF1c4vuFUpZ7u6U="; }; cargoRoot = "src/_bcrypt"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit + inherit (finalAttrs) pname version src @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyca/bcrypt/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/beaker/default.nix b/python/pkgs/beaker/default.nix index 6e21a6e26..d6a6b0b10 100644 --- a/python/pkgs/beaker/default.nix +++ b/python/pkgs/beaker/default.nix @@ -5,21 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "beaker"; version = "1.13.0"; pyproject = true; src = fetchPypi { pname = "Beaker"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-6VbNijWtXeG1ISx7/4/AHis9NKuSRm0kaExmaruMnDA="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "beaker" ]; meta = { @@ -27,4 +25,4 @@ buildPythonPackage rec { description = "Session and Caching library with WSGI Middleware"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/beancount-black/default.nix b/python/pkgs/beancount-black/default.nix index 3c1d434d8..e642387ce 100644 --- a/python/pkgs/beancount-black/default.nix +++ b/python/pkgs/beancount-black/default.nix @@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: { buildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ beancount-parser click ]; diff --git a/python/pkgs/beancount-parser/default.nix b/python/pkgs/beancount-parser/default.nix index 7a1fa34b7..e4cc68ab1 100644 --- a/python/pkgs/beancount-parser/default.nix +++ b/python/pkgs/beancount-parser/default.nix @@ -21,7 +21,7 @@ buildPythonPackage (finalAttrs: { buildInputs = [ poetry-core ]; - propagatedBuildInputs = [ lark ]; + dependencies = [ lark ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/python/pkgs/beanhub-extract/default.nix b/python/pkgs/beanhub-extract/default.nix index 106eab6ed..2c2f9515a 100644 --- a/python/pkgs/beanhub-extract/default.nix +++ b/python/pkgs/beanhub-extract/default.nix @@ -9,7 +9,7 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "beanhub-extract"; version = "0.1.7"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LaunchPlatform"; repo = "beanhub-extract"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CpR4NNXr6Ag8dCI+NB+4hvAtFBjKJTNkXMps2E+6L7Q="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/LaunchPlatform/beanhub-extract/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/beanhub-forms/default.nix b/python/pkgs/beanhub-forms/default.nix index b1a029467..2784e1f6a 100644 --- a/python/pkgs/beanhub-forms/default.nix +++ b/python/pkgs/beanhub-forms/default.nix @@ -11,7 +11,7 @@ wtforms, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "beanhub-forms"; version = "0.1.3"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LaunchPlatform"; repo = "beanhub-forms"; - tag = version; + tag = finalAttrs.version; hash = "sha256-313c+ENmTe1LyfEiMXNB9AUoGx3Yv/1D0T3HnAbd+Zw="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/LaunchPlatform/beanhub-forms/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/beanhub-import/default.nix b/python/pkgs/beanhub-import/default.nix index 076f52650..af8c11233 100644 --- a/python/pkgs/beanhub-import/default.nix +++ b/python/pkgs/beanhub-import/default.nix @@ -13,7 +13,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "beanhub-import"; version = "1.4.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LaunchPlatform"; repo = "beanhub-import"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TlRqIaxUeyNJHyH3FBNJLTroG3NRGUacY5ZrnaBaAb4="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/LaunchPlatform/beanhub-import/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/beanhub-inbox/default.nix b/python/pkgs/beanhub-inbox/default.nix index a45fcf0bd..d2ed59a8e 100644 --- a/python/pkgs/beanhub-inbox/default.nix +++ b/python/pkgs/beanhub-inbox/default.nix @@ -15,7 +15,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "beanhub-inbox"; version = "0.2.3"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LaunchPlatform"; repo = "beanhub-inbox"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WWfZsJRm2rJI85vmFt/AtV++5vpSTJZpRrk3PdHMhAA="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/LaunchPlatform/beanhub-inbox"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/beanstalkc/default.nix b/python/pkgs/beanstalkc/default.nix index f242addf9..dd0d92c23 100644 --- a/python/pkgs/beanstalkc/default.nix +++ b/python/pkgs/beanstalkc/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "0.5.2"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "bosondata"; repo = "beanstalkc"; @@ -21,8 +19,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "beanstalkc" ]; meta = { diff --git a/python/pkgs/beartype/default.nix b/python/pkgs/beartype/default.nix index 0c4fcd5e5..f7cfdc764 100644 --- a/python/pkgs/beartype/default.nix +++ b/python/pkgs/beartype/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "beartype"; version = "0.22.9"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "beartype"; repo = "beartype"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-F9x2qvzll1nUcTQZjaky+0ukP1RXoW35crzfS/pmvTs="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/beartype/beartype"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/beautiful-date/default.nix b/python/pkgs/beautiful-date/default.nix index 556535143..f095366b4 100644 --- a/python/pkgs/beautiful-date/default.nix +++ b/python/pkgs/beautiful-date/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "2.3.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "kuzmoyev"; repo = "beautiful-date"; diff --git a/python/pkgs/beautifulsoup4/default.nix b/python/pkgs/beautifulsoup4/default.nix index 6ac7a8ca6..6ad0cb1a4 100644 --- a/python/pkgs/beautifulsoup4/default.nix +++ b/python/pkgs/beautifulsoup4/default.nix @@ -22,7 +22,7 @@ lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "beautifulsoup4"; version = "4.15.0"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-KI48p9VLBvKsGRlwvCdcGTnLRtRQslW/ZxiwSqN6tPc="; }; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "http://crummy.com/software/BeautifulSoup/bs4/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/beautifultable/default.nix b/python/pkgs/beautifultable/default.nix index 584243668..853c586b0 100644 --- a/python/pkgs/beautifultable/default.nix +++ b/python/pkgs/beautifultable/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "1.1.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "pri22296"; repo = "beautifultable"; diff --git a/python/pkgs/bech32/default.nix b/python/pkgs/bech32/default.nix index bc504eb1c..937477d92 100644 --- a/python/pkgs/bech32/default.nix +++ b/python/pkgs/bech32/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bech32"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fW24IUYDvXhx/PpsCCbvaLhbCr2Q+iHChanF4h0r2Jk="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/fiatjaf/bech32"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/before-after/default.nix b/python/pkgs/before-after/default.nix index 06a4fead2..13046ccc5 100644 --- a/python/pkgs/before-after/default.nix +++ b/python/pkgs/before-after/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "before_after"; inherit (finalAttrs) version; diff --git a/python/pkgs/behave/default.nix b/python/pkgs/behave/default.nix index d2cb9434d..9a4f0ea8b 100644 --- a/python/pkgs/behave/default.nix +++ b/python/pkgs/behave/default.nix @@ -19,7 +19,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "behave"; version = "1.3.3"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "behave"; repo = "behave"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sHsnBeyl0UJ0f7WcTUc+FhUxATh84RPxVE3TqGYosrs="; }; @@ -68,4 +68,4 @@ buildPythonPackage rec { mainProgram = "behave"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/bencode-py/default.nix b/python/pkgs/bencode-py/default.nix index f70aef82a..80844df29 100644 --- a/python/pkgs/bencode-py/default.nix +++ b/python/pkgs/bencode-py/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "4.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) version; pname = "bencode.py"; diff --git a/python/pkgs/bencoder/default.nix b/python/pkgs/bencoder/default.nix index 0ee8c5289..1b0f1cd2b 100644 --- a/python/pkgs/bencoder/default.nix +++ b/python/pkgs/bencoder/default.nix @@ -9,8 +9,6 @@ buildPythonPackage (finalAttrs: { version = "0.2.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-rENvM/3X51stkFdJHSq+77VjHvsTyBNAPbCtsRq1L8I="; @@ -21,7 +19,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "bencoder" ]; # There are no tests. - doCheck = false; meta = { description = "Simple bencode decoder/encoder library in pure Python"; diff --git a/python/pkgs/beniget/default.nix b/python/pkgs/beniget/default.nix index ab13ebe8d..b487c76ca 100644 --- a/python/pkgs/beniget/default.nix +++ b/python/pkgs/beniget/default.nix @@ -6,13 +6,13 @@ gast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "beniget"; version = "0.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-568R+o7H3j0+s9mLHnItFdRAF9izXYqhHVT2cZsxLyI="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { dependencies = [ gast ]; - doCheck = false; - pythonImportsCheck = [ "beniget" ]; meta = { @@ -29,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/serge-sans-paille/beniget"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/berkeleydb/default.nix b/python/pkgs/berkeleydb/default.nix index e34b1ddd1..9d2032682 100644 --- a/python/pkgs/berkeleydb/default.nix +++ b/python/pkgs/berkeleydb/default.nix @@ -8,13 +8,13 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "berkeleydb"; version = "18.1.15"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-evpTFD11TGuyyFZWwTJeuuUYrc/NG1nhPMKruI3fdY4="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://www.jcea.es/programacion/pybsddb.htm"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/bespon/default.nix b/python/pkgs/bespon/default.nix index 1b69f444a..d8a4cd259 100644 --- a/python/pkgs/bespon/default.nix +++ b/python/pkgs/bespon/default.nix @@ -5,19 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.7.0"; pname = "bespon"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dGtXw4uq6pdyXBVfSi9s7kCFUqA1PO7qWEGY0JNAz8Q="; }; nativeBuildInputs = [ setuptools ]; # upstream doesn't contain tests - doCheck = false; pythonImportsCheck = [ "bespon" ]; meta = { @@ -25,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/gpoore/bespon_py"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/betacode/default.nix b/python/pkgs/betacode/default.nix index 0df9f7694..d35f142df 100644 --- a/python/pkgs/betacode/default.nix +++ b/python/pkgs/betacode/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "1.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-TKYetG25qcvnbyvWAfGlouYDLSg0MnPOsPlWUrLCUR4="; diff --git a/python/pkgs/betamax-matchers/default.nix b/python/pkgs/betamax-matchers/default.nix index f57b0a9ef..bb14678df 100644 --- a/python/pkgs/betamax-matchers/default.nix +++ b/python/pkgs/betamax-matchers/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "betamax-matchers"; version = "0.4.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "betamaxpy"; repo = "betamax_matchers"; - tag = version; + tag = finalAttrs.version; hash = "sha256-BV9DOfZLDAZIr2E75l988QxFWWvazBL9VttxGFIez1M="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/sigmavirus24/betamax_matchers"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/betamax-serializers/default.nix b/python/pkgs/betamax-serializers/default.nix index f02fb8272..b678e2f2e 100644 --- a/python/pkgs/betamax-serializers/default.nix +++ b/python/pkgs/betamax-serializers/default.nix @@ -7,13 +7,13 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "betamax-serializers"; version = "0.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NFxBmxtzFx8pUcYqw8cBd1rEt24T6GRk6/D/KpeOSUk="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/betamax/serializers"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/better-exceptions/default.nix b/python/pkgs/better-exceptions/default.nix index bd822eab6..49c516710 100644 --- a/python/pkgs/better-exceptions/default.nix +++ b/python/pkgs/better-exceptions/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "better-exceptions"; version = "0.3.3"; pyproject = true; src = fetchPypi { pname = "better_exceptions"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-5Oa8GERNXwTm6JSxA4Hl6SHT1UQkBBgWLH21fp6zRTs="; }; @@ -22,11 +22,10 @@ buildPythonPackage rec { # As noted by @WolfangAukang, some check files need to be disabled because of various errors, same with some tests. # After disabling and running the build, no tests are collected. - doCheck = false; meta = { description = "Pretty and more helpful exceptions in Python, automatically"; homepage = "https://github.com/qix-/better-exceptions"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/betterproto-rust-codec/default.nix b/python/pkgs/betterproto-rust-codec/default.nix index ea5348aa5..53b7ea880 100644 --- a/python/pkgs/betterproto-rust-codec/default.nix +++ b/python/pkgs/betterproto-rust-codec/default.nix @@ -9,7 +9,7 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "betterproto-rust-codec"; version = "0.1.1"; pyproject = true; @@ -17,12 +17,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "124C41p"; repo = "betterproto-rust-codec"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Q8oCk/VVe4Dcw6Z5PBFJBKRlsHgi6Jn+FWDqLH8BgYc="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-zYXE55o1/Tt6XJahV6WcGANPM/9xk6uYwQLazkIJj7A="; }; @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = { description = "Converter between betterproto messages and the Protobuf wire format"; - homepage = "https://github.com/124C41p/betterproto-rust-codec/releases/tag/${src.tag}"; + homepage = "https://github.com/124C41p/betterproto-rust-codec/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/beziers/default.nix b/python/pkgs/beziers/default.nix index eef9acdf9..07101ae46 100644 --- a/python/pkgs/beziers/default.nix +++ b/python/pkgs/beziers/default.nix @@ -7,7 +7,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "beziers"; version = "0.6.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simoncozens"; repo = "beziers.py"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NjmWsRz/NPPwXPbiSaOeKJMrYmSyNTt5ikONyAljgvM="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/simoncozens/beziers.py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bhopengraph/default.nix b/python/pkgs/bhopengraph/default.nix index 06b21dd91..ff058cedc 100644 --- a/python/pkgs/bhopengraph/default.nix +++ b/python/pkgs/bhopengraph/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "bhopengraph" ]; # Module has no tests - doCheck = false; meta = { description = "Library to create BloodHound OpenGraphs"; diff --git a/python/pkgs/bibtexparser/2.nix b/python/pkgs/bibtexparser/2.nix index 8e4ef4c31..8aac5cdf1 100644 --- a/python/pkgs/bibtexparser/2.nix +++ b/python/pkgs/bibtexparser/2.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bibtexparser"; version = "2.0.0b9"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sciunto-org"; repo = "python-bibtexparser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-viBY2hZXsXsfjpi7zMFh3CwQFOKL41F3x0IKULelo/o="; }; @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = { description = "Bibtex parser for Python"; homepage = "https://github.com/sciunto-org/python-bibtexparser"; - changelog = "https://github.com/sciunto-org/python-bibtexparser/blob/${src.tag}/CHANGELOG"; + changelog = "https://github.com/sciunto-org/python-bibtexparser/blob/${finalAttrs.src.tag}/CHANGELOG"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bibtexparser/default.nix b/python/pkgs/bibtexparser/default.nix index 4dfee64bb..ee56a6851 100644 --- a/python/pkgs/bibtexparser/default.nix +++ b/python/pkgs/bibtexparser/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "2.0.0b9"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "sciunto-org"; repo = "python-${finalAttrs.pname}"; diff --git a/python/pkgs/bidict/default.nix b/python/pkgs/bidict/default.nix index 16a48b73f..34d5256f7 100644 --- a/python/pkgs/bidict/default.nix +++ b/python/pkgs/bidict/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bidict"; version = "0.23.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AwaddjvDh7vSDn1JkU51/EEypBk3+jQFQX4aWi0AbXE="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "bidict" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://bidict.readthedocs.io"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/bids-validator/default.nix b/python/pkgs/bids-validator/default.nix index 5285d2a65..ee1e64a4e 100644 --- a/python/pkgs/bids-validator/default.nix +++ b/python/pkgs/bids-validator/default.nix @@ -11,14 +11,14 @@ bidsschematools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bids-validator"; version = "1.14.7.post0"; pyproject = true; src = fetchPypi { pname = "bids_validator"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-5gBaUAt1+KlhWT+2fUYIUQfa2xFvWaXDtSSqBpeUW2Y="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/bids-standard/bids-validator"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/billiard/default.nix b/python/pkgs/billiard/default.nix index 4e352d2fb..1e4210de0 100644 --- a/python/pkgs/billiard/default.nix +++ b/python/pkgs/billiard/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "billiard"; version = "4.2.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "celery"; repo = "billiard"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7DwS3fdYhMNVYR0RIoMFyxNpj56VrGlbF4mIgLKPrOQ="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/celery/billiard"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/binance-connector/default.nix b/python/pkgs/binance-connector/default.nix index 3cfb8eccb..a7d6dc6c1 100644 --- a/python/pkgs/binance-connector/default.nix +++ b/python/pkgs/binance-connector/default.nix @@ -8,15 +8,15 @@ websocket-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "binance-connector"; version = "3.12.0"; pyproject = true; src = fetchFromGitHub { owner = "binance"; - repo = "${pname}-python"; - tag = "v${version}"; + repo = "${finalAttrs.pname}-python"; + tag = "v${finalAttrs.version}"; hash = "sha256-8O73+fli0HNbvGBcyg79ZGOTQvL0TF5SCfogI6btlrA="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/binance/binance-connector-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/binary/default.nix b/python/pkgs/binary/default.nix index af0d05aea..4aeb201da 100644 --- a/python/pkgs/binary/default.nix +++ b/python/pkgs/binary/default.nix @@ -6,7 +6,7 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "binary"; version = "1.0.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ofek"; repo = "binary"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dU+E6MxAmH8AEGTW2/lZmtgRTinKCv9gDiVeb4n78U4="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/binary2strings/default.nix b/python/pkgs/binary2strings/default.nix index 882b1384d..bd81d5a14 100644 --- a/python/pkgs/binary2strings/default.nix +++ b/python/pkgs/binary2strings/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "binary2strings"; version = "0.1.13"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "glmcdona"; repo = "binary2strings"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3UPT0PdnPAhOu3J2vU5NxE3f4Nb1zwuX3hJiy87nLD0="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/glmcdona/binary2strings"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/binaryornot/default.nix b/python/pkgs/binaryornot/default.nix index 48c58be25..8f937d026 100644 --- a/python/pkgs/binaryornot/default.nix +++ b/python/pkgs/binaryornot/default.nix @@ -10,13 +10,13 @@ chardet, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "binaryornot"; version = "0.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zI1Xz6cddP+MKKdyZzTVOoUdAvrZ46VYH7gH+Yn3AvA="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/audreyr/binaryornot"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/bincopy/default.nix b/python/pkgs/bincopy/default.nix index 18e05fd70..71fc7617d 100644 --- a/python/pkgs/bincopy/default.nix +++ b/python/pkgs/bincopy/default.nix @@ -8,13 +8,13 @@ pyelftools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bincopy"; version = "20.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6UpJi5pKvnZwPDdyqtRm8VY7T8mAnaeWXxG8dwlAk7k="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/eerimoq/bincopy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/binho-host-adapter/default.nix b/python/pkgs/binho-host-adapter/default.nix index 454007a4f..d5f6c4226 100644 --- a/python/pkgs/binho-host-adapter/default.nix +++ b/python/pkgs/binho-host-adapter/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.6"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-Hm2nqE4gjBO19IkGbwV3S/8dWT0PW/HKFJwrjoPq6FY="; @@ -23,7 +21,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ pyserial ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "binhoHostAdapter" ]; meta = { diff --git a/python/pkgs/binwalk3/default.nix b/python/pkgs/binwalk3/default.nix index f28d20946..e86b2b5ae 100644 --- a/python/pkgs/binwalk3/default.nix +++ b/python/pkgs/binwalk3/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "binwalk" ]; # Tests are not available on PyPI - doCheck = false; meta = { description = "Binwalk v3 with v2-compatible Python API"; diff --git a/python/pkgs/biocutils/default.nix b/python/pkgs/biocutils/default.nix index 9bffbcd07..2adc83336 100644 --- a/python/pkgs/biocutils/default.nix +++ b/python/pkgs/biocutils/default.nix @@ -11,7 +11,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "biocutils"; version = "0.4.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "BiocPy"; repo = "BiocUtils"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CKIAJsWw9zCjhIpZpgFgakvszjO+1lZS8535LMfEH2Y="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/BiocPy/BiocUtils"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/biopython/default.nix b/python/pkgs/biopython/default.nix index 1db5ae00f..1c034e15b 100644 --- a/python/pkgs/biopython/default.nix +++ b/python/pkgs/biopython/default.nix @@ -7,13 +7,13 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "biopython"; version = "1.88"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-mqoxwL2k0Fn3su4Av9tcu3Ot4wV6pLc3p8wBhwkdBxo="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://biopython.org/wiki/Documentation"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/bip32/default.nix b/python/pkgs/bip32/default.nix index 4f87073d6..20e324fbb 100644 --- a/python/pkgs/bip32/default.nix +++ b/python/pkgs/bip32/default.nix @@ -8,7 +8,7 @@ coincurve, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bip32"; version = "5.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "darosior"; repo = "python-bip32"; - rev = version; + tag = finalAttrs.version; hash = "sha256-QO1gS9bx/eQPaLuB1ZNZuXj4DmeO4/La2hG9NCXjd+4="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ base58 coincurve ]; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/darosior/python-bip32"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/biplist/default.nix b/python/pkgs/biplist/default.nix index 9fd1b980c..9d1a572e1 100644 --- a/python/pkgs/biplist/default.nix +++ b/python/pkgs/biplist/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "biplist"; version = "1.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-TAVJdkxf5QsoBC7CGqLhT+GiIk4jmh2ud9nn85MqpMY="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://bitbucket.org/wooster/biplist/src/master/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/bitarray/default.nix b/python/pkgs/bitarray/default.nix index 81608f323..5628ee461 100644 --- a/python/pkgs/bitarray/default.nix +++ b/python/pkgs/bitarray/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bitarray"; version = "3.11.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vxlDfsAOw9QK74Lq7twUz0AAvptjXE9QSXllBuZjDdg="; }; @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Efficient arrays of booleans"; homepage = "https://github.com/ilanschnell/bitarray"; - changelog = "https://github.com/ilanschnell/bitarray/raw/${version}/CHANGE_LOG"; + changelog = "https://github.com/ilanschnell/bitarray/raw/${finalAttrs.version}/CHANGE_LOG"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/bitcoin-utils-fork-minimal/default.nix b/python/pkgs/bitcoin-utils-fork-minimal/default.nix index 5ef18b3a9..2ebd45593 100644 --- a/python/pkgs/bitcoin-utils-fork-minimal/default.nix +++ b/python/pkgs/bitcoin-utils-fork-minimal/default.nix @@ -4,20 +4,26 @@ buildPythonPackage, ecdsa, fetchPypi, + # build-system + setuptools, sympy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bitcoin-utils-fork-minimal"; version = "0.4.11.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-DzibvC8qr/5ync59cfFB7tBmZWkPs/hKh+e5OC4lcEw="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = true; + + build-system = [ setuptools ]; + + dependencies = [ base58 ecdsa sympy @@ -31,7 +37,6 @@ buildPythonPackage rec { ''; # Project doesn't ship tests - doCheck = false; pythonImportsCheck = [ "bitcoinutils" ]; @@ -40,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/doersf/python-bitcoin-utils"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bite-parser/default.nix b/python/pkgs/bite-parser/default.nix index 68a1e3732..2fa1ecc56 100644 --- a/python/pkgs/bite-parser/default.nix +++ b/python/pkgs/bite-parser/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bite-parser"; version = "0.2.5"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jgosmann"; repo = "bite-parser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-C508csRbjCeLgkp66TwDuxUtMITTmub5/TFv8x80HLA="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/jgosmann/bite-parser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bitmath/default.nix b/python/pkgs/bitmath/default.nix index 534c31311..3cd81c22e 100644 --- a/python/pkgs/bitmath/default.nix +++ b/python/pkgs/bitmath/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bitmath"; version = "2.1.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timlnx"; repo = "bitmath"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9hiwIpDIAU+N+LhlJ9qlKBZQibbrwwhGM77fvEnABRI="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Module for representing and manipulating file sizes with different prefix"; homepage = "https://github.com/timlnx/bitmath"; - changelog = "https://github.com/timlnx/bitmath/releases/tag/v${version}"; + changelog = "https://github.com/timlnx/bitmath/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bitstring/default.nix b/python/pkgs/bitstring/default.nix index 9554cde61..fbfe3d076 100644 --- a/python/pkgs/bitstring/default.nix +++ b/python/pkgs/bitstring/default.nix @@ -7,13 +7,13 @@ bitarray, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bitstring"; version = "4.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-o5HbiCisRIXdXOcsgLJ+usPnuYljE1mVnjEM2XKXI7I="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/scott-griffiths/bitstring"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bitstruct/default.nix b/python/pkgs/bitstruct/default.nix index 871d72120..d9d5b277c 100644 --- a/python/pkgs/bitstruct/default.nix +++ b/python/pkgs/bitstruct/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bitstruct"; version = "8.22.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "eerimoq"; repo = "bitstruct"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Egiac+1x3HaaGV6ThjChfjKbT0WvQDb1EMuyOxLY7Kg="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/eerimoq/bitstruct"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bittensor-drand/default.nix b/python/pkgs/bittensor-drand/default.nix index 0c764d9fd..e7e66d589 100644 --- a/python/pkgs/bittensor-drand/default.nix +++ b/python/pkgs/bittensor-drand/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "2.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "latent-to"; repo = "bittensor-drand"; diff --git a/python/pkgs/bitvavo-aio/default.nix b/python/pkgs/bitvavo-aio/default.nix index cd8c1629d..4ed77de88 100644 --- a/python/pkgs/bitvavo-aio/default.nix +++ b/python/pkgs/bitvavo-aio/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.3"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "cyberjunky"; repo = "bitvavo-aio"; @@ -25,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "bitvavo" ]; diff --git a/python/pkgs/bitvector-for-humans/default.nix b/python/pkgs/bitvector-for-humans/default.nix index ba4972b1e..639b838c8 100644 --- a/python/pkgs/bitvector-for-humans/default.nix +++ b/python/pkgs/bitvector-for-humans/default.nix @@ -6,7 +6,7 @@ poetry-core, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bitvector-for-humans"; version = "0.14.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JnyJny"; repo = "bitvector"; - rev = version; + tag = finalAttrs.version; hash = "sha256-GVTRD83tq/Hea53US4drOD5ruoYCLTVd24aZOSdDsSo="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { description = "This simple bit vector implementation aims to make addressing single bits a little less fiddly"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/bizkaibus/default.nix b/python/pkgs/bizkaibus/default.nix index fe6116e98..0537da61b 100644 --- a/python/pkgs/bizkaibus/default.nix +++ b/python/pkgs/bizkaibus/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bizkaibus"; version = "0.2.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "UgaitzEtxebarria"; repo = "BizkaibusRTPI"; - rev = version; + tag = finalAttrs.version; hash = "sha256-TM02pSSOELRGSwsKc5C+34W94K6mnS0C69aijsPqSWs="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "bizkaibus" ]; @@ -35,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/UgaitzEtxebarria/BizkaibusRTPI"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/black-macchiato/default.nix b/python/pkgs/black-macchiato/default.nix index cb9d09afc..2199ef2e2 100644 --- a/python/pkgs/black-macchiato/default.nix +++ b/python/pkgs/black-macchiato/default.nix @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "wbolster"; repo = "black-macchiato"; - rev = finalAttrs.version; + tag = finalAttrs.version; sha256 = "0lc9w50nlbmlzj44krk7kxcia202fhybbnwfh77xixlc7vb4rayl"; }; diff --git a/python/pkgs/blacken-docs/default.nix b/python/pkgs/blacken-docs/default.nix index 0c78b33e3..d4bf7661a 100644 --- a/python/pkgs/blacken-docs/default.nix +++ b/python/pkgs/blacken-docs/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "blacken-docs"; version = "1.20.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adamchainz"; repo = "blacken-docs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-A8hSpywuhdS+RNm3QQJ11ofWrYZgiOFRwIoD3mlwc4k="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "blacken-docs"; }; -} +}) diff --git a/python/pkgs/blackrenderer/default.nix b/python/pkgs/blackrenderer/default.nix index d7a7e8e55..bf7042b37 100644 --- a/python/pkgs/blackrenderer/default.nix +++ b/python/pkgs/blackrenderer/default.nix @@ -11,7 +11,7 @@ pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "blackrenderer"; version = "0.8.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "BlackFoundryCom"; repo = "black-renderer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6mC+JSg0u2hwi7SDFHBoUYCu8sYisWSCOuaTtc0FXi4="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "blackrenderer"; }; -} +}) diff --git a/python/pkgs/blake3/default.nix b/python/pkgs/blake3/default.nix index e12c7ca6c..869806bf6 100644 --- a/python/pkgs/blake3/default.nix +++ b/python/pkgs/blake3/default.nix @@ -9,7 +9,7 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "blake3"; version = "1.0.8"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oconnor663"; repo = "blake3-py"; - tag = version; + tag = finalAttrs.version; hash = "sha256-gwPGSah9qzApDwsBNABRLPZGrpaO3WArHoK6Jj6WJzo="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { asl20 ]; }; -} +}) diff --git a/python/pkgs/blastdns/default.nix b/python/pkgs/blastdns/default.nix index b43dd9488..bfd54cee6 100644 --- a/python/pkgs/blastdns/default.nix +++ b/python/pkgs/blastdns/default.nix @@ -17,8 +17,6 @@ buildPythonPackage (finalAttrs: { version = "1.9.1-unstable-2026-04-15"; pyproject = true; - __structuredAttrs = true; - __darwinAllowLocalNetworking = true; src = fetchFromGitHub { diff --git a/python/pkgs/bleach-allowlist/default.nix b/python/pkgs/bleach-allowlist/default.nix index 532f582cd..abdc9c4a9 100644 --- a/python/pkgs/bleach-allowlist/default.nix +++ b/python/pkgs/bleach-allowlist/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.3"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-VuIghgeaDmoxAK6Z5NuvIOslhUhlmOsOmUAIoRQo2ps="; @@ -23,7 +21,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ bleach ]; # No tests - doCheck = false; pythonImportsCheck = [ "bleach_allowlist" ]; diff --git a/python/pkgs/blessed/default.nix b/python/pkgs/blessed/default.nix index e97371750..f7e04bbec 100644 --- a/python/pkgs/blessed/default.nix +++ b/python/pkgs/blessed/default.nix @@ -7,13 +7,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "blessed"; version = "1.20.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LN1n+HRuBI8A30eiiA9NasvNs5kDG2BONLqPcdV4doA="; }; @@ -26,11 +26,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "blessed" ]; - doCheck = false; - meta = { homepage = "https://github.com/jquast/blessed"; description = "Thin, practical wrapper around terminal capabilities in Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/blinker/default.nix b/python/pkgs/blinker/default.nix index 64c0bebab..7a0d59157 100644 --- a/python/pkgs/blinker/default.nix +++ b/python/pkgs/blinker/default.nix @@ -7,13 +7,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "blinker"; version = "1.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tM4iZaer7ORefMiW6Y2+vmzq1WvPgFo9IxNtFF9URb8="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/pallets-eco/blinker/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/blinkstick/default.nix b/python/pkgs/blinkstick/default.nix index 0c02dbf38..84fa090ac 100644 --- a/python/pkgs/blinkstick/default.nix +++ b/python/pkgs/blinkstick/default.nix @@ -11,8 +11,6 @@ buildPythonPackage { version = "1.2.0-unstable-2023-05-04"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "arvydas"; repo = "blinkstick-python"; @@ -25,7 +23,6 @@ buildPythonPackage { dependencies = [ pyusb ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "blinkstick" ]; meta = { diff --git a/python/pkgs/blis/default.nix b/python/pkgs/blis/default.nix index 036a130b4..12a501536 100644 --- a/python/pkgs/blis/default.nix +++ b/python/pkgs/blis/default.nix @@ -18,7 +18,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "blis"; version = "1.3.3"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "explosion"; repo = "cython-blis"; - tag = "release-v${version}"; + tag = "release-v${finalAttrs.version}"; hash = "sha256-CCy5vYjj4pCOfpKSEjdHsA6XTW7Wl3UVN8FHUsAhmVk="; }; @@ -85,4 +85,4 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/cython-blis"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/blobfile/default.nix b/python/pkgs/blobfile/default.nix index e4fd7106c..5cf6fb708 100644 --- a/python/pkgs/blobfile/default.nix +++ b/python/pkgs/blobfile/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "3.3.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "christopher-hesse"; repo = "blobfile"; @@ -33,7 +31,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests require a running Docker instance - doCheck = false; pythonImportsCheck = [ "blobfile" ]; diff --git a/python/pkgs/block-io/default.nix b/python/pkgs/block-io/default.nix index 328a39084..53a8c3887 100644 --- a/python/pkgs/block-io/default.nix +++ b/python/pkgs/block-io/default.nix @@ -7,15 +7,16 @@ pycryptodome, requests, setuptools, + setuptools_80, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "block-io"; version = "2.0.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-M7czfpagXqoWWSu4enB3Z2hc2GtAaskI6cnJzJdpC8I="; }; @@ -28,12 +29,11 @@ buildPythonPackage rec { bitcoin-utils-fork-minimal pycryptodome requests - setuptools + setuptools_80 ]; # Tests needs a BlockIO API key to run properly # https://github.com/BlockIo/block_io-python/blob/79006bc8974544b70a2d8e9f19c759941d32648e/test.py#L18 - doCheck = false; pythonImportsCheck = [ "block_io" ]; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/BlockIo/block_io-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/blockbuster/default.nix b/python/pkgs/blockbuster/default.nix index debc4e6ba..837265e7b 100644 --- a/python/pkgs/blockbuster/default.nix +++ b/python/pkgs/blockbuster/default.nix @@ -8,7 +8,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "blockbuster"; version = "1.5.27"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cbornet"; repo = "blockbuster"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-r9UcyjBIZjnCxL/8RdMiGb5XiH0s8JnQ8fY9SIC4Hsw="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/cbornet/blockbuster"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/blockdiag/default.nix b/python/pkgs/blockdiag/default.nix index 0c8afd202..f83b4f99a 100644 --- a/python/pkgs/blockdiag/default.nix +++ b/python/pkgs/blockdiag/default.nix @@ -14,7 +14,7 @@ webcolors, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "blockdiag"; version = "3.0.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "blockdiag"; repo = "blockdiag"; - tag = version; + tag = finalAttrs.version; hash = "sha256-j8FoNUIJJOaahaol1MRPyY2jcPCEIlaAD4bmM2QKFFI="; }; @@ -84,4 +84,4 @@ buildPythonPackage rec { mainProgram = "blockdiag"; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/blockfrost-python/default.nix b/python/pkgs/blockfrost-python/default.nix index 0d9165b99..eaf5d902b 100644 --- a/python/pkgs/blockfrost-python/default.nix +++ b/python/pkgs/blockfrost-python/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "blockfrost-python"; version = "0.7.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "blockfrost"; repo = "blockfrost-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2NuWUK1DthGnMTbZQIaDvF9VF2dVLgYrCUKJIxuq1V0="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/blockfrost/blockfrost-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/blosc2/default.nix b/python/pkgs/blosc2/default.nix index 975dd24a4..3cb175ac3 100644 --- a/python/pkgs/blosc2/default.nix +++ b/python/pkgs/blosc2/default.nix @@ -30,7 +30,7 @@ let miniexprRev = "37bf6982bf9619036b47f095b7005bc3c87a7447"; tinyccRev = "41208bdc85612042f363f425cda4601b3ed90d64"; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "blosc2"; version = "4.1.2"; pyproject = true; @@ -39,7 +39,7 @@ buildPythonPackage rec { (fetchFromGitHub { owner = "Blosc"; repo = "python-blosc2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-z5g3OXSKKR/2yQ5n1hb+br009xaX8C7HxbDDLVfSYNw="; }) (fetchFromGitHub { @@ -64,7 +64,7 @@ buildPythonPackage rec { hash = "sha256-lj0BC/A+Kv/VloLhFe3hmrdZ6QWv6mSrMn8HdHS9PfI="; }) ]; - sourceRoot = "source"; + sourceRoot = "python-blosc2-${finalAttrs.version}-github-source"; nativeBuildInputs = [ cmake @@ -87,8 +87,8 @@ buildPythonPackage rec { ''; postUnpack = '' # ensure our separately pinned versions correspond to those in source - if ! grep -F '${miniexprRev}' source/CMakeLists.txt ; then - echo 'Expected to find ${miniexprRev} in source/CMakeLists.txt:' \ + if ! grep -F '${miniexprRev}' python-blosc2-${finalAttrs.version}-github-source/CMakeLists.txt ; then + echo 'Expected to find ${miniexprRev} in python-blosc2-${finalAttrs.version}-github-source/CMakeLists.txt:' \ 'has miniexpr source been updated to match pinned version?' exit 1 fi @@ -130,4 +130,4 @@ buildPythonPackage rec { homepage = "https://github.com/Blosc/python-blosc2"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/bluepy/default.nix b/python/pkgs/bluepy/default.nix index 78d5095a2..92f48fc83 100644 --- a/python/pkgs/bluepy/default.nix +++ b/python/pkgs/bluepy/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "1.3.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-KnHtr+EDVl+5kCVv82JMFlMDaoN9/JDh4yuDn4OXHOw="; diff --git a/python/pkgs/blurhash-python/default.nix b/python/pkgs/blurhash-python/default.nix index cb3cee375..c843228dd 100644 --- a/python/pkgs/blurhash-python/default.nix +++ b/python/pkgs/blurhash-python/default.nix @@ -9,7 +9,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "blurhash-python"; version = "1.2.2"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "woltapp"; repo = "blurhash-python"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Cz+PkPp1knvT3U5ofyb1PstM9kzBOkgPbx03LgOLXgw="; }; @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ cffi pillow six @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/woltapp/blurhash-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/blurhash/default.nix b/python/pkgs/blurhash/default.nix index 62d14ac22..0cec3366c 100644 --- a/python/pkgs/blurhash/default.nix +++ b/python/pkgs/blurhash/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "blurhash"; version = "1.1.5"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "halcy"; repo = "blurhash-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lTPn2GTD7eQ9XkZyuttFqEvNgzcx6b7OdeMc5WOXrJs="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/halcy/blurhash-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bnnumerizer/default.nix b/python/pkgs/bnnumerizer/default.nix index 656ba3b3e..6ece17097 100644 --- a/python/pkgs/bnnumerizer/default.nix +++ b/python/pkgs/bnnumerizer/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.2"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-Qd9v0Le1GqTsR3a2ZDzt6+5f0R4zXX1W1KIMCFFeXw0="; @@ -22,7 +20,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "bnnumerizer" ]; # https://github.com/mnansary/bnUnicodeNormalizer/issues/10 - doCheck = false; meta = { description = "Bangla Number text to String Converter"; diff --git a/python/pkgs/bnunicodenormalizer/default.nix b/python/pkgs/bnunicodenormalizer/default.nix index 4c0f4ce33..f5b0a3ac4 100644 --- a/python/pkgs/bnunicodenormalizer/default.nix +++ b/python/pkgs/bnunicodenormalizer/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bnunicodenormalizer"; version = "0.1.7"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hqNInMgcc9KvtOJlvS0Ni8UvyKI3TiEMiZ4CYJQLwJE="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "bnunicodenormalizer" ]; @@ -24,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/mnansary/bnUnicodeNormalizer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/boa-api/default.nix b/python/pkgs/boa-api/default.nix index d0eefa2af..976685f0f 100644 --- a/python/pkgs/boa-api/default.nix +++ b/python/pkgs/boa-api/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.14"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "boalang"; repo = "api-python"; @@ -22,7 +20,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # upstream has no tests - doCheck = false; pythonImportsCheck = [ "boaapi" ]; diff --git a/python/pkgs/boilerpy3/default.nix b/python/pkgs/boilerpy3/default.nix index 06a1e71d1..3f1cd7388 100644 --- a/python/pkgs/boilerpy3/default.nix +++ b/python/pkgs/boilerpy3/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: let @@ -10,7 +12,7 @@ let in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jmriebold"; @@ -19,6 +21,8 @@ buildPythonPackage { hash = "sha256-dhAB0VbBGsSrgYGUlZEYaKA6sQB/f9Bb3alsRuQ8opo="; }; + build-system = [ setuptools ]; + postPatch = '' # the version mangling in mautrix_signal/get_version.py interacts badly with pythonRelaxDepsHook substituteInPlace setup.py \ diff --git a/python/pkgs/bokeh-sampledata/default.nix b/python/pkgs/bokeh-sampledata/default.nix index 47249a2a2..0ccbaf0cd 100644 --- a/python/pkgs/bokeh-sampledata/default.nix +++ b/python/pkgs/bokeh-sampledata/default.nix @@ -11,7 +11,7 @@ pandas, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bokeh-sampledata"; version = "2025.0"; pyproject = true; @@ -19,14 +19,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bokeh"; repo = "bokeh_sampledata"; - tag = version; + tag = finalAttrs.version; hash = "sha256-gAiiNm9t+4z0aFO6pr8FfYGF04pO7u6Wjsbou+I2blk="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail ', "setuptools-git-versioning"' "" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/bokeh-sampledata"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/bokeh/default.nix b/python/pkgs/bokeh/default.nix index 548ecdd0f..3c172a407 100644 --- a/python/pkgs/bokeh/default.nix +++ b/python/pkgs/bokeh/default.nix @@ -19,14 +19,14 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bokeh"; # update together with panel which is not straightforward version = "3.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-c/CwwG15JcorbVKy3FHCUzoR9mfMaUTx8GwDnMxXxc4="; }; @@ -40,7 +40,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace-fail ', "setuptools-git-versioning"' "" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ @@ -61,8 +61,6 @@ buildPythonPackage rec { narwhals ]; - doCheck = false; # need more work - pythonImportsCheck = [ "bokeh" ]; meta = { @@ -71,4 +69,4 @@ buildPythonPackage rec { homepage = "https://github.com/bokeh/bokeh"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/boltons/default.nix b/python/pkgs/boltons/default.nix index 04d445c2a..9bf0abce4 100644 --- a/python/pkgs/boltons/default.nix +++ b/python/pkgs/boltons/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "boltons"; version = "26.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-V2RGirpJOxWZXtF/RqFniQI/Ejyipi1JGpzoJcHL4mw="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Constructs, recipes, and snippets extending the Python standard library"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/bond-api/default.nix b/python/pkgs/bond-api/default.nix index c470428d2..fe902e7e9 100644 --- a/python/pkgs/bond-api/default.nix +++ b/python/pkgs/bond-api/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.18"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "prystupa"; repo = "bond-api"; diff --git a/python/pkgs/bond-async/default.nix b/python/pkgs/bond-async/default.nix index 74c669521..01ed9839d 100644 --- a/python/pkgs/bond-async/default.nix +++ b/python/pkgs/bond-async/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "bondhome"; repo = "bond-async"; diff --git a/python/pkgs/bonsai/default.nix b/python/pkgs/bonsai/default.nix index 505dc79d4..22b3c3405 100644 --- a/python/pkgs/bonsai/default.nix +++ b/python/pkgs/bonsai/default.nix @@ -10,7 +10,7 @@ trio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bonsai"; version = "1.5.5"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "noirello"; repo = "bonsai"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-q0BE1TuxiS01Z83dqDH54XzRgdF3ZszRBJsMIfsvTeU="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/noirello/bonsai"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/boolean-py/default.nix b/python/pkgs/boolean-py/default.nix index 529bbf727..c322241c4 100644 --- a/python/pkgs/boolean-py/default.nix +++ b/python/pkgs/boolean-py/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "boolean-py"; version = "5.0"; pyproject = true; src = fetchPypi { pname = "boolean_py"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-YMvEutB5dTch0yZJVFUFNix1ThIVcK2kZYuFKjoxjZU="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/bastikr/boolean.py"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/booleanoperations/default.nix b/python/pkgs/booleanoperations/default.nix index e5caaea46..5fab8e411 100644 --- a/python/pkgs/booleanoperations/default.nix +++ b/python/pkgs/booleanoperations/default.nix @@ -8,13 +8,13 @@ pyclipper, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "booleanoperations"; version = "0.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bXGfVg0qHdZ2yBK4ROzOtpPJZ5HHZXkImrfQ9dtc7b4="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/typemytype/booleanOperations"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/boost-histogram/default.nix b/python/pkgs/boost-histogram/default.nix index 03d530b33..248710557 100644 --- a/python/pkgs/boost-histogram/default.nix +++ b/python/pkgs/boost-histogram/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { pname = "boost-histogram"; version = "1.8.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "scikit-hep"; diff --git a/python/pkgs/bosch-alarm-mode2/default.nix b/python/pkgs/bosch-alarm-mode2/default.nix index 80d59388b..92bfeba7c 100644 --- a/python/pkgs/bosch-alarm-mode2/default.nix +++ b/python/pkgs/bosch-alarm-mode2/default.nix @@ -6,7 +6,7 @@ lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bosch-alarm-mode2"; version = "0.4.10"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mag1024"; repo = "bosch-alarm-mode2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XpLMPFi3e6iTtKGfVXN4VbnPyNLVjSFrodyFK+zelF4="; }; @@ -26,11 +26,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "bosch_alarm_mode2" ]; # upstream has no tests - doCheck = false; meta = { description = "Async Python library for interacting with Bosch Alarm Panels supporting the 'Mode 2' API"; homepage = "https://github.com/mag1024/bosch-alarm-mode2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bot-safe-agents/default.nix b/python/pkgs/bot-safe-agents/default.nix index 428717fb6..505479ad4 100644 --- a/python/pkgs/bot-safe-agents/default.nix +++ b/python/pkgs/bot-safe-agents/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bot-safe-agents"; version = "1.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ivan-sincek"; repo = "bot-safe-agents"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-b4X3z8jX8kF3G1CEYxWl2jhWid3fRl7WfIMRfvAWlko="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/ivan-sincek/bot-safe-agents"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/botocore/default.nix b/python/pkgs/botocore/default.nix index 79a13d3a7..d14518aef 100644 --- a/python/pkgs/botocore/default.nix +++ b/python/pkgs/botocore/default.nix @@ -8,7 +8,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "botocore"; version = "1.42.31"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - tag = version; + tag = finalAttrs.version; hash = "sha256-avuv1uXKMeSr3SL+BI9XW8tDCQM/dlXFn590di3S03k="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/boto/botocore"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/bottle/default.nix b/python/pkgs/bottle/default.nix index f0dad1118..0eb27f55d 100644 --- a/python/pkgs/bottle/default.nix +++ b/python/pkgs/bottle/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bottle"; version = "0.13.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eH54Mn4SsieTjeAiSDM9eIz+RZh+3Kc1+PiOA0csP0c="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { mainProgram = "bottle.py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bottleneck/default.nix b/python/pkgs/bottleneck/default.nix index 7fc98d2e3..5777169d7 100644 --- a/python/pkgs/bottleneck/default.nix +++ b/python/pkgs/bottleneck/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "1.6.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-Ao1G7ksCWtmrTXmSQROBb4JfYrF7h8nh0NjOFEpKDjE="; diff --git a/python/pkgs/bottombar/default.nix b/python/pkgs/bottombar/default.nix index 0a4816771..7994b3b75 100644 --- a/python/pkgs/bottombar/default.nix +++ b/python/pkgs/bottombar/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bottombar"; version = "2.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "evalf"; repo = "bottombar"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-W+Cbcgb664nVT/nsFdDruT688JWG2NZnF5hDDezTgnw="; }; @@ -21,7 +21,6 @@ buildPythonPackage rec { # The package only has some "interactive" tests where a user must check for # the correct output and hit enter after every check - doCheck = false; pythonImportsCheck = [ "bottombar" ]; meta = { @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/evalf/bottombar"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bpemb/default.nix b/python/pkgs/bpemb/default.nix index d540160d4..9a946ed51 100644 --- a/python/pkgs/bpemb/default.nix +++ b/python/pkgs/bpemb/default.nix @@ -35,7 +35,6 @@ buildPythonPackage { ]; # need network connection for tests - doCheck = false; pythonImportsCheck = [ "bpemb" ]; diff --git a/python/pkgs/bpython/default.nix b/python/pkgs/bpython/default.nix index fecd8c919..90b69b657 100644 --- a/python/pkgs/bpython/default.nix +++ b/python/pkgs/bpython/default.nix @@ -18,7 +18,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bpython"; version = "0.26"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bpython"; repo = "bpython"; - tag = "${version}-release"; + tag = "${finalAttrs.version}-release"; hash = "sha256-NmWM0fdzS9n5FSnNJOCdS1JE5ZHrmJXqCuHa54rT8GU="; }; @@ -40,7 +40,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace-fail 'version = "unknown"' 'version = "${version}"' + --replace-fail 'version = "unknown"' 'version = "${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -69,7 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; pythonImportsCheck = [ "bpython" ]; @@ -82,4 +82,4 @@ buildPythonPackage rec { homepage = "https://bpython-interpreter.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bqplot/default.nix b/python/pkgs/bqplot/default.nix index 3e7914373..baadb9873 100644 --- a/python/pkgs/bqplot/default.nix +++ b/python/pkgs/bqplot/default.nix @@ -12,13 +12,13 @@ traittypes, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bqplot"; version = "0.12.46"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lBdL4+skHJ+h1pelQxMomgvT/ogK3ZbGZA0xY73T0io="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://bqplot.github.io/bqplot"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/braceexpand/default.nix b/python/pkgs/braceexpand/default.nix index 76e2d1896..0460acb38 100644 --- a/python/pkgs/braceexpand/default.nix +++ b/python/pkgs/braceexpand/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "braceexpand"; version = "0.1.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5uU5vSDq6lNUdHL/lPT7XD07+dCok4jEtWZjq6dl9wU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/trendels/braceexpand"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bracex/default.nix b/python/pkgs/bracex/default.nix index 168851d48..2bd25ceca 100644 --- a/python/pkgs/bracex/default.nix +++ b/python/pkgs/bracex/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bracex"; version = "3.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-TjjjI5LkpHgP4V1kS/x8hRQFfPw4YeBgsRgUzoKcJeQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Bash style brace expansion for Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/braintree/default.nix b/python/pkgs/braintree/default.nix index d49f16364..d21602544 100644 --- a/python/pkgs/braintree/default.nix +++ b/python/pkgs/braintree/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "4.45.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "braintree"; repo = "braintree_python"; diff --git a/python/pkgs/branca/default.nix b/python/pkgs/branca/default.nix index 5ed82f8c6..03b45f2fb 100644 --- a/python/pkgs/branca/default.nix +++ b/python/pkgs/branca/default.nix @@ -7,7 +7,7 @@ selenium, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "branca"; version = "0.8.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-visualization"; repo = "branca"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-H5hHQI4r0QavygQZzEZAEp+cjra5R9m/OoGHQPtnBg0="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-visualization/branca"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bravado-core/default.nix b/python/pkgs/bravado-core/default.nix index 9eee2d836..16df63267 100644 --- a/python/pkgs/bravado-core/default.nix +++ b/python/pkgs/bravado-core/default.nix @@ -19,7 +19,7 @@ mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bravado-core"; version = "6.4.1"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Yelp"; repo = "bravado-core"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-P6R1Pmhddyy1iwQuem8YVDFFrQ4qxHzASZQbqpMZXeI="; }; @@ -66,4 +66,4 @@ buildPythonPackage rec { homepage = "https://github.com/Yelp/bravado-core"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/bravia-tv/default.nix b/python/pkgs/bravia-tv/default.nix index c686186a5..c8785f033 100644 --- a/python/pkgs/bravia-tv/default.nix +++ b/python/pkgs/bravia-tv/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.11"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "dcnielsen90"; repo = "python-bravia-tv"; @@ -25,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ requests ]; # Package does not include tests - doCheck = false; pythonImportsCheck = [ "bravia_tv" ]; diff --git a/python/pkgs/brelpy/default.nix b/python/pkgs/brelpy/default.nix index d00d8db6b..070af0531 100644 --- a/python/pkgs/brelpy/default.nix +++ b/python/pkgs/brelpy/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.3"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-MYWSKYd7emHZfY+W/UweQtTg62GSUMybpecL9BR8dhg="; @@ -23,7 +21,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ pycryptodome ]; # Source not tagged and PyPI releases don't contain tests - doCheck = false; pythonImportsCheck = [ "brelpy" ]; diff --git a/python/pkgs/brevo-python/default.nix b/python/pkgs/brevo-python/default.nix index 7eb1f8bb9..37ca87260 100644 --- a/python/pkgs/brevo-python/default.nix +++ b/python/pkgs/brevo-python/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "brevo-python"; version = "1.2.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "getbrevo"; repo = "brevo-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VYj1r69pgKgNCXzxRqvwlj5w+y3IIu21bsZJAe/7zf8="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/getbrevo/brevo-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/brian2/default.nix b/python/pkgs/brian2/default.nix index 80deb92d8..70cb0229a 100644 --- a/python/pkgs/brian2/default.nix +++ b/python/pkgs/brian2/default.nix @@ -16,7 +16,7 @@ scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "brian2"; version = "2.10.1"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.12"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-wdIdewkhkjYkGddvyHH+q5/wuz0A6SZdjNQIbMLhG08="; }; @@ -41,6 +41,8 @@ buildPythonPackage rec { --replace-fail "distutils" "setuptools._distutils" ''; + pythonRelaxDeps = [ "cython" ]; + build-system = [ setuptools-scm ]; @@ -73,4 +75,4 @@ buildPythonPackage rec { homepage = "https://briansimulator.org/"; license = lib.licenses.cecill21; }; -} +}) diff --git a/python/pkgs/broadbean/default.nix b/python/pkgs/broadbean/default.nix index 9a40fa103..cb9289cc6 100644 --- a/python/pkgs/broadbean/default.nix +++ b/python/pkgs/broadbean/default.nix @@ -12,13 +12,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "broadbean"; version = "0.14.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-v+Ov6mlSnaJG98ooA9AhPGJflrFafKQoO5wi+PxcZVw="; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ + dependencies = [ numpy matplotlib schema @@ -51,4 +51,4 @@ buildPythonPackage rec { description = "Library for making pulses that can be leveraged with QCoDeS"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/broadlink/default.nix b/python/pkgs/broadlink/default.nix index cf7bdc0b5..e34f4eda6 100644 --- a/python/pkgs/broadlink/default.nix +++ b/python/pkgs/broadlink/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "broadlink"; version = "0.19.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ID5YpUjio68xChs6ZhTQBW995kqbmwsASRJKQ1a5M2U="; }; @@ -21,7 +21,6 @@ buildPythonPackage rec { dependencies = [ cryptography ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "broadlink" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/mjg59/python-broadlink"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/brotli/default.nix b/python/pkgs/brotli/default.nix index c6aec4c87..306ab60e1 100644 --- a/python/pkgs/brotli/default.nix +++ b/python/pkgs/brotli/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "brotli"; version = "1.2.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = "brotli"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kl8ZHt71v17QR2bDP+ad/5uixf+GStEPLQ5ooFoC5i8="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { description = "Generic-purpose lossless compression algorithm"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/brotlicffi/default.nix b/python/pkgs/brotlicffi/default.nix index 50230c17e..80cd3eb7c 100644 --- a/python/pkgs/brotlicffi/default.nix +++ b/python/pkgs/brotlicffi/default.nix @@ -9,7 +9,7 @@ pycparser, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "brotlicffi"; version = "1.2.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-hyper"; repo = "brotlicffi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3/68qBfsFtH+7h3gPxUdkyHwG6qLbh+bVLrxzsb3bc4="; }; @@ -36,7 +36,6 @@ buildPythonPackage rec { export USE_SHARED_BROTLI=1 ''; # Test data is only available from libbrotli git checkout, not brotli.src - doCheck = false; pythonImportsCheck = [ "brotlicffi" ]; meta = { @@ -44,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-hyper/brotlicffi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/brotlipy/default.nix b/python/pkgs/brotlipy/default.nix index 6040330b3..904479a07 100644 --- a/python/pkgs/brotlipy/default.nix +++ b/python/pkgs/brotlipy/default.nix @@ -10,13 +10,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "brotlipy"; version = "0.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Nt7wuFm+ryGRAVe0wz6zsG2M5FnJQhAvFpiMym6hZN8="; }; @@ -35,7 +35,6 @@ buildPythonPackage rec { ]; # Missing test files - doCheck = false; pythonImportsCheck = [ "brotli" ]; @@ -44,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-hyper/brotlipy/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/brottsplatskartan/default.nix b/python/pkgs/brottsplatskartan/default.nix index a23229835..7121e21ce 100644 --- a/python/pkgs/brottsplatskartan/default.nix +++ b/python/pkgs/brottsplatskartan/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.5"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "chrillux"; repo = "brottsplatskartan"; diff --git a/python/pkgs/browser-cookie3/default.nix b/python/pkgs/browser-cookie3/default.nix index d3f64458f..0b5b156cc 100644 --- a/python/pkgs/browser-cookie3/default.nix +++ b/python/pkgs/browser-cookie3/default.nix @@ -10,7 +10,7 @@ pyaes, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "browser-cookie3"; version = "0.20.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "borisbabic"; repo = "browser_cookie3"; - tag = version; + tag = finalAttrs.version; hash = "sha256-3EmFx+9LQFuS26mUPH/etc6hkUXqmNOOipbldhjorDE="; }; @@ -33,7 +33,6 @@ buildPythonPackage rec { ]; # No tests implemented - doCheck = false; pythonImportsCheck = [ "browser_cookie3" ]; @@ -42,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/borisbabic/browser_cookie3"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/browserforge/default.nix b/python/pkgs/browserforge/default.nix index 4b7229fd2..04f0de431 100644 --- a/python/pkgs/browserforge/default.nix +++ b/python/pkgs/browserforge/default.nix @@ -35,7 +35,6 @@ buildPythonPackage (finalAttrs: { ]; # Module has no test - doCheck = false; pythonImportsCheck = [ "browserforge" ]; diff --git a/python/pkgs/brunt/default.nix b/python/pkgs/brunt/default.nix index 01d5fef0a..e926fdee3 100644 --- a/python/pkgs/brunt/default.nix +++ b/python/pkgs/brunt/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-5wRifce5wKUMZ66Q8dMgsU+Z8rL8m/HvBGGxQdzxvOk="; @@ -39,7 +37,6 @@ buildPythonPackage (finalAttrs: { ]; # tests require Brunt hardware - doCheck = false; pythonImportsCheck = [ "brunt" ]; diff --git a/python/pkgs/bsdiff4/default.nix b/python/pkgs/bsdiff4/default.nix index e58346632..be86d5ca2 100644 --- a/python/pkgs/bsdiff4/default.nix +++ b/python/pkgs/bsdiff4/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "1.2.6"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-KrV9AaeLOeKeWszJz+rUEwmC3tncy8QmG9DpxR1rdR0="; diff --git a/python/pkgs/bt-decode/default.nix b/python/pkgs/bt-decode/default.nix index 97c67198d..5ae46e6fc 100644 --- a/python/pkgs/bt-decode/default.nix +++ b/python/pkgs/bt-decode/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "0.8.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "latent-to"; repo = "bt-decode"; diff --git a/python/pkgs/btest/default.nix b/python/pkgs/btest/default.nix index 2106920a1..220986451 100644 --- a/python/pkgs/btest/default.nix +++ b/python/pkgs/btest/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "btest"; version = "1.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zeek"; repo = "btest"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hd/o79GFlmSS4u1IeEkK6l+apw8pinINxPkAZUe8U9U="; }; @@ -23,11 +23,10 @@ buildPythonPackage rec { dependencies = [ multiprocess ]; # No tests available and no module to import - doCheck = false; meta = { description = "Generic Driver for Powerful System Tests"; homepage = "https://github.com/zeek/btest"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/btrees/default.nix b/python/pkgs/btrees/default.nix index 974ba3940..77d4eeed7 100644 --- a/python/pkgs/btrees/default.nix +++ b/python/pkgs/btrees/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "btrees"; version = "6.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GHbK0OvKw/aNrc3KgBjqbLdrM0+Zkac6qFy7DLj9jPA="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "http://packages.python.org/BTrees"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/btrfs/default.nix b/python/pkgs/btrfs/default.nix index b08a0bca2..4a348d31b 100644 --- a/python/pkgs/btrfs/default.nix +++ b/python/pkgs/btrfs/default.nix @@ -18,7 +18,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # currently no tests - doCheck = false; pythonImportsCheck = [ "btrfs" ]; diff --git a/python/pkgs/btsocket/default.nix b/python/pkgs/btsocket/default.nix index 0e87c2ab4..2a4f64509 100644 --- a/python/pkgs/btsocket/default.nix +++ b/python/pkgs/btsocket/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "btsocket"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ukBaz"; repo = "python-btsocket"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/T89GZJth7pBGQuN1ytCf649oWv7aZcfPHjYoftbLw8="; }; + + build-system = [ setuptools ]; pythonImportsCheck = [ "btsocket" ]; meta = { @@ -22,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/ukBaz/python-btsocket"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bubop/default.nix b/python/pkgs/bubop/default.nix index 180b60f71..37e08bd5c 100644 --- a/python/pkgs/bubop/default.nix +++ b/python/pkgs/bubop/default.nix @@ -11,7 +11,7 @@ click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bubop"; version = "0.2.3"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bergercookie"; repo = "bubop"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NXA3UDOkCoj4dm3UO/X0w2Mpx4bw3yFO6oyOzsPgtrU="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/bergercookie/bubop"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bucketstore/default.nix b/python/pkgs/bucketstore/default.nix index 1f9425077..02a052b8e 100644 --- a/python/pkgs/bucketstore/default.nix +++ b/python/pkgs/bucketstore/default.nix @@ -8,7 +8,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bucketstore"; version = "0.3.0"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jpetrucciani"; repo = "bucketstore"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WjweYFnlDEoR+TYzNgjPMdCLdUUEbdPROubov6kancc="; }; build-system = [ poetry-core ]; - propagatedBuildInputs = [ boto3 ]; + dependencies = [ boto3 ]; nativeCheckInputs = [ moto @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/jpetrucciani/bucketstore"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bugsnag/default.nix b/python/pkgs/bugsnag/default.nix index 6e0edc0bd..971e17a64 100644 --- a/python/pkgs/bugsnag/default.nix +++ b/python/pkgs/bugsnag/default.nix @@ -10,7 +10,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bugsnag"; version = "4.9.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bugsnag"; repo = "bugsnag-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-32dq68MCvfQztCwwtGD2qRQfLSEnog+HEtq/Zei0JXI="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://github.com/bugsnag/bugsnag-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/build/default.nix b/python/pkgs/build/default.nix index a08741dd4..5f6698e5d 100644 --- a/python/pkgs/build/default.nix +++ b/python/pkgs/build/default.nix @@ -8,7 +8,7 @@ pyproject-hooks, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "build"; version = "1.5.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pypa"; repo = "build"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vm47wuSEKfU4CjonokylTyGe62jGS/5m2dhLKhY5TPc="; }; @@ -31,7 +31,6 @@ buildPythonPackage rec { # We need to disable tests because this package is part of the bootstrap chain # and its test dependencies cannot be built yet when this is being built. - doCheck = false; pythonImportsCheck = [ "build" ]; @@ -45,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/build"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/buildstream-plugins/default.nix b/python/pkgs/buildstream-plugins/default.nix index 6a2410e70..7bc682b60 100644 --- a/python/pkgs/buildstream-plugins/default.nix +++ b/python/pkgs/buildstream-plugins/default.nix @@ -7,7 +7,7 @@ cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "buildstream-plugins"; version = "2.7.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "apache"; repo = "buildstream-plugins"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vbHfceMdaedAg0fVt8pBF+S7yPYhfQlgEYvb48ym+4I="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { platforms = lib.platforms.linux; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/bumble/default.nix b/python/pkgs/bumble/default.nix index 030e01566..4e9ac27e2 100644 --- a/python/pkgs/bumble/default.nix +++ b/python/pkgs/bumble/default.nix @@ -24,7 +24,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bumble"; version = "0.0.234"; pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = "bumble"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7GtmFpnaCSAXMc58X6NMTVzZWblAghKEs8x3nEPykNc="; }; @@ -73,4 +73,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/bumble"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/bump2version/default.nix b/python/pkgs/bump2version/default.nix index 0509b23a6..97b7981c6 100644 --- a/python/pkgs/bump2version/default.nix +++ b/python/pkgs/bump2version/default.nix @@ -7,7 +7,7 @@ testfixtures, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bump2version"; version = "1.0.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "c4urself"; repo = "bump2version"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/c4urself/bump2version"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/bumps/default.nix b/python/pkgs/bumps/default.nix index b37af7be9..adbba76f4 100644 --- a/python/pkgs/bumps/default.nix +++ b/python/pkgs/bumps/default.nix @@ -18,13 +18,13 @@ versioningit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bumps"; version = "1.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-O5GUoyDlB0X2Z/O3JprN3omoOBDIhv0xrKfUSHTgGpM="; }; @@ -54,7 +54,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "bumps" ]; @@ -64,4 +63,4 @@ buildPythonPackage rec { homepage = "https://bumps.readthedocs.io/"; license = lib.licenses.publicDomain; }; -} +}) diff --git a/python/pkgs/bx-python/default.nix b/python/pkgs/bx-python/default.nix index bb44d9deb..45ccec97b 100644 --- a/python/pkgs/bx-python/default.nix +++ b/python/pkgs/bx-python/default.nix @@ -10,7 +10,7 @@ oldest-supported-numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bx-python"; version = "0.15.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bxlab"; repo = "bx-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2V05c7+kRBNq62DtRZpgyZKMlzveWDXOKrMUiOLzkRU="; }; @@ -59,4 +59,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/python/pkgs/bytecode/default.nix b/python/pkgs/bytecode/default.nix index e5c45bdfd..bba6c5022 100644 --- a/python/pkgs/bytecode/default.nix +++ b/python/pkgs/bytecode/default.nix @@ -8,13 +8,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bytecode"; version = "0.19.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+3M5VzlsuCMB8/ec0yCu8mLNBZLJPWtP1lZ3FQaZliQ="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/vstinner/bytecode"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cache/default.nix b/python/pkgs/cache/default.nix index c5edd5477..cd67ca81c 100644 --- a/python/pkgs/cache/default.nix +++ b/python/pkgs/cache/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cache"; version = "1.0.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jneen"; repo = "python-cache"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vfVNo2B9fnjyjgR7cGrcsi9srWcTs3s8fhmvNF8okN0="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/jneen/python-cache"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cachecontrol/default.nix b/python/pkgs/cachecontrol/default.nix index ba41c7538..5081588bc 100644 --- a/python/pkgs/cachecontrol/default.nix +++ b/python/pkgs/cachecontrol/default.nix @@ -9,14 +9,14 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cachecontrol"; version = "0.14.4"; pyproject = true; src = fetchFromGitHub { owner = "ionrock"; repo = "cachecontrol"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-627SqJocVOO0AfI8vswPqOr15MA/Lx7RLAdRAXzWu84="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/ionrock/cachecontrol"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cached-property/default.nix b/python/pkgs/cached-property/default.nix index 0ba3f73e2..63fbc7051 100644 --- a/python/pkgs/cached-property/default.nix +++ b/python/pkgs/cached-property/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cached-property"; version = "2.0.1"; pyproject = true; src = fetchPypi { pname = "cached_property"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-SE1hcQXj7g5PH1hyXnKo756T3u5GIiLb1RzZEjCJdkE="; }; @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Decorator for caching properties in classes"; homepage = "https://github.com/pydanny/cached-property"; - changelog = "https://github.com/pydanny/cached-property/releases/tag/${version}"; + changelog = "https://github.com/pydanny/cached-property/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cachelib/default.nix b/python/pkgs/cachelib/default.nix index beb21812a..720da2793 100644 --- a/python/pkgs/cachelib/default.nix +++ b/python/pkgs/cachelib/default.nix @@ -6,7 +6,7 @@ pytest-xprocess, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cachelib"; version = "0.17.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pallets"; repo = "cachelib"; - tag = version; + tag = finalAttrs.version; hash = "sha256-egAg0X4xpbvtiAXU6Cu/IIs8/GJAy5i73gLIkdnvOmc="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "Collection of cache libraries in the same API interface"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cachetools/default.nix b/python/pkgs/cachetools/default.nix index 424de6b77..352e36561 100644 --- a/python/pkgs/cachetools/default.nix +++ b/python/pkgs/cachetools/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cachetools"; version = "6.2.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tkem"; repo = "cachetools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LlDyrjiRYCD9btDl5NA0Seb3jk3hlpNhwu0jAQp9YZE="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/tkem/cachetools"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cachey/default.nix b/python/pkgs/cachey/default.nix index 21c0b4f35..f4c758118 100644 --- a/python/pkgs/cachey/default.nix +++ b/python/pkgs/cachey/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, typing-extensions, heapdict, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cachey"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "cachey"; - rev = version; + tag = finalAttrs.version; hash = "sha256-5USmuufrrWtmgibpfkjo9NtgN30hdl8plJfythmxM4s="; }; - propagatedBuildInputs = [ + + build-system = [ setuptools ]; + dependencies = [ typing-extensions heapdict ]; @@ -27,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/dask/cachey/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cachy/default.nix b/python/pkgs/cachy/default.nix index e5ae3b2a4..ced0e4245 100644 --- a/python/pkgs/cachy/default.nix +++ b/python/pkgs/cachy/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cachy"; version = "0.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GGWB9M60Kgu+BAxAfac8FAkjebHkwOMn/bcq5KmyabE="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/sdispater/cachy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/caido-schema-proxy/default.nix b/python/pkgs/caido-schema-proxy/default.nix index d1990bd4d..7d89ca649 100644 --- a/python/pkgs/caido-schema-proxy/default.nix +++ b/python/pkgs/caido-schema-proxy/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.58.3"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "caido_schema_proxy"; inherit (finalAttrs) version; @@ -24,7 +22,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "caido_schema_proxy" ]; # Module has no tests - doCheck = false; passthru.updateScript = nix-update-script { }; diff --git a/python/pkgs/caido-server-auth/default.nix b/python/pkgs/caido-server-auth/default.nix index 78a1958ec..8d35ddc64 100644 --- a/python/pkgs/caido-server-auth/default.nix +++ b/python/pkgs/caido-server-auth/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.2"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "caido_server_auth"; inherit (finalAttrs) version; @@ -36,7 +34,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "caido_server_auth" ]; # Module has no tests - doCheck = false; passthru.updateScript = nix-update-script { }; diff --git a/python/pkgs/cairocffi/default.nix b/python/pkgs/cairocffi/default.nix index 2acadd6e7..952520559 100644 --- a/python/pkgs/cairocffi/default.nix +++ b/python/pkgs/cairocffi/default.nix @@ -17,13 +17,13 @@ gdk-pixbuf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cairocffi"; version = "1.7.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LkjuhkiE7Eo6NL+oyauZmfaIKG63FKFaQ+ydBow2VXs="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/Kozea/cairocffi"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cairosvg/default.nix b/python/pkgs/cairosvg/default.nix index 5040e7a75..2407cdc30 100644 --- a/python/pkgs/cairosvg/default.nix +++ b/python/pkgs/cairosvg/default.nix @@ -14,7 +14,7 @@ tinycss2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cairosvg"; version = "2.9.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Kozea"; repo = "CairoSVG"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WtMFOYaN/cRrL1Q4ma/UkR3kNFObNhp0Gm7i9NQAqz8="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { description = "SVG converter based on Cairo"; mainProgram = "cairosvg"; }; -} +}) diff --git a/python/pkgs/caldav/2.nix b/python/pkgs/caldav/2.nix index be81a05bb..7513c5a97 100644 --- a/python/pkgs/caldav/2.nix +++ b/python/pkgs/caldav/2.nix @@ -25,7 +25,7 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "caldav"; version = "2.2.6"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-caldav"; repo = "caldav"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xtxWDlYESIwkow/YdjaUAkJ/x2jdUyhqfSRycJVLncY="; }; @@ -76,9 +76,9 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = { - changelog = "https://github.com/python-caldav/caldav/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/python-caldav/caldav/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "CalDAV (RFC4791) client library"; homepage = "https://github.com/python-caldav/caldav"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/caldav/default.nix b/python/pkgs/caldav/default.nix index f1e541733..311501646 100644 --- a/python/pkgs/caldav/default.nix +++ b/python/pkgs/caldav/default.nix @@ -15,7 +15,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "caldav"; version = "3.3.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-caldav"; repo = "caldav"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FV1C8RlbkNXOTtRKSCNgiGetImW0+647JgmZtf5U+pY="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-caldav/caldav"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/callee/default.nix b/python/pkgs/callee/default.nix index 363ad7589..78fb862b9 100644 --- a/python/pkgs/callee/default.nix +++ b/python/pkgs/callee/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "callee" ]; - doCheck = false; # missing dependency meta = { description = "Argument matchers for unittest.mock"; homepage = "https://github.com/Xion/callee"; diff --git a/python/pkgs/calmjs-parse/default.nix b/python/pkgs/calmjs-parse/default.nix index f9f8b296d..5b0680920 100644 --- a/python/pkgs/calmjs-parse/default.nix +++ b/python/pkgs/calmjs-parse/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "calmjs-parse"; version = "1.3.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "calmjs"; repo = "calmjs.parse"; - tag = version; + tag = finalAttrs.version; hash = "sha256-OX3031omx9PdrVeNbekWzJKrrrKleP7q7yDosKsvH8U="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/calmjs/calmjs.parse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/calmsize/default.nix b/python/pkgs/calmsize/default.nix index df305a346..5a8f65518 100644 --- a/python/pkgs/calmsize/default.nix +++ b/python/pkgs/calmsize/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "calmsize"; version = "0.1.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Stonesjtu"; repo = "calmsize"; - tag = version; + tag = finalAttrs.version; hash = "sha256-D4UMzgYq++w6+Od0t9mDP4S+3Tc/ME5++NOlozXXALQ="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/Stonesjtu/calmsize"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/calver/default.nix b/python/pkgs/calver/default.nix index 339c697ef..71cba027c 100644 --- a/python/pkgs/calver/default.nix +++ b/python/pkgs/calver/default.nix @@ -5,35 +5,32 @@ setuptools, }: -let - self = buildPythonPackage rec { - pname = "calver"; - version = "2025.10.20"; - pyproject = true; +buildPythonPackage (finalAttrs: { + pname = "calver"; + version = "2025.10.20"; + pyproject = true; - src = fetchFromGitHub { - owner = "di"; - repo = "calver"; - tag = version; - hash = "sha256-8CfPQ4uMgKDqMMgutLdsjn/MaAVBJQAp1KqUfxzNMQw="; - }; + src = fetchFromGitHub { + owner = "di"; + repo = "calver"; + tag = finalAttrs.version; + hash = "sha256-8CfPQ4uMgKDqMMgutLdsjn/MaAVBJQAp1KqUfxzNMQw="; + }; - postPatch = '' - substituteInPlace setup.py \ - --replace "version=calver_version(True)" 'version="${version}"' - ''; + postPatch = '' + substituteInPlace setup.py \ + --replace "version=calver_version(True)" 'version="${finalAttrs.version}"' + ''; - build-system = [ setuptools ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ "calver" ]; + pythonImportsCheck = [ "calver" ]; - passthru.tests.calver = self.overridePythonAttrs { doCheck = true; }; + passthru.tests.calver = finalAttrs.finalPackage.overridePythonAttrs { doCheck = true; }; - meta = { - description = "Setuptools extension for CalVer package versions"; - homepage = "https://github.com/di/calver"; - license = lib.licenses.asl20; - }; + meta = { + description = "Setuptools extension for CalVer package versions"; + homepage = "https://github.com/di/calver"; + license = lib.licenses.asl20; }; -in -self +}) diff --git a/python/pkgs/can-isotp/default.nix b/python/pkgs/can-isotp/default.nix index 28fc7ac7f..3f38403f6 100644 --- a/python/pkgs/can-isotp/default.nix +++ b/python/pkgs/can-isotp/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "can-isotp"; version = "2.0.7"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pylessard"; repo = "python-can-isotp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Gts6eeeto++DKnkojFvCwyPVPRSq2OcTA0jAYrPAWJI="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/pylessard/python-can-isotp"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/canmatrix/default.nix b/python/pkgs/canmatrix/default.nix index 97ce62bbe..7ef2c31cd 100644 --- a/python/pkgs/canmatrix/default.nix +++ b/python/pkgs/canmatrix/default.nix @@ -13,7 +13,7 @@ xlwt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "canmatrix"; version = "1.2"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ebroecker"; repo = "canmatrix"; - tag = version; + tag = finalAttrs.version; hash = "sha256-PfegsFha7ernSqnMeaDoLf1jLx1CiOoiYi34dESEgBY="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/ebroecker/canmatrix"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/canonical-sphinx-extensions/default.nix b/python/pkgs/canonical-sphinx-extensions/default.nix index b6a4c1632..ad3686128 100644 --- a/python/pkgs/canonical-sphinx-extensions/default.nix +++ b/python/pkgs/canonical-sphinx-extensions/default.nix @@ -10,14 +10,14 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "canonical-sphinx-extensions"; version = "0.0.34"; pyproject = true; src = fetchPypi { pname = "canonical_sphinx_extensions"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-y9wiXj4FOkOt3Pt2EFbX5xO+f8V5eaI0G6LzuGbdY0o="; }; @@ -33,11 +33,9 @@ buildPythonPackage rec { sphinx ]; - doCheck = false; - meta = { description = "Collection of Sphinx extensions used by Canonical documentation"; homepage = "https://pypi.org/project/canonical-sphinx-extensions"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/canonicaljson/default.nix b/python/pkgs/canonicaljson/default.nix index f680f4320..9b5b7f341 100644 --- a/python/pkgs/canonicaljson/default.nix +++ b/python/pkgs/canonicaljson/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "canonicaljson"; version = "2.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4v2u8df63F2ctZvT0NQbBk3dppeAmsQyXc7XIdEvET8="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/matrix-org/python-canonicaljson"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/capstone/default.nix b/python/pkgs/capstone/default.nix index 6be576bc7..8d66150d6 100644 --- a/python/pkgs/capstone/default.nix +++ b/python/pkgs/capstone/default.nix @@ -6,13 +6,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "capstone"; version = lib.getVersion pkgs.capstone; - format = "setuptools"; + pyproject = true; src = pkgs.capstone.src; - sourceRoot = "${src.name}/bindings/python"; + + build-system = [ setuptools ]; + sourceRoot = "${finalAttrs.src.name}/bindings/python"; postPatch = '' ln -s ${pkgs.capstone}/lib/libcapstone${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/ @@ -25,7 +27,7 @@ buildPythonPackage rec { "macosx_11_0" ]; - propagatedBuildInputs = [ setuptools ]; + dependencies = [ setuptools ]; pythonImportsCheck = [ "capstone" ]; @@ -34,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.bsdOriginal; description = "Python bindings for Capstone disassembly engine"; }; -} +}) diff --git a/python/pkgs/captcha/default.nix b/python/pkgs/captcha/default.nix index 66ee21256..50b55caa4 100644 --- a/python/pkgs/captcha/default.nix +++ b/python/pkgs/captcha/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "captcha"; version = "0.7.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lepture"; repo = "captcha"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wMnfPkHexiRprtDL6Kkmh9dms4NtW3u37DKtDMPb2ZI="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/lepture/captcha"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/capturer/default.nix b/python/pkgs/capturer/default.nix index 1a1766c44..c223dd75f 100644 --- a/python/pkgs/capturer/default.nix +++ b/python/pkgs/capturer/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "capturer"; version = "3.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "xolox"; repo = "python-capturer"; - rev = version; + tag = finalAttrs.version; sha256 = "0fwrxa049gzin5dck7fvwhdp1856jrn0d7mcjcjsd7ndqvhgvjj1"; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/xolox/python-capturer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/carbon/default.nix b/python/pkgs/carbon/default.nix index affd75bc6..3d0987ba9 100644 --- a/python/pkgs/carbon/default.nix +++ b/python/pkgs/carbon/default.nix @@ -10,13 +10,13 @@ whisper, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "carbon"; version = "1.1.10"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-wTtbqRHMWBcM2iFN95yzwCf/BQ+EK0vp5MXT4mKX3lw="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/graphite-project/carbon"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cardano-tools/default.nix b/python/pkgs/cardano-tools/default.nix index 7f2292ea4..7c4edb735 100644 --- a/python/pkgs/cardano-tools/default.nix +++ b/python/pkgs/cardano-tools/default.nix @@ -8,14 +8,14 @@ pexpect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cardano-tools"; version = "2.1.0"; pyproject = true; src = fetchPypi { pname = "cardano_tools"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-RFyKXHafV+XgRJSsTjASCCw9DxvZqertf4NNN616Bp4="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/viperscience/cardano-tools"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cart/default.nix b/python/pkgs/cart/default.nix index 7efa8d702..5f43ed717 100644 --- a/python/pkgs/cart/default.nix +++ b/python/pkgs/cart/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "1.2.3"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "CybercentreCanada"; repo = "cart"; diff --git a/python/pkgs/casa-formats-io/default.nix b/python/pkgs/casa-formats-io/default.nix index a82c09b47..c6303629d 100644 --- a/python/pkgs/casa-formats-io/default.nix +++ b/python/pkgs/casa-formats-io/default.nix @@ -9,15 +9,15 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "casa-formats-io"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; prproject = true; src = fetchPypi { pname = "casa_formats_io"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-FpQj0XeZ7vvOzUM/+5qG6FRwNXl3gzoUBItYdQ1M4m4="; }; @@ -32,7 +32,6 @@ buildPythonPackage rec { ]; # Tests require a large (800 Mb) dataset - doCheck = false; pythonImportsCheck = [ "casa_formats_io" ]; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://casa-formats-io.readthedocs.io/"; license = lib.licenses.lgpl2Only; }; -} +}) diff --git a/python/pkgs/case-converter/default.nix b/python/pkgs/case-converter/default.nix index 2dd534b18..1ef28975c 100644 --- a/python/pkgs/case-converter/default.nix +++ b/python/pkgs/case-converter/default.nix @@ -22,8 +22,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "caseconverter" ]; - doCheck = true; - nativeCheckInputs = [ pytestCheckHook ]; meta = { diff --git a/python/pkgs/cashaddress/default.nix b/python/pkgs/cashaddress/default.nix index d8cf319e3..0df956019 100644 --- a/python/pkgs/cashaddress/default.nix +++ b/python/pkgs/cashaddress/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cashaddress"; version = "1.0.6-unstable-2019-05-15"; pyproject = true; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/oskyk/cashaddress"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/cashews/default.nix b/python/pkgs/cashews/default.nix index c8c62112d..8acc10c4a 100644 --- a/python/pkgs/cashews/default.nix +++ b/python/pkgs/cashews/default.nix @@ -17,7 +17,7 @@ xxhash, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cashews"; version = "7.5.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Krukov"; repo = "cashews"; - tag = version; + tag = finalAttrs.version; hash = "sha256-GQObsWTCAKuYCyHZVd1wDzhvyYK5Xw1z1QazLuAP3Jg="; }; @@ -65,4 +65,4 @@ buildPythonPackage rec { homepage = "https://github.com/Krukov/cashews/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/castepxbin/default.nix b/python/pkgs/castepxbin/default.nix index 8067d47c3..5f26cf48a 100644 --- a/python/pkgs/castepxbin/default.nix +++ b/python/pkgs/castepxbin/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "castepxbin"; version = "0.3.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zhubonan"; repo = "castepxbin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-M+OoKr9ODIp47gt64hf47A1PblyZpBzulKI7nEm8hdo="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/zhubonan/castepxbin"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/casttube/default.nix b/python/pkgs/casttube/default.nix index bfff78659..fa6d187af 100644 --- a/python/pkgs/casttube/default.nix +++ b/python/pkgs/casttube/default.nix @@ -6,13 +6,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "casttube"; version = "0.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VNKvjHlJqpxduH+xHvCkeKXT56xtLSrI3RcR46UW/II="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { dependencies = [ requests ]; - doCheck = false; - pythonImportsCheck = [ "casttube" ]; meta = { @@ -29,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/ur1katz/casttube"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/catalogue/default.nix b/python/pkgs/catalogue/default.nix index 6eeb6d979..30d7e624c 100644 --- a/python/pkgs/catalogue/default.nix +++ b/python/pkgs/catalogue/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "catalogue"; version = "2.0.10"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-T1baqUCRPT8J1YnBkcdOWm1Rdis6njfdU7dDev1s2hU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/catalogue"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/category-encoders/default.nix b/python/pkgs/category-encoders/default.nix index 7c8d5446e..e0684b8d2 100644 --- a/python/pkgs/category-encoders/default.nix +++ b/python/pkgs/category-encoders/default.nix @@ -16,7 +16,7 @@ scipy, statsmodels, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "category-encoders"; version = "2.10.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-learn-contrib"; repo = "category_encoders"; - tag = version; + tag = finalAttrs.version; hash = "sha256-NMFMVteOW5kGVxw/S1FdMfYM/jQcpxSTQTRzn95bqGE="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/scikit-learn-contrib/category_encoders"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/catkin-pkg/default.nix b/python/pkgs/catkin-pkg/default.nix index cf1878f6c..adf03e383 100644 --- a/python/pkgs/catkin-pkg/default.nix +++ b/python/pkgs/catkin-pkg/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "catkin-pkg"; version = "1.1.0"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ros-infrastructure"; repo = "catkin_pkg"; - tag = version; + tag = finalAttrs.version; hash = "sha256-V4iurFt1WmY2jXy0A4Qa2eKMCWmR+Hs3d9pru0/zUSM="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "http://wiki.ros.org/catkin_pkg"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cattrs/default.nix b/python/pkgs/cattrs/default.nix index 23eb2e63c..4332b5932 100644 --- a/python/pkgs/cattrs/default.nix +++ b/python/pkgs/cattrs/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cattrs"; version = "26.2.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-attrs"; repo = "cattrs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YJYmPpvZ6B/0zniwLZPSIRAz0afqrQP74JfY/hgrogw="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-attrs/cattrs"; license = with lib.licenses; [ mit ]; }; -} +}) diff --git a/python/pkgs/cbor/default.nix b/python/pkgs/cbor/default.nix index f8e36d3d6..3259b1feb 100644 --- a/python/pkgs/cbor/default.nix +++ b/python/pkgs/cbor/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cbor"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-EyJaJi3fVhXL2f1Vp2oNUwadGLB9Lp8Zw55qy4YJu7Y="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "cbor" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/brianolson/cbor_py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cbor2/default.nix b/python/pkgs/cbor2/default.nix index 39b0e0508..2d45acde9 100644 --- a/python/pkgs/cbor2/default.nix +++ b/python/pkgs/cbor2/default.nix @@ -7,13 +7,13 @@ withCExtensions ? true, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cbor2"; version = "5.8.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-sZw1/K6WiKwB73W61dsnMAwlN+tO4A7QfgXYRWoNSTE="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "cbor2"; }; -} +}) diff --git a/python/pkgs/cdcs/default.nix b/python/pkgs/cdcs/default.nix index 7a2b690c0..78d27599d 100644 --- a/python/pkgs/cdcs/default.nix +++ b/python/pkgs/cdcs/default.nix @@ -12,7 +12,7 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cdcs"; version = "0.2.7"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "usnistgov"; repo = "pycdcs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UpPoTdcDDCmombeScFgjsFX+//Yfnn+ClDwYsZh0dxI="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/usnistgov/pycdcs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cddlparser/default.nix b/python/pkgs/cddlparser/default.nix index 8a3b2f886..93eda22d8 100644 --- a/python/pkgs/cddlparser/default.nix +++ b/python/pkgs/cddlparser/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cddlparser"; version = "0.6.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tidoust"; repo = "cddlparser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-LcIxU77bYpsuE4j1QgzdD3d7CO/EUEA9xwn+uIV68Oc="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { ''; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/celery-batches/default.nix b/python/pkgs/celery-batches/default.nix index b7e6e9c03..3fe7df422 100644 --- a/python/pkgs/celery-batches/default.nix +++ b/python/pkgs/celery-batches/default.nix @@ -6,7 +6,7 @@ celery, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "celery-batches"; version = "0.11"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "clokep"; repo = "celery-batches"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+1cpauali+MjDox0esw0+bveOEroIQ0DkuHQuwm/i4Q="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { dependencies = [ celery ]; # requires a running celery - doCheck = false; pythonImportsCheck = [ "celery_batches" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/clokep/celery-batches"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/celery-redbeat/default.nix b/python/pkgs/celery-redbeat/default.nix index 939bae31b..907a18119 100644 --- a/python/pkgs/celery-redbeat/default.nix +++ b/python/pkgs/celery-redbeat/default.nix @@ -14,7 +14,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "celery-redbeat"; version = "2.9.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "celery"; repo = "django-celery-beat"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UGKMSXB+Hg865sAk5ePc/noO3eNTr7b3pp7tvNvn1T8="; }; @@ -45,11 +45,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "django_celery_beat" ]; # Tests require additional work - doCheck = false; meta = { description = "Database-backed Periodic Tasks"; homepage = "https://github.com/celery/django-celery-beat"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/celery-types/default.nix b/python/pkgs/celery-types/default.nix index 3abc2cbf5..6b588d3b5 100644 --- a/python/pkgs/celery-types/default.nix +++ b/python/pkgs/celery-types/default.nix @@ -6,14 +6,14 @@ uv-build, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "celery-types"; version = "0.26.0"; pyproject = true; src = fetchPypi { pname = "celery_types"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-+jGBNv2tg/g/FTHe7Nn+Zktd///ynzwx6RIKRrjjkI8="; }; @@ -26,11 +26,9 @@ buildPythonPackage rec { dependencies = [ typing-extensions ]; - doCheck = false; - meta = { description = "PEP-484 stubs for Celery"; homepage = "https://github.com/sbdchd/celery-types"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/censys/default.nix b/python/pkgs/censys/default.nix index b06ca9883..16e5eb2b8 100644 --- a/python/pkgs/censys/default.nix +++ b/python/pkgs/censys/default.nix @@ -17,7 +17,7 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "censys"; version = "2.3.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "censys"; repo = "censys-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GBFsAVecUN49vousqnB6enqRsAg1aBrjaA/Q7XXnOUE="; }; @@ -68,4 +68,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "censys"; }; -} +}) diff --git a/python/pkgs/cerberus/default.nix b/python/pkgs/cerberus/default.nix index f860120e3..6e181aaf7 100644 --- a/python/pkgs/cerberus/default.nix +++ b/python/pkgs/cerberus/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cerberus"; version = "1.3.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-V5VUiH/9GJImd0uHVw9Kdtt1zw78uv/KzV6YuO6Hf2E="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Schema and data validation tool for Python dictionaries"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/certbot-dns-cloudflare/default.nix b/python/pkgs/certbot-dns-cloudflare/default.nix index 92e74500c..00873d006 100644 --- a/python/pkgs/certbot-dns-cloudflare/default.nix +++ b/python/pkgs/certbot-dns-cloudflare/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "certbot-dns-cloudflare"; pyproject = true; inherit (certbot) src version; - sourceRoot = "${src.name}/certbot-dns-cloudflare"; + sourceRoot = "${finalAttrs.src.name}/certbot-dns-cloudflare"; build-system = [ setuptools ]; @@ -27,4 +27,4 @@ buildPythonPackage rec { meta = certbot.meta // { description = "Cloudflare DNS Authenticator plugin for Certbot"; }; -} +}) diff --git a/python/pkgs/certbot-dns-google/default.nix b/python/pkgs/certbot-dns-google/default.nix index d3a19d066..a9b07e905 100644 --- a/python/pkgs/certbot-dns-google/default.nix +++ b/python/pkgs/certbot-dns-google/default.nix @@ -8,12 +8,12 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "certbot-dns-google"; inherit (certbot) src version; pyproject = true; - sourceRoot = "${src.name}/certbot-dns-google"; + sourceRoot = "${finalAttrs.src.name}/certbot-dns-google"; build-system = [ setuptools ]; @@ -33,4 +33,4 @@ buildPythonPackage rec { meta = certbot.meta // { description = "Google Cloud DNS Authenticator plugin for Certbot"; }; -} +}) diff --git a/python/pkgs/certbot-dns-rfc2136/default.nix b/python/pkgs/certbot-dns-rfc2136/default.nix index 57971a74c..cc79568d9 100644 --- a/python/pkgs/certbot-dns-rfc2136/default.nix +++ b/python/pkgs/certbot-dns-rfc2136/default.nix @@ -4,17 +4,21 @@ certbot, dnspython, pytestCheckHook, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "certbot-dns-rfc2136"; - format = "setuptools"; + pyproject = true; inherit (certbot) src version; - sourceRoot = "${src.name}/certbot-dns-rfc2136"; + sourceRoot = "${finalAttrs.src.name}/certbot-dns-rfc2136"; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ acme certbot dnspython @@ -32,4 +36,4 @@ buildPythonPackage rec { meta = certbot.meta // { description = "RFC 2136 DNS Authenticator plugin for Certbot"; }; -} +}) diff --git a/python/pkgs/certbot-dns-route53/default.nix b/python/pkgs/certbot-dns-route53/default.nix index 840687569..d1dcdbff3 100644 --- a/python/pkgs/certbot-dns-route53/default.nix +++ b/python/pkgs/certbot-dns-route53/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "certbot-dns-route53"; pyproject = true; inherit (certbot) src version; - sourceRoot = "${src.name}/certbot-dns-route53"; + sourceRoot = "${finalAttrs.src.name}/certbot-dns-route53"; build-system = [ setuptools ]; @@ -35,4 +35,4 @@ buildPythonPackage rec { meta = certbot.meta // { description = "Route53 DNS Authenticator plugin for Certbot"; }; -} +}) diff --git a/python/pkgs/certbot-dns-wedos/default.nix b/python/pkgs/certbot-dns-wedos/default.nix index 2b1e880f9..576c8014b 100644 --- a/python/pkgs/certbot-dns-wedos/default.nix +++ b/python/pkgs/certbot-dns-wedos/default.nix @@ -9,13 +9,13 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "certbot-dns-wedos"; version = "2.4"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "certbot_dns_wedos"; hash = "sha256-Sle3hoBLwVPF30caCyYtt3raY5Gs9ekg0DthvHxvB4E="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/clazzor/certbot-dns-wedos"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/certbot-nginx/default.nix b/python/pkgs/certbot-nginx/default.nix index ebe6f87ef..2bd0ecfff 100644 --- a/python/pkgs/certbot-nginx/default.nix +++ b/python/pkgs/certbot-nginx/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "certbot-nginx"; pyproject = true; inherit (certbot) src version; - sourceRoot = "${src.name}/certbot-nginx"; + sourceRoot = "${finalAttrs.src.name}/certbot-nginx"; build-system = [ setuptools ]; @@ -28,4 +28,4 @@ buildPythonPackage rec { meta = certbot.meta // { description = "Nginx plugin for Certbot"; }; -} +}) diff --git a/python/pkgs/certipy/default.nix b/python/pkgs/certipy/default.nix index 58c3de2f7..4a9d36661 100644 --- a/python/pkgs/certipy/default.nix +++ b/python/pkgs/certipy/default.nix @@ -6,13 +6,13 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "certipy"; version = "0.2.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-TocB5qLygeehVMLzaM/07fN0AJCE0peIy+jDg4iXeE8="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/LLNL/certipy"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/certomancer/default.nix b/python/pkgs/certomancer/default.nix index c5ad1bb67..812a745f4 100644 --- a/python/pkgs/certomancer/default.nix +++ b/python/pkgs/certomancer/default.nix @@ -29,7 +29,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "certomancer"; version = "0.14.0"; pyproject = true; @@ -37,7 +37,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "certomancer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rsugn1g8iYESrC+IUSbxCAbwnKXWG+ubbUj9QdZB+Ow="; }; @@ -69,4 +69,4 @@ buildPythonPackage rec { homepage = "https://github.com/MatthiasValvekens/certomancer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/certvalidator/default.nix b/python/pkgs/certvalidator/default.nix index df6355c91..0cd4b07cd 100644 --- a/python/pkgs/certvalidator/default.nix +++ b/python/pkgs/certvalidator/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "0.11.1"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "wbond"; repo = "certvalidator"; diff --git a/python/pkgs/cexprtk/default.nix b/python/pkgs/cexprtk/default.nix index 94eaa433a..ec603c09d 100644 --- a/python/pkgs/cexprtk/default.nix +++ b/python/pkgs/cexprtk/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cexprtk"; version = "0.4.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-sBLkHco0u2iEsdUxmPW2ONP/Fe08p0fOVJLmzz3t4os="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/mjdrushton/cexprtk"; license = lib.licenses.cpl10; }; -} +}) diff --git a/python/pkgs/cffconvert/default.nix b/python/pkgs/cffconvert/default.nix index a78502050..90f0ad202 100644 --- a/python/pkgs/cffconvert/default.nix +++ b/python/pkgs/cffconvert/default.nix @@ -13,7 +13,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cffconvert"; version = "2.0.0"; pyproject = true; @@ -57,4 +57,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "cffconvert"; }; -} +}) diff --git a/python/pkgs/cffi/default.nix b/python/pkgs/cffi/default.nix index 935502e74..449c2c119 100644 --- a/python/pkgs/cffi/default.nix +++ b/python/pkgs/cffi/default.nix @@ -9,7 +9,7 @@ stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cffi"; version = "2.1.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-cffi"; repo = "cffi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-01cqKx1TukxJJy00Cs/iuqc1+Yrq2//JJHfsUnJYNyw="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://cffi.readthedocs.org/"; license = lib.licenses.mit0; }; -} +}) diff --git a/python/pkgs/cfgv/default.nix b/python/pkgs/cfgv/default.nix index 7afa52d33..cc0713269 100644 --- a/python/pkgs/cfgv/default.nix +++ b/python/pkgs/cfgv/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cfgv"; version = "3.5.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asottile"; repo = "cfgv"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ccCalTNVEHvh1gKhQgceD/yAScIEQy3ZKqndoWs7FQQ="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/asottile/cfgv"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cfn-flip/default.nix b/python/pkgs/cfn-flip/default.nix index 9f81905e0..91e92f0a0 100644 --- a/python/pkgs/cfn-flip/default.nix +++ b/python/pkgs/cfn-flip/default.nix @@ -3,24 +3,28 @@ buildPythonPackage, click, fetchFromGitHub, + # build-system + setuptools, pytest-cov-stub, pyyaml, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cfn-flip"; version = "1.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-cfn-template-flip"; - rev = version; + tag = finalAttrs.version; hash = "sha256-lfhTR3+D1FvblhQGF83AB8+I8WDPBTmo+q22ksgDgt4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ click pyyaml six @@ -33,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/awslabs/aws-cfn-template-flip"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cfn-lint/default.nix b/python/pkgs/cfn-lint/default.nix index 1f271d0a9..92b86ca68 100644 --- a/python/pkgs/cfn-lint/default.nix +++ b/python/pkgs/cfn-lint/default.nix @@ -18,7 +18,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cfn-lint"; version = "1.56.0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-lint"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GkY8t7USyiDRxTNESiXZ6P/oxaoMO4mlDmaiF1rzyEA="; }; @@ -49,7 +49,7 @@ buildPythonPackage rec { jschema-to-python sarif-om ]; - full = lib.concatAttrValues (lib.removeAttrs optional-dependencies [ "full" ]); + full = lib.concatAttrValues (lib.removeAttrs finalAttrs.optional-dependencies [ "full" ]); }; pythonImportsCheck = [ "cfnlint" ]; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/aws-cloudformation/cfn-lint"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cftime/default.nix b/python/pkgs/cftime/default.nix index a300c2603..4e188fce9 100644 --- a/python/pkgs/cftime/default.nix +++ b/python/pkgs/cftime/default.nix @@ -3,25 +3,29 @@ buildPythonPackage, cython, fetchPypi, + # build-system + setuptools, numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cftime"; version = "1.6.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-giX+1rm0P7h2g+urUhMEUPwXMAERUNMJIJapDlTR6B4="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ cython numpy ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; pythonImportsCheck = [ "cftime" ]; meta = { @@ -29,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/Unidata/cftime"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cgroup-utils/default.nix b/python/pkgs/cgroup-utils/default.nix index 49bc8620c..efe0d1459 100644 --- a/python/pkgs/cgroup-utils/default.nix +++ b/python/pkgs/cgroup-utils/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cgroup-utils"; version = "0.8"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "peo3"; repo = "cgroup-utils"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0qnbn8cnq8m14s8s1hcv25xjd55dyb6yy54l5vc7sby5xzzp11fq"; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { # Upon running `from cgutils import cgroup`, it attempts to read a file in `/sys`. # Due to the Nix build sandbox, this is disallowed, and so all possible tests fail, # so we don't run them. Plain `import cgutils` works, so we run pythonImportsCheck below. - doCheck = false; pythonImportsCheck = [ "cgutils" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/chacha20poly1305-reuseable/default.nix b/python/pkgs/chacha20poly1305-reuseable/default.nix index cdac4abdd..e96e10bb5 100644 --- a/python/pkgs/chacha20poly1305-reuseable/default.nix +++ b/python/pkgs/chacha20poly1305-reuseable/default.nix @@ -40,7 +40,7 @@ buildPythonPackage { pythonRelaxDeps = [ "cryptography" ]; - propagatedBuildInputs = [ cryptography ]; + dependencies = [ cryptography ]; pythonImportsCheck = [ "chacha20poly1305_reuseable" ]; diff --git a/python/pkgs/chacha20poly1305/default.nix b/python/pkgs/chacha20poly1305/default.nix index 52ca7a6cb..a985273c4 100644 --- a/python/pkgs/chacha20poly1305/default.nix +++ b/python/pkgs/chacha20poly1305/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "chacha20poly1305"; version = "0.0.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8vAFx89GOP+k/wbALHh0gGi2QpFnlcbRbHzF41XnDt8="; }; + build-system = [ setuptools ]; + # Module has no tests - doCheck = false; pythonImportsCheck = [ "chacha20poly1305" ]; @@ -24,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/ph4r05/py-chacha20poly1305"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/chainmap/default.nix b/python/pkgs/chainmap/default.nix index ffc484d92..342e22728 100644 --- a/python/pkgs/chainmap/default.nix +++ b/python/pkgs/chainmap/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "chainmap"; version = "1.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5CqqSz4vZhAqEb/VYwaXBL+/2E/ctRe1ZO/9c2v1PNk="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://bitbucket.org/jeunice/chainmap"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/chainstream/default.nix b/python/pkgs/chainstream/default.nix index be3d9c9bb..f7d9c0205 100644 --- a/python/pkgs/chainstream/default.nix +++ b/python/pkgs/chainstream/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "chainstream"; version = "1.0.2"; @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-syl107PRwDClB6wpgETCj6PKMNUnq9+uKB7dUydmF7M="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/rrthomas/chainstream"; license = lib.licenses.cc-by-sa-40; }; -} +}) diff --git a/python/pkgs/chameleon/default.nix b/python/pkgs/chameleon/default.nix index c0f8af26c..51d0703b1 100644 --- a/python/pkgs/chameleon/default.nix +++ b/python/pkgs/chameleon/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "chameleon"; version = "4.6.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "malthe"; repo = "chameleon"; - tag = version; + tag = finalAttrs.version; hash = "sha256-zCEM5yl8Y11FbexD7veS9bFJgm30L6fsTde59m2t1ec="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://chameleon.readthedocs.io"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/changelog-chug/default.nix b/python/pkgs/changelog-chug/default.nix index e59f0c415..ecf8340b6 100644 --- a/python/pkgs/changelog-chug/default.nix +++ b/python/pkgs/changelog-chug/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "changelog-chug"; version = "0.0.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromSourcehut { owner = "~bignose"; repo = "changelog-chug"; - rev = "release/${version}"; + rev = "release/${finalAttrs.version}"; hash = "sha256-SPwFkmRQMpdsVmzZE4mB2J9wsfvE1K21QDkOQ2XPlow="; # HACK: sourcehut can't generate tarballs from tags with slashes properly, # so force using git clone. @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://git.sr.ht/~bignose/changelog-chug"; license = lib.licenses.agpl3Only; }; -} +}) diff --git a/python/pkgs/channels-redis/default.nix b/python/pkgs/channels-redis/default.nix index b48c6b5b3..c4a635e80 100644 --- a/python/pkgs/channels-redis/default.nix +++ b/python/pkgs/channels-redis/default.nix @@ -10,7 +10,7 @@ redis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "channels-redis"; version = "4.3.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django"; repo = "channels_redis"; - tag = version; + tag = finalAttrs.version; hash = "sha256-zn313s1rzypSR5D3iE/05PeBQkx/Se/yaA3NS9BY//Y="; }; @@ -37,7 +37,6 @@ buildPythonPackage rec { # Fails with : ConnectionRefusedError: [Errno 111] Connect call failed ('127.0.0.1', 6379) # (even with a local Redis instance running) - doCheck = false; pythonImportsCheck = [ "channels_redis" ]; @@ -46,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/django/channels_redis/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/channels/default.nix b/python/pkgs/channels/default.nix index 7051b273f..774ef8f3f 100644 --- a/python/pkgs/channels/default.nix +++ b/python/pkgs/channels/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "channels"; version = "4.3.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django"; repo = "channels"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KBjxaK2j9Xbz35IHqZK68cSLkUk4B7t+J7omcQAtuFM="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/django/channels"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/chardet/5.nix b/python/pkgs/chardet/5.nix index 31e4d968d..60bb2a8b7 100644 --- a/python/pkgs/chardet/5.nix +++ b/python/pkgs/chardet/5.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "5.2.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-Gztv9HmoxBS8P6LAhSmVaVxKAm3NbQYzst0JLKOcHPc="; diff --git a/python/pkgs/charset-normalizer/default.nix b/python/pkgs/charset-normalizer/default.nix index a03cbdbd1..92fc3a8c8 100644 --- a/python/pkgs/charset-normalizer/default.nix +++ b/python/pkgs/charset-normalizer/default.nix @@ -9,7 +9,7 @@ withMypyc ? false, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "charset-normalizer"; version = "3.5.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jawah"; repo = "charset_normalizer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-zIN1y9HVwaCqixjRFLn6g/tz95E41m7t7j4eY5jNZMs="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://charset-normalizer.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/chat-downloader/default.nix b/python/pkgs/chat-downloader/default.nix index 9d9c1eca3..2c295204d 100644 --- a/python/pkgs/chat-downloader/default.nix +++ b/python/pkgs/chat-downloader/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "0.2.8"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) version pname; hash = "sha256-WBasBhefgRkOdMdz2K/agvS+cY6m3/33wiu+Jl4d1Cg="; @@ -34,7 +32,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests try to access the network. - doCheck = false; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/python/pkgs/check-manifest/default.nix b/python/pkgs/check-manifest/default.nix index e854e2647..473be4bcd 100644 --- a/python/pkgs/check-manifest/default.nix +++ b/python/pkgs/check-manifest/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "check-manifest"; version = "0.51"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mgedmin"; repo = "check-manifest"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tT6xQZwqJIsyrO9BjWweIeNgYaopziewerVBk0mFVYg="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "check-manifest"; }; -} +}) diff --git a/python/pkgs/checksumdir/default.nix b/python/pkgs/checksumdir/default.nix index 89d9cb810..73d2a714d 100644 --- a/python/pkgs/checksumdir/default.nix +++ b/python/pkgs/checksumdir/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "checksumdir"; version = "1.3.0"; pyproject = true; @@ -13,13 +13,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "to-mc"; repo = "checksumdir"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rOHRJAK+Or8bwAtzpbINdnEjK3WQcU+4sEZI91tMvAk="; }; nativeBuildInputs = [ setuptools ]; - doCheck = false; # Package does not contain tests pythonImportsCheck = [ "checksumdir" ]; meta = { @@ -27,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/to-mc/checksumdir"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cheetah3/default.nix b/python/pkgs/cheetah3/default.nix index e1d21b8bc..bc519749c 100644 --- a/python/pkgs/cheetah3/default.nix +++ b/python/pkgs/cheetah3/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "3.4.0.post5"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "CheetahTemplate3"; repo = "cheetah3"; diff --git a/python/pkgs/cheroot/default.nix b/python/pkgs/cheroot/default.nix index edcf1622d..d62d82148 100644 --- a/python/pkgs/cheroot/default.nix +++ b/python/pkgs/cheroot/default.nix @@ -13,13 +13,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cheroot"; version = "11.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-v7cMSWY/Y7BEDytU28aw0WUOVt/k4mQfWbLG9ye0Sso="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { mainProgram = "cheroot"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cherrypy-cors/default.nix b/python/pkgs/cherrypy-cors/default.nix index 66be43121..652034c48 100644 --- a/python/pkgs/cherrypy-cors/default.nix +++ b/python/pkgs/cherrypy-cors/default.nix @@ -8,13 +8,13 @@ cherrypy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cherrypy-cors"; version = "1.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gzhM1mSnq4uat9SSb+lxOs/gvONmXuKBiaD6BLnyEtY="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/cherrypy/cherrypy-cors"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cherrypy/default.nix b/python/pkgs/cherrypy/default.nix index 59d3c427e..54a3fbf66 100644 --- a/python/pkgs/cherrypy/default.nix +++ b/python/pkgs/cherrypy/default.nix @@ -17,13 +17,13 @@ simplejson, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cherrypy"; version = "18.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bHDnjuETAOiyHAdnxUKuaxAqScrFz9Tj4xPXu5B8WJE="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { mainProgram = "cherryd"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/chess/default.nix b/python/pkgs/chess/default.nix index 60186dbff..0ea119038 100644 --- a/python/pkgs/chess/default.nix +++ b/python/pkgs/chess/default.nix @@ -5,15 +5,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "chess"; version = "1.11.2"; pyproject = true; src = fetchFromGitHub { owner = "niklasf"; - repo = "python-${pname}"; - tag = "v${version}"; + repo = "python-${finalAttrs.pname}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8LOp4HQI9UOdaj4/jwd79ftdnaO4HtzMVf1cwcYFCiA="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Chess library with move generation, move validation, and support for common formats"; homepage = "https://github.com/niklasf/python-chess"; - changelog = "https://github.com/niklasf/python-chess/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/niklasf/python-chess/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/chevron/default.nix b/python/pkgs/chevron/default.nix index a22392795..ae2e583a2 100644 --- a/python/pkgs/chevron/default.nix +++ b/python/pkgs/chevron/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "chevron"; version = "0.14.0-unstable-2021-03-21"; pyproject = true; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/noahmorrison/chevron"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/chex/default.nix b/python/pkgs/chex/default.nix index 82db6c6b8..cf5c69f07 100644 --- a/python/pkgs/chex/default.nix +++ b/python/pkgs/chex/default.nix @@ -19,7 +19,6 @@ buildPythonPackage (finalAttrs: { pname = "chex"; version = "0.1.92"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "google-deepmind"; diff --git a/python/pkgs/chirpstack-api/default.nix b/python/pkgs/chirpstack-api/default.nix index 0d8f43ceb..c4f5a89a7 100644 --- a/python/pkgs/chirpstack-api/default.nix +++ b/python/pkgs/chirpstack-api/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "3.12.5"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "brocaar"; repo = "chirpstack-api"; @@ -31,7 +29,6 @@ buildPythonPackage (finalAttrs: { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "chirpstack_api" ]; diff --git a/python/pkgs/chispa/default.nix b/python/pkgs/chispa/default.nix index 8b3d36301..0b0423a37 100644 --- a/python/pkgs/chispa/default.nix +++ b/python/pkgs/chispa/default.nix @@ -7,7 +7,7 @@ prettytable, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "chispa"; version = "0.12.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MrPowers"; repo = "chispa"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-G65+3GbIGNwZVSFc89tXlYgPimtJPFo9ZK23fZgrCF4="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # Tests require a spark installation - doCheck = false; # pythonImportsCheck needs spark installation @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/MrPowers/chispa"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/choreographer/default.nix b/python/pkgs/choreographer/default.nix index a5e07476b..6a9ee1127 100644 --- a/python/pkgs/choreographer/default.nix +++ b/python/pkgs/choreographer/default.nix @@ -41,7 +41,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "choreographer" ]; # Tests require running chrome - doCheck = false; meta = { description = "Devtools Protocol implementation for chrome"; diff --git a/python/pkgs/chroma-hnswlib/default.nix b/python/pkgs/chroma-hnswlib/default.nix index ba56a0fec..ccb8db142 100644 --- a/python/pkgs/chroma-hnswlib/default.nix +++ b/python/pkgs/chroma-hnswlib/default.nix @@ -8,7 +8,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "chroma-hnswlib"; version = "0.8.2"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chroma-core"; repo = "hnswlib"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Fs/BuocZblMSlmP6yp+aykbs0n1AdvL3AVAQI1AnZ9o="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail '__version__ = "0.7.6"' '__version__ = "${version}"' + --replace-fail '__version__ = "0.7.6"' '__version__ = "${finalAttrs.version}"' ''; nativeBuildInputs = [ @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/chroma-core/hnswlib"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ci-info/default.nix b/python/pkgs/ci-info/default.nix index 4286d7f23..f872e572d 100644 --- a/python/pkgs/ci-info/default.nix +++ b/python/pkgs/ci-info/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ci-info"; version = "0.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-H9UMvUAfKa3/7rGLBIniMtFqwadFisa8MW3qtq5TX7A="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "ci_info" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/mgxd/ci-info"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ci-py/default.nix b/python/pkgs/ci-py/default.nix index 36ae4571b..0268b70d2 100644 --- a/python/pkgs/ci-py/default.nix +++ b/python/pkgs/ci-py/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-R/6bLsXOKGxiJDZUvvOuvLp3usEhfg698qvvgOwBXYk="; diff --git a/python/pkgs/cinemagoer/default.nix b/python/pkgs/cinemagoer/default.nix index f13cf416c..9cf71a4c6 100644 --- a/python/pkgs/cinemagoer/default.nix +++ b/python/pkgs/cinemagoer/default.nix @@ -36,7 +36,6 @@ buildPythonPackage { ''; # Tests require networking, and https://github.com/cinemagoer/cinemagoer/issues/240 - doCheck = false; pythonImportsCheck = [ "imdb" ]; # Former "imdbpy", upstream is yet to rename here diff --git a/python/pkgs/circuit-webhook/default.nix b/python/pkgs/circuit-webhook/default.nix index 48c8dd557..fe789f1b3 100644 --- a/python/pkgs/circuit-webhook/default.nix +++ b/python/pkgs/circuit-webhook/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-NhePKBfzdkw7iVHmVrOxf8ZcQrb1Sq2xMIfu4P9+Ppw="; @@ -20,7 +18,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "circuit_webhook" ]; diff --git a/python/pkgs/circuitbreaker/default.nix b/python/pkgs/circuitbreaker/default.nix index 250c85e71..cb5b8dd58 100644 --- a/python/pkgs/circuitbreaker/default.nix +++ b/python/pkgs/circuitbreaker/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "circuitbreaker"; version = "2.1.3"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fabfuel"; repo = "circuitbreaker"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7BpYGhha0PTYzsE9CsN4KxfJW/wm2i6V+uAeamBREBQ="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/fabfuel/circuitbreaker"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/circus/default.nix b/python/pkgs/circus/default.nix index a1f546e5f..8cbcd3d1c 100644 --- a/python/pkgs/circus/default.nix +++ b/python/pkgs/circus/default.nix @@ -12,7 +12,7 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "circus"; version = "0.19.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "circus-tent"; repo = "circus"; - tag = version; + tag = finalAttrs.version; hash = "sha256-MiZXiGb6F8LAJLAdmEDBO8Y5cJxHJy7jMFi50Ac3Bsc="; }; @@ -68,4 +68,4 @@ buildPythonPackage rec { homepage = "https://github.com/circus-tent/circus"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ciscomobilityexpress/default.nix b/python/pkgs/ciscomobilityexpress/default.nix index 28d0c84a6..bdae4b245 100644 --- a/python/pkgs/ciscomobilityexpress/default.nix +++ b/python/pkgs/ciscomobilityexpress/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.2"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-2HhyRVmOg3GoO6pNsd+UnYqULEPxNFT6Ju47CcPMr8A="; diff --git a/python/pkgs/ciso8601/default.nix b/python/pkgs/ciso8601/default.nix index 495bd5eba..873b15b0f 100644 --- a/python/pkgs/ciso8601/default.nix +++ b/python/pkgs/ciso8601/default.nix @@ -6,7 +6,7 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ciso8601"; version = "2.3.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "closeio"; repo = "ciso8601"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-14HiCn8BPALPaW53k118lHb5F4oG9mMNN6sdLdKB6v0="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/closeio/ciso8601"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/citeproc-py/default.nix b/python/pkgs/citeproc-py/default.nix index a58c4e94f..91b8d7cab 100644 --- a/python/pkgs/citeproc-py/default.nix +++ b/python/pkgs/citeproc-py/default.nix @@ -8,14 +8,14 @@ lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "citeproc-py"; version = "0.11.1"; pyproject = true; src = fetchPypi { pname = "citeproc_py"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-8vmmTNmAcGoMrF3rdXnm+KzIfOAUBSDMnzAmLSDDUwc="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/citeproc-py/citeproc-py"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/cjkwrap/default.nix b/python/pkgs/cjkwrap/default.nix index 9b0883ec4..7f7580e66 100644 --- a/python/pkgs/cjkwrap/default.nix +++ b/python/pkgs/cjkwrap/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cjkwrap"; version = "2.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "fgallaire"; repo = "cjkwrap"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0wTx3rnlUfQEE2/Z8Y7iwlsHk+CIy6ut+QIpC5yg4aM="; }; @@ -21,11 +21,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "cjkwrap" ]; - doCheck = false; - meta = { description = "Library for wrapping and filling CJK text"; homepage = "https://f.gallai.re/cjkwrap"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/ckzg/default.nix b/python/pkgs/ckzg/default.nix index d474fd565..c08af5b32 100644 --- a/python/pkgs/ckzg/default.nix +++ b/python/pkgs/ckzg/default.nix @@ -11,7 +11,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ckzg"; version = "2.1.8"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "c-kzg-4844"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-i7m1oFQ4WmY+TfETfQuznvQINt6+JfWztoRFnI/pV/s="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/c-kzg-4844"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/clarabel/default.nix b/python/pkgs/clarabel/default.nix index adbef79a0..c2df5d09b 100644 --- a/python/pkgs/clarabel/default.nix +++ b/python/pkgs/clarabel/default.nix @@ -11,18 +11,18 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "clarabel"; version = "0.11.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-58QcR/Dlmuq5mu//nlivSodT7lJpu+7L1VJvxvQblZg="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-Cmxbz1zPA/J7EeJhGfD4Zt+QvyJK6BOZ+YQAsf8H+is="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/oxfordcontrol/Clarabel.rs"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/clarifai-grpc/default.nix b/python/pkgs/clarifai-grpc/default.nix index 1b9a7df2a..bbd9ac8b1 100644 --- a/python/pkgs/clarifai-grpc/default.nix +++ b/python/pkgs/clarifai-grpc/default.nix @@ -35,7 +35,6 @@ buildPythonPackage (finalAttrs: { ]; # almost all tests require network access - doCheck = false; pythonImportsCheck = [ "clarifai_grpc" ]; diff --git a/python/pkgs/class-doc/default.nix b/python/pkgs/class-doc/default.nix index e8d237af2..d6b76e50e 100644 --- a/python/pkgs/class-doc/default.nix +++ b/python/pkgs/class-doc/default.nix @@ -31,7 +31,7 @@ buildPythonPackage { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ more-itertools ]; + dependencies = [ more-itertools ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/python/pkgs/classify-imports/default.nix b/python/pkgs/classify-imports/default.nix index cc8be5d9a..4de9e5b27 100644 --- a/python/pkgs/classify-imports/default.nix +++ b/python/pkgs/classify-imports/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "4.5.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "asottile"; repo = "classify-imports"; diff --git a/python/pkgs/cle/default.nix b/python/pkgs/cle/default.nix index fe60a424d..489175ca3 100644 --- a/python/pkgs/cle/default.nix +++ b/python/pkgs/cle/default.nix @@ -25,7 +25,7 @@ let hash = "sha256-XXJBySIT3ylK1nd3suP2bq4bVSVah/1XhOmkEONbCoY="; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cle"; inherit version; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = "cle"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rWbZzm5hWi/C+te8zeQChxqYHO0S795tJ6Znocq9TTs="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://github.com/angr/cle"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/clearpasspy/default.nix b/python/pkgs/clearpasspy/default.nix index a7c8fc83d..896c7d84f 100644 --- a/python/pkgs/clearpasspy/default.nix +++ b/python/pkgs/clearpasspy/default.nix @@ -6,13 +6,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "clearpasspy"; version = "1.1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-HAi9z7DT5g0Pkr+rASUK18/tEsorWXScCODE95Q+ZZ0="; }; @@ -25,7 +25,6 @@ buildPythonPackage rec { dependencies = [ requests ]; # Package has no tests - doCheck = false; pythonImportsCheck = [ "clearpasspy" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/zemerick1/clearpasspy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cleo/default.nix b/python/pkgs/cleo/default.nix index 06654df2a..bea9a750b 100644 --- a/python/pkgs/cleo/default.nix +++ b/python/pkgs/cleo/default.nix @@ -7,7 +7,7 @@ rapidfuzz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cleo"; version = "2.2.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-poetry"; repo = "cleo"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+OvE09hbF6McdXpXdv5UBdZ0LiSOTL8xyE/+bBNIFNk="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "rapidfuzz" ]; - propagatedBuildInputs = [ + dependencies = [ crashtest rapidfuzz ]; @@ -41,4 +41,4 @@ buildPythonPackage rec { description = "Allows you to create beautiful and testable command-line interfaces"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/clf/default.nix b/python/pkgs/clf/default.nix index 682cd6433..ed9daabec 100644 --- a/python/pkgs/clf/default.nix +++ b/python/pkgs/clf/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "0.5.7"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-q8kZoemWZ/Mv3eFd+0vFJ9viLPhqF6y3ikSdfy3+k34="; @@ -34,7 +32,6 @@ buildPythonPackage (finalAttrs: { # Error when running tests: # No local packages or download links found for requests - doCheck = false; pythonImportsCheck = [ "clf" ]; diff --git a/python/pkgs/cli-helpers/default.nix b/python/pkgs/cli-helpers/default.nix index b112d4ce5..7e4ee5474 100644 --- a/python/pkgs/cli-helpers/default.nix +++ b/python/pkgs/cli-helpers/default.nix @@ -7,14 +7,14 @@ tabulate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cli-helpers"; version = "2.15.1"; pyproject = true; src = fetchPypi { pname = "cli_helpers"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-6cCCbdooVXRetjs/2OM7asiIEYjyupHlGlFu2DP8DLg="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://cli-helpers.readthedocs.io/en/stable/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cli-ui/default.nix b/python/pkgs/cli-ui/default.nix index 2e4ede5f5..ea9b8098c 100644 --- a/python/pkgs/cli-ui/default.nix +++ b/python/pkgs/cli-ui/default.nix @@ -8,7 +8,7 @@ unidecode, buildPythonPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cli-ui"; version = "0.19.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "your-tools"; repo = "python-cli-ui"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BLc55LkVQwZ18V/fD/lBYw6jgchE8n0ijDTSr8/Jkdk="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/your-tools/python-cli-ui"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cliche/default.nix b/python/pkgs/cliche/default.nix index baea5b119..bde7b1d91 100644 --- a/python/pkgs/cliche/default.nix +++ b/python/pkgs/cliche/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, ipdb, pytestCheckHook, }: @@ -9,7 +11,7 @@ buildPythonPackage { pname = "cliche"; version = "0.10.108"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "kootenpv"; @@ -18,12 +20,14 @@ buildPythonPackage { sha256 = "sha256-7/icSneLQzwdkRL/mS4RjsgnKa6YIVvGCmdS6pB6r5Y="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace "ipdb == 0.13.9" "ipdb" ''; - propagatedBuildInputs = [ ipdb ]; + dependencies = [ ipdb ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/python/pkgs/click-completion/default.nix b/python/pkgs/click-completion/default.nix index 39d48b828..2f3ed52c1 100644 --- a/python/pkgs/click-completion/default.nix +++ b/python/pkgs/click-completion/default.nix @@ -9,13 +9,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-completion"; version = "0.5.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-W/gWuBNn5jihkLbpG1B3kAfRQwGz+fMUXWjjyt57zoY="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/click-contrib/click-completion"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/click-configfile/default.nix b/python/pkgs/click-configfile/default.nix index f46909df1..7bd14e03c 100644 --- a/python/pkgs/click-configfile/default.nix +++ b/python/pkgs/click-configfile/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "0.2.3"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "click-configfile"; inherit (finalAttrs) version; diff --git a/python/pkgs/click-datetime/default.nix b/python/pkgs/click-datetime/default.nix index a8238444c..641e99b5d 100644 --- a/python/pkgs/click-datetime/default.nix +++ b/python/pkgs/click-datetime/default.nix @@ -6,14 +6,14 @@ click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-datetime"; version = "0.4.0"; pyproject = true; src = fetchPypi { pname = "click_datetime"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-nzXtP6sT9VMiHOjFqJXlGF1zYJk8Ud1/hii5tPY2kws="; }; @@ -24,7 +24,6 @@ buildPythonPackage rec { dependencies = [ click ]; # no tests - doCheck = false; pythonImportsCheck = [ "click_datetime" ]; @@ -33,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/click-contrib/click-datetime"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/click-default-group/default.nix b/python/pkgs/click-default-group/default.nix index 26f712224..e7f0d442d 100644 --- a/python/pkgs/click-default-group/default.nix +++ b/python/pkgs/click-default-group/default.nix @@ -6,14 +6,14 @@ click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-default-group"; version = "1.2.4"; pyproject = true; src = fetchPypi { pname = "click_default_group"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-6z88mewNRWymzSp/CPfU6RdxvvUbAb3ZWAzGRQ/hJR4="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/click-contrib/click-default-group"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/click-didyoumean/default.nix b/python/pkgs/click-didyoumean/default.nix index ef817bc6d..70bce3c46 100644 --- a/python/pkgs/click-didyoumean/default.nix +++ b/python/pkgs/click-didyoumean/default.nix @@ -6,7 +6,7 @@ click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-didyoumean"; version = "0.3.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "click-contrib"; repo = "click-didyoumean"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-C8OrJUfBFiDM/Jnf1iJo8pGEd0tUhar1vu4fVIfGzq8="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/click-contrib/click-didyoumean"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/click-help-colors/default.nix b/python/pkgs/click-help-colors/default.nix index ac40baa02..297502d8d 100644 --- a/python/pkgs/click-help-colors/default.nix +++ b/python/pkgs/click-help-colors/default.nix @@ -6,13 +6,13 @@ click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-help-colors"; version = "0.9.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-9Mq+Us9VApm4iI9PLuTF81msJ+M7z+TWHbR3haXMk2w="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/click-contrib/click-help-colors"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/click-log/default.nix b/python/pkgs/click-log/default.nix index 1e372d393..be7aec21c 100644 --- a/python/pkgs/click-log/default.nix +++ b/python/pkgs/click-log/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-log"; version = "0.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OXD4VwrFRJEje82z2KtePu9sBX3yn4w9EVGlGpwjuXU="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/click-contrib/click-log"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/click-odoo/default.nix b/python/pkgs/click-odoo/default.nix index ca1c19cfa..1109a0197 100644 --- a/python/pkgs/click-odoo/default.nix +++ b/python/pkgs/click-odoo/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-odoo"; version = "1.8.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "acsone"; repo = "click-odoo"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dUTAu02iSA0YvF/nQYOyb5gzbT8zMedXXwU7yONBrl4="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/acsone/click-odoo"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/click-option-group/default.nix b/python/pkgs/click-option-group/default.nix index e99cd6e08..c757fc49a 100644 --- a/python/pkgs/click-option-group/default.nix +++ b/python/pkgs/click-option-group/default.nix @@ -7,7 +7,7 @@ click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-option-group"; version = "0.5.9"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "click-contrib"; repo = "click-option-group"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ASzX80aZB3SQqz8AgDTJTE1jgY+MgA0P5yTW9m6+Ovk="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/click-contrib/click-option-group"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/click-plugins/default.nix b/python/pkgs/click-plugins/default.nix index a1d8a4170..02da234e1 100644 --- a/python/pkgs/click-plugins/default.nix +++ b/python/pkgs/click-plugins/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-plugins"; version = "1.1.1.2"; pyproject = true; src = fetchPypi { pname = "click_plugins"; - inherit version; + inherit (finalAttrs) version; sha256 = "sha256-1685hKmdJDwTGqGoKDMedjD0qIqXQf0FySeyBLz5ImE="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/click-contrib/click-plugins"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/click-repl/default.nix b/python/pkgs/click-repl/default.nix index 884755270..6e1092e8a 100644 --- a/python/pkgs/click-repl/default.nix +++ b/python/pkgs/click-repl/default.nix @@ -8,7 +8,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-repl"; version = "0.3.0"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "click-contrib"; repo = "click-repl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xCT3w0DDY73dtDL5jbssXM05Zlr44OOcy4vexgHyWiE="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ click prompt-toolkit six @@ -35,4 +35,4 @@ buildPythonPackage rec { description = "Subcommand REPL for click apps"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/click-spinner/default.nix b/python/pkgs/click-spinner/default.nix index ee7816273..a8356e341 100644 --- a/python/pkgs/click-spinner/default.nix +++ b/python/pkgs/click-spinner/default.nix @@ -6,14 +6,14 @@ versioneer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-spinner"; version = "0.1.10"; pyproject = true; src = fetchPypi { pname = "click-spinner"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-h+rPnXKYlzol12Fe9X1Hgq6/kTpTK7pLKKN+Nm6XXa8="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/click-contrib/click-spinner"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/click-threading/default.nix b/python/pkgs/click-threading/default.nix index b98493591..49d304d2d 100644 --- a/python/pkgs/click-threading/default.nix +++ b/python/pkgs/click-threading/default.nix @@ -6,13 +6,13 @@ click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click-threading"; version = "0.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rc/mI8AqWVwQfDFAcvZ6Inj+TrQLcsDRoskDzHivNDk="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/click-contrib/click-threading/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/click/default.nix b/python/pkgs/click/default.nix index 8ac574de0..9aa5dd3ff 100644 --- a/python/pkgs/click/default.nix +++ b/python/pkgs/click/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "click"; version = "8.5.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pallets"; repo = "click"; - tag = version; + tag = finalAttrs.version; hash = "sha256-VYdaEN9l2MRVz42I8t8IDOpG5XeDM8bf34dLZy3yf10="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { ''; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/clickclick/default.nix b/python/pkgs/clickclick/default.nix index 9620fe188..ee962d272 100644 --- a/python/pkgs/clickclick/default.nix +++ b/python/pkgs/clickclick/default.nix @@ -10,7 +10,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "clickclick"; version = "20.10.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromCodeberg { owner = "hjacobs"; repo = "python-clickclick"; - rev = version; + tag = finalAttrs.version; hash = "sha256-gefU6CI4ibtvonsaKZmuffuUNUioBn5ODs72BI5zXOw="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://codeberg.org/hjacobs/python-clickclick/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/clickhouse-cityhash/default.nix b/python/pkgs/clickhouse-cityhash/default.nix index c181ae5cc..e14d74c2c 100644 --- a/python/pkgs/clickhouse-cityhash/default.nix +++ b/python/pkgs/clickhouse-cityhash/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "clickhouse-cityhash"; version = "1.0.2.6"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "clickhouse_cityhash"; hash = "sha256-Yq9sraxmVWE3cGZKsmgCjlyLcvyXgrMMD12HJK9Sx78="; }; @@ -28,8 +28,6 @@ buildPythonPackage rec { --replace-fail "Cython>=3.0,<3.1" "Cython>=3.0" ''; - doCheck = false; - pythonImportsCheck = [ "clickhouse_cityhash" ]; meta = { @@ -37,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/xzkostyan/python-cityhash"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/clickhouse-cli/default.nix b/python/pkgs/clickhouse-cli/default.nix index 6f0f06926..5d9424d2d 100644 --- a/python/pkgs/clickhouse-cli/default.nix +++ b/python/pkgs/clickhouse-cli/default.nix @@ -10,13 +10,13 @@ sqlparse, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "clickhouse-cli"; version = "0.3.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gkgLAedUtzGv/4P+D56M2Pb5YecyqyVYp06ST62sjdY="; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "sqlparse" ]; - propagatedBuildInputs = [ + dependencies = [ click prompt-toolkit pygments @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/hatarist/clickhouse-cli"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/clickhouse-connect/default.nix b/python/pkgs/clickhouse-connect/default.nix index 2a3386137..59cee0542 100644 --- a/python/pkgs/clickhouse-connect/default.nix +++ b/python/pkgs/clickhouse-connect/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, cython, # install_requires certifi, @@ -19,24 +21,26 @@ # not in tests_require, but should be pytest-dotenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "clickhouse-connect"; version = "1.8.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { repo = "clickhouse-connect"; owner = "ClickHouse"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CtFOHy/pBtjRx2alKfYSipHsaDEht7xPig0J5yxQvoQ="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ cython ]; setupPyBuildFlags = [ "--inplace" ]; enableParallelBuilding = true; - propagatedBuildInputs = [ + dependencies = [ certifi importlib-metadata numpy @@ -66,4 +70,4 @@ buildPythonPackage rec { homepage = "https://github.com/ClickHouse/clickhouse-connect"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/clickhouse-driver/default.nix b/python/pkgs/clickhouse-driver/default.nix index 103d96331..7503f903c 100644 --- a/python/pkgs/clickhouse-driver/default.nix +++ b/python/pkgs/clickhouse-driver/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "0.2.11"; pyproject = true; - __structuredAttrs = true; - # pypi source doesn't contain tests src = fetchFromGitHub { owner = "mymarilyn"; @@ -51,7 +49,6 @@ buildPythonPackage (finalAttrs: { # some test in test_buffered_reader.py doesn't seem to return # most tests require `clickhouse` # TODO: enable tests after `clickhouse` unbroken - doCheck = false; pythonImportsCheck = [ "clickhouse_driver" ]; diff --git a/python/pkgs/cliff/default.nix b/python/pkgs/cliff/default.nix index 31893ddb4..2fe9956d5 100644 --- a/python/pkgs/cliff/default.nix +++ b/python/pkgs/cliff/default.nix @@ -12,13 +12,13 @@ sphinxHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cliff"; version = "4.15.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7KaZ9rOQx1Xm7RgWp2zfwav19e99HO4Z84M2Z6Oh/jk="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/cliff"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cligj/default.nix b/python/pkgs/cligj/default.nix index bb1f9130a..d15dc140e 100644 --- a/python/pkgs/cligj/default.nix +++ b/python/pkgs/cligj/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "0.7.2"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "mapbox"; repo = "cligj"; diff --git a/python/pkgs/clikit/default.nix b/python/pkgs/clikit/default.nix index 966130052..c247f46eb 100644 --- a/python/pkgs/clikit/default.nix +++ b/python/pkgs/clikit/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "clikit"; version = "0.6.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sdispater"; repo = "clikit"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xAsUNhVQBjtSFHyjjnicAKRC3+Tdn3AdGDUYhmOOIdA="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/sdispater/clikit"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/clint/default.nix b/python/pkgs/clint/default.nix index 5c0fd5aa8..68350f1eb 100644 --- a/python/pkgs/clint/default.nix +++ b/python/pkgs/clint/default.nix @@ -6,13 +6,13 @@ args, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "clint"; version = "0.5.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BSJMMrEHVWPQsW0AFfqvnaQ6ohTkohQOUfCHieekxao="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/kennethreitz/clint"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/clintermission/default.nix b/python/pkgs/clintermission/default.nix index eb5a6a6d8..9835511f1 100644 --- a/python/pkgs/clintermission/default.nix +++ b/python/pkgs/clintermission/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.3.1"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "sebageek"; repo = "clintermission"; @@ -25,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ prompt-toolkit ]; # repo contains no tests - doCheck = false; pythonImportsCheck = [ "clintermission" ]; diff --git a/python/pkgs/cloudflare/default.nix b/python/pkgs/cloudflare/default.nix index 95be18fad..a7977790e 100644 --- a/python/pkgs/cloudflare/default.nix +++ b/python/pkgs/cloudflare/default.nix @@ -12,13 +12,13 @@ hatch-fancy-pypi-readme, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cloudflare"; version = "5.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-DKL7YBfoB3vXmCEdJQWqLK0Yai2sFKIKrle4/+Q/s4s="; }; @@ -42,7 +42,6 @@ buildPythonPackage rec { ]; # tests require networking - doCheck = false; pythonImportsCheck = [ "cloudflare" ]; @@ -51,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/cloudflare/cloudflare-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cloudpathlib/default.nix b/python/pkgs/cloudpathlib/default.nix index 9d047ea4e..3e43c58de 100644 --- a/python/pkgs/cloudpathlib/default.nix +++ b/python/pkgs/cloudpathlib/default.nix @@ -24,7 +24,7 @@ tenacity, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cloudpathlib"; version = "0.25.0"; pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "drivendataorg"; repo = "cloudpathlib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HgAqUWvFNv7UKhOfeN6nZaU9NyYCyKYCaSiLWtEJFEw="; }; @@ -46,7 +46,10 @@ buildPythonPackage rec { build-system = [ flit-core ]; optional-dependencies = { - all = optional-dependencies.azure ++ optional-dependencies.gs ++ optional-dependencies.s3; + all = + finalAttrs.optional-dependencies.azure + ++ finalAttrs.optional-dependencies.gs + ++ finalAttrs.optional-dependencies.s3; azure = [ azure-storage-blob azure-storage-file-datalake @@ -61,4 +64,4 @@ buildPythonPackage rec { homepage = "https://github.com/drivendataorg/cloudpathlib"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cloudpickle/default.nix b/python/pkgs/cloudpickle/default.nix index 174500de5..1bd5292d6 100644 --- a/python/pkgs/cloudpickle/default.nix +++ b/python/pkgs/cloudpickle/default.nix @@ -7,7 +7,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cloudpickle"; version = "3.1.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cloudpipe"; repo = "cloudpickle"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BsCOEpNCNqq8PS+SdbzF1wq0LXEmtcHJs0pdt2qFw/w="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/cloudpipe/cloudpickle"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cloudscraper/default.nix b/python/pkgs/cloudscraper/default.nix index e5fa3eafd..1ff30870d 100644 --- a/python/pkgs/cloudscraper/default.nix +++ b/python/pkgs/cloudscraper/default.nix @@ -8,13 +8,13 @@ pyparsing, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cloudscraper"; version = "1.2.71"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QpxuiqaRbVutXIperFDz6lPJrCJhb2yyGxjcxxUX0NM="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/venomous/cloudscraper"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cloudsmith-api/default.nix b/python/pkgs/cloudsmith-api/default.nix index 3f47a2e4b..65772b238 100644 --- a/python/pkgs/cloudsmith-api/default.nix +++ b/python/pkgs/cloudsmith-api/default.nix @@ -8,18 +8,19 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cloudsmith-api"; version = "2.0.23"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; - inherit format version; + inherit (finalAttrs) version; + format = "wheel"; hash = "sha256-CfNgISONtTrabCoNUzHbMMVKDwGj8fdmSwh1FfzH10g="; }; - propagatedBuildInputs = [ + dependencies = [ certifi python-dateutil six @@ -27,7 +28,6 @@ buildPythonPackage rec { ]; # Wheels have no tests - doCheck = false; pythonImportsCheck = [ "cloudsmith_api" ]; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/cloudsmith-io/cloudsmith-api"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cloudsplaining/default.nix b/python/pkgs/cloudsplaining/default.nix index 457518bf5..d7b92c8fb 100644 --- a/python/pkgs/cloudsplaining/default.nix +++ b/python/pkgs/cloudsplaining/default.nix @@ -15,7 +15,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cloudsplaining"; version = "0.8.2"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "salesforce"; repo = "cloudsplaining"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Abp/uvH1IYO/rb2o+7uI0Ef6q7K6T0kN1mo+Qit438E="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "cloudsplaining"; }; -} +}) diff --git a/python/pkgs/cloup/default.nix b/python/pkgs/cloup/default.nix index 1fec20778..cc8a96ea1 100644 --- a/python/pkgs/cloup/default.nix +++ b/python/pkgs/cloup/default.nix @@ -6,16 +6,21 @@ click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cloup"; version = "3.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Y3weYo/pjz8gpeRNpZGnK0K/VNfUUnGQvzntX2SvdYU="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "setuptools_scm<10" "setuptools_scm" + ''; + build-system = [ setuptools-scm ]; dependencies = [ click ]; @@ -27,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/janLuke/cloup"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cma/default.nix b/python/pkgs/cma/default.nix index 1d4ca7dc3..cc6df9d42 100644 --- a/python/pkgs/cma/default.nix +++ b/python/pkgs/cma/default.nix @@ -13,7 +13,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cma"; version = "4.4.4"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CMA-ES"; repo = "pycma"; - tag = "r${version}"; + tag = "r${finalAttrs.version}"; hash = "sha256-GQ4aXkfohVAeMjyf24g37ExhDrGSi6ZVXGhw6NYEAuk="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/CMA-ES/pycma"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cmaes/default.nix b/python/pkgs/cmaes/default.nix index f2c029d0d..3db7f5f1c 100644 --- a/python/pkgs/cmaes/default.nix +++ b/python/pkgs/cmaes/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cmaes"; version = "0.13.1"; pyproject = true; @@ -14,17 +14,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CyberAgentAILab"; repo = "cmaes"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GzBAymSb6frMXvHtd1Xl5gK62pYuXKd3XU9TLhe+sJ4="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; pythonImportsCheck = [ "cmaes" ]; meta = { description = "Python library for CMA evolution strategy"; homepage = "https://github.com/CyberAgentAILab/cmaes"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cmake-build-extension/default.nix b/python/pkgs/cmake-build-extension/default.nix index 0cf2b73d1..bddbd09e7 100644 --- a/python/pkgs/cmake-build-extension/default.nix +++ b/python/pkgs/cmake-build-extension/default.nix @@ -9,7 +9,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cmake-build-extension"; version = "0.6.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "diegoferigo"; repo = "cmake-build-extension"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-taAwxa7Sv+xc8xJRnNM6V7WPcL+TWZOkngwuqjAslzc="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/diegoferigo/cmake-build-extension"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cmarkgfm/default.nix b/python/pkgs/cmarkgfm/default.nix index 4722e80d9..909435d32 100644 --- a/python/pkgs/cmarkgfm/default.nix +++ b/python/pkgs/cmarkgfm/default.nix @@ -3,22 +3,26 @@ buildPythonPackage, cffi, fetchPypi, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cmarkgfm"; version = "2025.10.22"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-W+xhAHtluRlIhELIOMWKbIv0dB9RA8WTsu8YDTmBjto="; }; + build-system = [ setuptools ]; + propagatedNativeBuildInputs = [ cffi ]; - propagatedBuildInputs = [ cffi ]; + dependencies = [ cffi ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -29,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/jonparrott/cmarkgfm"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cmd2/default.nix b/python/pkgs/cmd2/default.nix index bdadf87fd..77b925e88 100644 --- a/python/pkgs/cmd2/default.nix +++ b/python/pkgs/cmd2/default.nix @@ -11,13 +11,13 @@ wcwidth, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cmd2"; version = "3.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bGNyobJs0Uu2IJZTyJ1zAP58FDno3KMPW2tv/bXyFPo="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-cmd2/cmd2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cmdline/default.nix b/python/pkgs/cmdline/default.nix index 797bb2416..e60abf057 100644 --- a/python/pkgs/cmdline/default.nix +++ b/python/pkgs/cmdline/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.2.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-fPavU1SYkrIhjC9WoZnf9UpzO+XFUVwP1iaBIHCwqGo="; @@ -21,7 +19,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # No tests, https://github.com/rca/cmdline/issues/1 - doCheck = false; dependencies = [ pyyaml ]; pythonImportsCheck = [ "cmdline" ]; diff --git a/python/pkgs/cmsdials/default.nix b/python/pkgs/cmsdials/default.nix index f70d8f21a..349eec7cf 100644 --- a/python/pkgs/cmsdials/default.nix +++ b/python/pkgs/cmsdials/default.nix @@ -10,7 +10,7 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cmsdials"; version = "1.5.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cms-DQM"; repo = "dials-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bYFADE6Fi0hQ0IaaeN3RhtPPQwWqhhRbNyGOUPLksp4="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/cms-DQM/dials-py"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/cmsis-pack-manager/default.nix b/python/pkgs/cmsis-pack-manager/default.nix index 41a6a5823..973e419fc 100644 --- a/python/pkgs/cmsis-pack-manager/default.nix +++ b/python/pkgs/cmsis-pack-manager/default.nix @@ -9,7 +9,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cmsis-pack-manager"; version = "0.6.0"; pyproject = true; @@ -17,12 +17,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyocd"; repo = "cmsis-pack-manager"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kb0VSg89qglL6Q5kx1nEN1OW1GYoccBTITtPw2/dXTY="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit (finalAttrs) src; hash = "sha256-yRNSFlEwFhfkSNjbFHipVZvJZ40pKbI9HhLtciws7nc="; }; @@ -34,7 +34,7 @@ buildPythonPackage rec { buildInputs = [ libiconv ]; - propagatedBuildInputs = [ + dependencies = [ appdirs pyyaml ]; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyocd/cmsis-pack-manager"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cmsis-svd/default.nix b/python/pkgs/cmsis-svd/default.nix index fd85a014a..8e983e1ee 100644 --- a/python/pkgs/cmsis-svd/default.nix +++ b/python/pkgs/cmsis-svd/default.nix @@ -7,7 +7,7 @@ lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cmsis-svd"; version = "0.6"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cmsis-svd"; repo = "cmsis-svd"; - tag = "python-${version}"; + tag = "python-${finalAttrs.version}"; hash = "sha256-fx9eR9/Nw/oxPaP9rm1G6sjGI7iU4bhkmTS7f8i2RrQ="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/cmsis-svd/cmsis-svd"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cmudict/default.nix b/python/pkgs/cmudict/default.nix index cabef2f14..07317374d 100644 --- a/python/pkgs/cmudict/default.nix +++ b/python/pkgs/cmudict/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "1.1.3"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "prosegrinder"; repo = "python-cmudict"; diff --git a/python/pkgs/co2signal/default.nix b/python/pkgs/co2signal/default.nix index 7dbd6092e..038f12616 100644 --- a/python/pkgs/co2signal/default.nix +++ b/python/pkgs/co2signal/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.4.2"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) version; pname = "CO2Signal"; @@ -23,7 +21,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ requests ]; # Modules has no tests - doCheck = false; pythonImportsCheck = [ "CO2Signal" ]; diff --git a/python/pkgs/coapthon3/default.nix b/python/pkgs/coapthon3/default.nix index bf3bf257e..6961e67fb 100644 --- a/python/pkgs/coapthon3/default.nix +++ b/python/pkgs/coapthon3/default.nix @@ -2,30 +2,33 @@ buildPythonPackage, cachetools, fetchFromGitHub, + # build-system + setuptools, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "coapthon3"; version = "1.0.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Tanganelli"; repo = "CoAPthon3"; - rev = version; + tag = finalAttrs.version; hash = "sha256-9QApoPUu3XFZY/lgjAsf5r2StFiRtUd1UXWDrzYUh6w="; }; - propagatedBuildInputs = [ cachetools ]; + build-system = [ setuptools ]; + + dependencies = [ cachetools ]; # tests take in the order of 10 minutes to execute and sometimes hang forever on tear-down - doCheck = false; pythonImportsCheck = [ "coapthon" ]; meta = { - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "Python3 library to the CoAP protocol compliant with the RFC"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cobble/default.nix b/python/pkgs/cobble/default.nix index cb7b54e84..ab1db61d7 100644 --- a/python/pkgs/cobble/default.nix +++ b/python/pkgs/cobble/default.nix @@ -6,7 +6,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cobble"; version = "0.1.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mwilliamson"; repo = "python-cobble"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xi6cCSUnMYc5Tp6+TQlC9Oo9kpam5C7QGCul/IoTW1k="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/mwilliamson/python-cobble"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/cobs/default.nix b/python/pkgs/cobs/default.nix index 25b401d08..cc98805d8 100644 --- a/python/pkgs/cobs/default.nix +++ b/python/pkgs/cobs/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cobs"; version = "1.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-291eMhEdcnhvg9DCaSFdzWrGKbGsGWLGh4Ih87LKmNo="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/cmcqueen/cobs-python/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cock/default.nix b/python/pkgs/cock/default.nix index 7344a660f..e3e16c8ac 100644 --- a/python/pkgs/cock/default.nix +++ b/python/pkgs/cock/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "0.11.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-Hi8aFxATsYcEO6qNzZnF73V8WLTQjb6Dw2xF4VgT2o4="; diff --git a/python/pkgs/cocotb-bus/default.nix b/python/pkgs/cocotb-bus/default.nix index c36189671..c1d153156 100644 --- a/python/pkgs/cocotb-bus/default.nix +++ b/python/pkgs/cocotb-bus/default.nix @@ -2,12 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: buildPythonPackage { pname = "cocotb-bus"; version = "unstable-2025-11-03"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "cocotb"; @@ -16,8 +18,14 @@ buildPythonPackage { hash = "sha256-4j63kOjBd+iLA2EYqLTM0oKzKksOjH2UqNgDNFvWgYw="; }; + pythonRemoveDeps = [ + "cocotb" + "scapy" + ]; + + build-system = [ setuptools ]; + # tests require cocotb, disable for now to avoid circular dependency - doCheck = false; # checkPhase = '' # export PATH=$out/bin:$PATH diff --git a/python/pkgs/cocotb/default.nix b/python/pkgs/cocotb/default.nix index 221bb7502..e98232248 100644 --- a/python/pkgs/cocotb/default.nix +++ b/python/pkgs/cocotb/default.nix @@ -12,10 +12,10 @@ stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cocotb"; version = "2.1.0"; - format = "setuptools"; + pyproject = true; # RuntimeError: cocotb 2.0.1 only supports a maximum Python version of 3.13. # You can suppress this error by defining the environment variable COCOTB_IGNORE_PYTHON_REQUIRES @@ -26,14 +26,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cocotb"; repo = "cocotb"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MND6d+5ymlGT597kt6rWN9ylmoGvexIylzsgjY0NRe8="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ find-libpython pytest ]; @@ -70,4 +72,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/python/pkgs/cogapp/default.nix b/python/pkgs/cogapp/default.nix index c89ef2a13..cc45e3cb6 100644 --- a/python/pkgs/cogapp/default.nix +++ b/python/pkgs/cogapp/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cogapp"; version = "3.6.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nedbat"; repo = "cog"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-46ojLTu1elNcjmWSKJuGKDG4XETLLnJDIpL2Al6/aX0="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Code generator for executing Python snippets in source files"; homepage = "https://nedbatchelder.com/code/cog"; - changelog = "https://github.com/nedbat/cog/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/nedbat/cog/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cohere/default.nix b/python/pkgs/cohere/default.nix index 969e4f4a8..ccdc7318e 100644 --- a/python/pkgs/cohere/default.nix +++ b/python/pkgs/cohere/default.nix @@ -22,7 +22,7 @@ oci, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cohere"; version = "7.1.0"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7dkU2M9v7JbQU9OMUQA1yLzbCmRPuOzUmB6KBpO7EG0="; }; @@ -60,7 +60,6 @@ buildPythonPackage rec { }; # tests require CO_API_KEY - doCheck = false; pythonImportsCheck = [ "cohere" ]; @@ -69,4 +68,4 @@ buildPythonPackage rec { homepage = "https://docs.cohere.com/docs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/coinbase-advanced-py/default.nix b/python/pkgs/coinbase-advanced-py/default.nix index 7739a70a0..84831e658 100644 --- a/python/pkgs/coinbase-advanced-py/default.nix +++ b/python/pkgs/coinbase-advanced-py/default.nix @@ -13,7 +13,7 @@ requests-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "coinbase-advanced-py"; version = "1.8.4"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "coinbase"; repo = "coinbase-advanced-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kr2S6oB5H/SpmZgcK+dAJyMijp5OdxLszTbc6yAcX6I="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { homepage = "https://github.com/coinbase/coinbase-advanced-py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/coincidence/default.nix b/python/pkgs/coincidence/default.nix index d9edbecd7..0a6cd1e62 100644 --- a/python/pkgs/coincidence/default.nix +++ b/python/pkgs/coincidence/default.nix @@ -6,7 +6,7 @@ whey, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "coincidence"; version = "0.6.6"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-coincidence"; repo = "coincidence"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ktSuUzAwMych6Y2eJWMUfG1a3mGypg8L20f/105RFXc="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-coincidence/coincidence"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/coincurve/default.nix b/python/pkgs/coincurve/default.nix index 0e41ad14b..77d984de9 100644 --- a/python/pkgs/coincurve/default.nix +++ b/python/pkgs/coincurve/default.nix @@ -18,7 +18,7 @@ pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "coincurve"; version = "21.0.0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ofek"; repo = "coincurve"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+8/CsV2BTKZ5O2LIh5/kOKMfFrkt2Jsjuj37oiOgO6Y="; }; @@ -69,4 +69,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/coinmetrics-api-client/default.nix b/python/pkgs/coinmetrics-api-client/default.nix index 74e447f75..4d56dd5a3 100644 --- a/python/pkgs/coinmetrics-api-client/default.nix +++ b/python/pkgs/coinmetrics-api-client/default.nix @@ -16,7 +16,7 @@ websocket-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "coinmetrics-api-client"; version = "2026.2.9.18"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "coinmetrics_api_client"; hash = "sha256-5R/Z/FItszcNAdwHkhzr/HWqQBbXsYf9Hub+HGdBEGo="; }; @@ -52,7 +52,7 @@ buildPythonPackage rec { pytestCheckHook pytest-mock ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; pythonImportsCheck = [ "coinmetrics.api_client" ]; @@ -62,4 +62,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "coinmetrics"; }; -} +}) diff --git a/python/pkgs/colander/default.nix b/python/pkgs/colander/default.nix index a288a6eac..2f8ba0b45 100644 --- a/python/pkgs/colander/default.nix +++ b/python/pkgs/colander/default.nix @@ -12,13 +12,13 @@ iso8601, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colander"; version = "2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QZzWgXjS7m7kyuXVyxgwclY0sKKECRcVbonrJZIjfvM="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/Pylons/colander"; license = lib.licenses.free; }; -} +}) diff --git a/python/pkgs/colanderalchemy/default.nix b/python/pkgs/colanderalchemy/default.nix index daa9a5371..35514f7e5 100644 --- a/python/pkgs/colanderalchemy/default.nix +++ b/python/pkgs/colanderalchemy/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "0.3.4"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) version; pname = "ColanderAlchemy"; @@ -28,7 +26,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests are not included in Pypi - doCheck = false; pythonImportsCheck = [ "colanderalchemy" ]; diff --git a/python/pkgs/collections-extended/default.nix b/python/pkgs/collections-extended/default.nix index c5859f1f4..c5693d282 100644 --- a/python/pkgs/collections-extended/default.nix +++ b/python/pkgs/collections-extended/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "collections-extended"; version = "2.0.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mlenzen"; repo = "collections-extended"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cK13+CQUELKSiLpG747+C+RB5b6luu0mWLLXTT+uGH4="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/mlenzen/collections-extended"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/color-matcher/default.nix b/python/pkgs/color-matcher/default.nix index 23f5d725c..a8095ce07 100644 --- a/python/pkgs/color-matcher/default.nix +++ b/python/pkgs/color-matcher/default.nix @@ -38,7 +38,6 @@ buildPythonPackage { ''; # Some tests are broken and many require internet access - doCheck = false; meta = { description = "Package enabling color transfer across images"; diff --git a/python/pkgs/colorama/default.nix b/python/pkgs/colorama/default.nix index 2de04a015..61418fd7e 100644 --- a/python/pkgs/colorama/default.nix +++ b/python/pkgs/colorama/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colorama"; version = "0.4.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/tartley/colorama"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/colorcet/default.nix b/python/pkgs/colorcet/default.nix index a7847e34c..60e968182 100644 --- a/python/pkgs/colorcet/default.nix +++ b/python/pkgs/colorcet/default.nix @@ -9,13 +9,13 @@ pytest-mpl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colorcet"; version = "3.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SNmmfm5Z3FwKllqhtG/l1Zzclcw2qVlJ8pMT+VCsWfc="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://colorcet.pyviz.org"; license = lib.licenses.cc-by-40; }; -} +}) diff --git a/python/pkgs/colorclass/default.nix b/python/pkgs/colorclass/default.nix index cd3253de5..431ae8ec0 100644 --- a/python/pkgs/colorclass/default.nix +++ b/python/pkgs/colorclass/default.nix @@ -5,13 +5,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colorclass"; version = "2.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bU/ih3ZhZqmMp7xvYxLa8EoEgbHtpD5xc0hAUcCrQ2Y="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/Robpol86/colorclass"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/colored-traceback/default.nix b/python/pkgs/colored-traceback/default.nix index e66e17b52..dc0dc4d23 100644 --- a/python/pkgs/colored-traceback/default.nix +++ b/python/pkgs/colored-traceback/default.nix @@ -6,13 +6,13 @@ pygments, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colored-traceback"; version = "0.4.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7LyOQfBxLqgZMdfNQ2uL658+/xWV0kmPGD4O9ptW/oQ="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "Automatically color Python's uncaught exception tracebacks"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/colored/default.nix b/python/pkgs/colored/default.nix index b35805e4f..212c7e13c 100644 --- a/python/pkgs/colored/default.nix +++ b/python/pkgs/colored/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colored"; version = "2.3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-1rfwc3pzLFTJKycfKTLJHjhiOMi23tSdQYDu1E61BoQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/dslackw/colored"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/coloredlogs/default.nix b/python/pkgs/coloredlogs/default.nix index 1a72d10c0..49766d943 100644 --- a/python/pkgs/coloredlogs/default.nix +++ b/python/pkgs/coloredlogs/default.nix @@ -6,13 +6,13 @@ humanfriendly, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "coloredlogs"; version = "15.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fJkapxpFd68vgmANj486ifk2uur5tQqcGX2gFOW/FrA="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/xolox/python-coloredlogs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/colorful/default.nix b/python/pkgs/colorful/default.nix index 68eed8372..99887cbd2 100644 --- a/python/pkgs/colorful/default.nix +++ b/python/pkgs/colorful/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colorful"; version = "0.5.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "timofurrer"; repo = "colorful"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nztVTfBimRDXwPYk3LNMZKa1ItbgqM2ukgZs8hI8TwE="; }; + + build-system = [ setuptools ]; pythonImportsCheck = [ "colorful" ]; passthru.updateScript = gitUpdater { @@ -30,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/timofurrer/colorful"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/colorlog/default.nix b/python/pkgs/colorlog/default.nix index 1889c4ae9..67e081661 100644 --- a/python/pkgs/colorlog/default.nix +++ b/python/pkgs/colorlog/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colorlog"; version = "6.12.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "borntyping"; repo = "python-colorlog"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-K7gxWg1OMSwcslrBvEyRIoGKSDOrlfiLmhxl8PbL/9g="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/borntyping/python-colorlog"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/colorlover/default.nix b/python/pkgs/colorlover/default.nix index f10a3a740..8c21312c7 100644 --- a/python/pkgs/colorlover/default.nix +++ b/python/pkgs/colorlover/default.nix @@ -5,20 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colorlover"; version = "0.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uPtyRqtG4fXmcVZJRTwXYuJFpRXeX/LStKq3puZ/pOI="; }; build-system = [ setuptools ]; # no tests included in distributed archive - doCheck = false; pythonImportsCheck = [ "colorlover" ]; @@ -27,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/plotly/colorlover"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/colormath/default.nix b/python/pkgs/colormath/default.nix index 2dfb12f1b..d6c03d41f 100644 --- a/python/pkgs/colormath/default.nix +++ b/python/pkgs/colormath/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colormath"; # Switch to unstable which fixes an deprecation issue with newer numpy # versions, should be included in versions > 3.0 @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/gtaylor/python-colormath"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/colormath2/default.nix b/python/pkgs/colormath2/default.nix index 758ae1f97..22d57d3cd 100644 --- a/python/pkgs/colormath2/default.nix +++ b/python/pkgs/colormath2/default.nix @@ -7,7 +7,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colormath2"; version = "3.0.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bkmgit"; repo = "python-colormath2"; - tag = version; + tag = finalAttrs.version; hash = "sha256-G8b0L8A2RzbVQFPNg2fuBklqTNjo3yqvek/+GnqtsHc="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/bkmgit/python-colormath2"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/colorscript/default.nix b/python/pkgs/colorscript/default.nix index b7f4e9e76..c1b8c9117 100644 --- a/python/pkgs/colorscript/default.nix +++ b/python/pkgs/colorscript/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "colorscript" ]; # Module has no tests - doCheck = false; meta = { description = "Module for functionality with text, escape codes, octal and hexadecimal codes, and other data"; diff --git a/python/pkgs/colorspacious/default.nix b/python/pkgs/colorspacious/default.nix index 1f26589e7..41cb0e80d 100644 --- a/python/pkgs/colorspacious/default.nix +++ b/python/pkgs/colorspacious/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "1.1.2"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-XpBy6M3KiJ2sRFw1yTYqIsz3WOl7ALef8NWnuj4Rthg="; diff --git a/python/pkgs/colorthief/default.nix b/python/pkgs/colorthief/default.nix index d2d1cb77a..11806efde 100644 --- a/python/pkgs/colorthief/default.nix +++ b/python/pkgs/colorthief/default.nix @@ -2,25 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colorthief"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "fengsp"; repo = "color-thief-py"; - rev = version; + tag = finalAttrs.version; sha256 = "0lzpflal1iqbj4k7hayss5z024qf2sn8c3wxw03a0mgxg06ca2hm"; }; - propagatedBuildInputs = [ pillow ]; + build-system = [ setuptools ]; + + dependencies = [ pillow ]; # no tests implemented - doCheck = false; pythonImportsCheck = [ "colorthief" ]; @@ -29,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/fengsp/color-thief-py"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/colorzero/default.nix b/python/pkgs/colorzero/default.nix index 5faeb103e..92f52e612 100644 --- a/python/pkgs/colorzero/default.nix +++ b/python/pkgs/colorzero/default.nix @@ -6,13 +6,13 @@ pkginfo, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colorzero"; version = "2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-59WlwmzQ3DexZOvvxgnziN4k+Fk7ZZGR4S2F+PnV61g="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/waveform80/colorzero"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/colour/default.nix b/python/pkgs/colour/default.nix index 0f3593a85..b789751fa 100644 --- a/python/pkgs/colour/default.nix +++ b/python/pkgs/colour/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colour"; version = "0.1.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ryASD+/Sr+3osAH77y6p2nCtfUn6/bZIkCXa6HRcOu4="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { description = "Converts and manipulates common color representation (RGB, HSV, web, ...)"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/colout/default.nix b/python/pkgs/colout/default.nix index d4af88f71..e44c10af5 100644 --- a/python/pkgs/colout/default.nix +++ b/python/pkgs/colout/default.nix @@ -3,25 +3,29 @@ babel, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pygments, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "colout"; version = "1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "nojhan"; repo = "colout"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7Dtf87erBElqVgqRx8BYHYOWv1uI84JJ0LHrcneczCI="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ babel pygments ]; @@ -29,7 +33,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "colout" ]; # This project does not have a unit test - doCheck = false; meta = { description = "Color Up Arbitrary Command Output"; @@ -37,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/nojhan/colout"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/columnize/default.nix b/python/pkgs/columnize/default.nix index 174e948f1..ccb374cdb 100644 --- a/python/pkgs/columnize/default.nix +++ b/python/pkgs/columnize/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "columnize"; version = "3.11"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rocky"; repo = "pycolumnize"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YJEIujoRpLvUM4H4CB1nEJaYStFOSVKIGzchnptlt7M="; }; @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Python module to align a simple (not nested) list in columns"; homepage = "https://github.com/rocky/pycolumnize"; - changelog = "https://github.com/rocky/pycolumnize/blob/${src.tag}/ChangeLog"; + changelog = "https://github.com/rocky/pycolumnize/blob/${finalAttrs.src.tag}/ChangeLog"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/comicon/default.nix b/python/pkgs/comicon/default.nix index a4a5215f2..9bc92b147 100644 --- a/python/pkgs/comicon/default.nix +++ b/python/pkgs/comicon/default.nix @@ -11,7 +11,7 @@ python-slugify, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "comicon"; version = "1.5.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "potatoeggy"; repo = "comicon"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-E5Jmk/dQcEuH7kq5RL80smHUuL/Sw0F1wk4V1/4sKSQ="; }; @@ -42,8 +42,6 @@ buildPythonPackage rec { "pypdf" ]; - doCheck = false; # test artifacts are not public - pythonImportsCheck = [ "comicon" ]; passthru.updateScript = nix-update-script { }; @@ -53,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/potatoeggy/comicon"; license = lib.licenses.agpl3Only; }; -} +}) diff --git a/python/pkgs/comm/default.nix b/python/pkgs/comm/default.nix index 0d716fa10..01d342513 100644 --- a/python/pkgs/comm/default.nix +++ b/python/pkgs/comm/default.nix @@ -6,7 +6,7 @@ traitlets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "comm"; version = "0.2.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ipython"; repo = "comm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gDggPu2h43lGyovTND9a3o9F2hWppV5uvAJa78JxJCo="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/ipython/comm"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/command-runner/default.nix b/python/pkgs/command-runner/default.nix index 05c780d2a..955ebcd5f 100644 --- a/python/pkgs/command-runner/default.nix +++ b/python/pkgs/command-runner/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "command_runner"; version = "1.7.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-raJ/6bZOYTxDfw61b064hoipeiNAKQOZ3/yB9kEhDMo="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/netinvent/command_runner"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/commandlines/default.nix b/python/pkgs/commandlines/default.nix index 177253218..553cfec20 100644 --- a/python/pkgs/commandlines/default.nix +++ b/python/pkgs/commandlines/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "commandlines"; version = "0.4.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chrissimpkins"; repo = "commandlines"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-x3iUeOTAaTKNW5Y5foMPMJcWVxu52uYZoY3Hhe3UvQ4="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/chrissimpkins/commandlines"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/commandparse/default.nix b/python/pkgs/commandparse/default.nix index e4b84258c..54e85769c 100644 --- a/python/pkgs/commandparse/default.nix +++ b/python/pkgs/commandparse/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "commandparse"; version = "1.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-S9e90BtS6qMjFtYUmgC0w4IKQP8q1iR2tGqq5l2+n6o="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/flgy/commandparse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/commentjson/default.nix b/python/pkgs/commentjson/default.nix index 47ade51ca..be9b0aecb 100644 --- a/python/pkgs/commentjson/default.nix +++ b/python/pkgs/commentjson/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, six, lark, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "commentjson"; version = "0.9.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "vaidik"; repo = "commentjson"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dPnIcv7TIeyG7rU938w7FrDklmaGuPpXz34uw/JjOgY="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace "lark-parser>=0.7.1,<0.8.0" "lark" @@ -26,7 +30,7 @@ buildPythonPackage rec { rm -r commentjson/tests/test_json ''; - propagatedBuildInputs = [ + dependencies = [ lark six ]; @@ -37,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/vaidik/commentjson/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/commonmark/default.nix b/python/pkgs/commonmark/default.nix index 2c5589224..ecb7a7db3 100644 --- a/python/pkgs/commonmark/default.nix +++ b/python/pkgs/commonmark/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "commonmark"; version = "0.9.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GU1pPgwaxJ6DwmRVve6ySDI15igDE8WLEdC3HBn1jtE="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "commonmark" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/readthedocs/commonmark.py"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/commonregex/default.nix b/python/pkgs/commonregex/default.nix index bb65b2046..0617c3c07 100644 --- a/python/pkgs/commonregex/default.nix +++ b/python/pkgs/commonregex/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "commonregex"; version = "1.5.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JxUwZ4rYr1PA6MIzp2JZeWnoRtACnxIhWsF4eR894KU="; }; @@ -22,4 +22,4 @@ buildPythonPackage rec { homepage = "https://github.com/madisonmay/CommonRegex"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/compit-inext-api/default.nix b/python/pkgs/compit-inext-api/default.nix index 6cf64c3e5..9b3ffb151 100644 --- a/python/pkgs/compit-inext-api/default.nix +++ b/python/pkgs/compit-inext-api/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "compit_inext_api" ]; # upstream has no tests - doCheck = false; meta = { description = "Python client for the Compit iNext API"; diff --git a/python/pkgs/complycube/default.nix b/python/pkgs/complycube/default.nix index 961cdd3d7..c4484b080 100644 --- a/python/pkgs/complycube/default.nix +++ b/python/pkgs/complycube/default.nix @@ -7,20 +7,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "complycube"; version = "1.1.8"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "complycube"; hash = "sha256-lN8J9QQ9YvclYzuXtck+lt1IgS5McOE1YU0NLl9rW0I="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyhumps requests ]; @@ -32,4 +32,4 @@ buildPythonPackage rec { description = "Official Python client for the ComplyCube API"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/compreffor/default.nix b/python/pkgs/compreffor/default.nix index 261677419..f635e0770 100644 --- a/python/pkgs/compreffor/default.nix +++ b/python/pkgs/compreffor/default.nix @@ -8,13 +8,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "compreffor"; version = "0.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fqA0pQxZzHhzLxSABA6sK7Nvgmzi62B8MCm104qxG6g="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/googlefonts/compreffor"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/concord232/default.nix b/python/pkgs/concord232/default.nix index 41630164a..50c588229 100644 --- a/python/pkgs/concord232/default.nix +++ b/python/pkgs/concord232/default.nix @@ -10,7 +10,7 @@ flask, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "concord232"; version = "0.15"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JasonCarter80"; repo = "concord232"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qMHFOKuNuk4Z/FDNRqh1nsnA5vCW+9YXGK6d7Td5O5s="; }; @@ -33,11 +33,10 @@ buildPythonPackage rec { ]; # Package has no tests - doCheck = false; meta = { description = "GE Concord 4 RS232 Serial Interface Library and Server"; homepage = "https://github.com/JasonCarter80/concord232"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/concurrent-log-handler/default.nix b/python/pkgs/concurrent-log-handler/default.nix index 3f81f3708..a517841cf 100644 --- a/python/pkgs/concurrent-log-handler/default.nix +++ b/python/pkgs/concurrent-log-handler/default.nix @@ -6,13 +6,13 @@ portalocker, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "concurrent_log_handler"; version = "0.9.29"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vDenbT84TL9KmPaT69dwVD7cD0zVxqtrxw6eHX1YImU="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/Preston-Landers/concurrent-log-handler"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/conda-inject/default.nix b/python/pkgs/conda-inject/default.nix index cc3b8528c..cd6133974 100644 --- a/python/pkgs/conda-inject/default.nix +++ b/python/pkgs/conda-inject/default.nix @@ -10,7 +10,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "conda-inject"; version = "1.3.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "koesterlab"; repo = "conda-inject"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-M4+bz7ZuHlcF8tF5kSCUjjkIHG75eCCW1IJxcwxNL6o="; }; @@ -35,11 +35,10 @@ buildPythonPackage rec { ]; # no tests - doCheck = false; meta = { description = "Helper functions for injecting a conda environment into the current python environment"; homepage = "https://github.com/koesterlab/conda-inject"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/conda-package-handling/default.nix b/python/pkgs/conda-package-handling/default.nix index 841feea65..4b7f90ddb 100644 --- a/python/pkgs/conda-package-handling/default.nix +++ b/python/pkgs/conda-package-handling/default.nix @@ -5,13 +5,13 @@ flit-core, conda-package-streaming, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "conda-package-handling"; version = "2.6.0"; src = fetchFromGitHub { owner = "conda"; repo = "conda-package-handling"; - tag = version; + tag = finalAttrs.version; hash = "sha256-VxnmG3ik6GJa/LiHqmyMVF/uBpx8JMCHBs7DVhC4gtU="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/conda/conda-package-handling"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/conda-package-streaming/default.nix b/python/pkgs/conda-package-streaming/default.nix index bb74ba19c..de64aa613 100644 --- a/python/pkgs/conda-package-streaming/default.nix +++ b/python/pkgs/conda-package-streaming/default.nix @@ -6,7 +6,7 @@ flit-core, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "conda-package-streaming"; version = "0.13.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "conda"; repo = "conda-package-streaming"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jrxp5f6rrrdvaT1Oq0l2j+k518LQ3zKi5ADMsKrYwXM="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/conda/conda-package-streaming"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/condense-json/default.nix b/python/pkgs/condense-json/default.nix index 70f237c6f..fcbd4a20b 100644 --- a/python/pkgs/condense-json/default.nix +++ b/python/pkgs/condense-json/default.nix @@ -5,7 +5,7 @@ setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "condense-json"; version = "1.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = "condense-json"; - tag = version; + tag = finalAttrs.version; hash = "sha256-IBYjDFhbQlZ/17nTo5FvJM7aeadKS5dW7J8IGy4956M="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/simonw/condense-json"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/configargparse/default.nix b/python/pkgs/configargparse/default.nix index c0eb04ade..70aa28f77 100644 --- a/python/pkgs/configargparse/default.nix +++ b/python/pkgs/configargparse/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "configargparse"; version = "1.7.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-YHvqJ2ohmRIVivoeWnFsP4+I1UL5mX39Q7vQtJKp9aY="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { description = "Drop-in replacement for argparse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/configclass/default.nix b/python/pkgs/configclass/default.nix index f08642f5f..dba6e9fdf 100644 --- a/python/pkgs/configclass/default.nix +++ b/python/pkgs/configclass/default.nix @@ -1,22 +1,26 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, mergedict, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "configclass"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aoDKBuDxJCeXbVwCXhse6FCbDDM30/Xa8p9qRvDkWBk="; }; - propagatedBuildInputs = [ mergedict ]; + build-system = [ setuptools ]; + + dependencies = [ mergedict ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -27,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/schettino72/configclass/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/confight/default.nix b/python/pkgs/confight/default.nix index 0eaa38d5f..0f5cf4437 100644 --- a/python/pkgs/confight/default.nix +++ b/python/pkgs/confight/default.nix @@ -6,28 +6,26 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "confight"; version = "2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iodoexnh9tG4dgkjDXCUzWRFDhRlJ3HRgaNhxG2lwPY="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ toml ]; + dependencies = [ toml ]; pythonImportsCheck = [ "confight" ]; - doCheck = false; - meta = { description = "Python context manager for managing pid files"; mainProgram = "confight"; homepage = "https://github.com/avature/confight"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/configobj/default.nix b/python/pkgs/configobj/default.nix index 1461d589d..e53756709 100644 --- a/python/pkgs/configobj/default.nix +++ b/python/pkgs/configobj/default.nix @@ -6,7 +6,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "configobj"; version = "5.0.9"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DiffSK"; repo = "configobj"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-duPCGBaHCXp4A6ZHLnyL1SZtR7K4FJ4hs5wCE1V9WB4="; }; @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Config file reading, writing and validation"; homepage = "https://github.com/DiffSK/configobj"; - changelog = "https://github.com/DiffSK/configobj/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/DiffSK/configobj/blob/v${finalAttrs.version}/CHANGES.rst"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/configparser/default.nix b/python/pkgs/configparser/default.nix index 5b5e29732..c3389d9fa 100644 --- a/python/pkgs/configparser/default.nix +++ b/python/pkgs/configparser/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "configparser"; version = "7.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tinMiukW46+9NtGz0JPzQZPYUeEZmJIP3PxFUiGLe3A="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/configparser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/configshell-fb/default.nix b/python/pkgs/configshell-fb/default.nix index 3de329c3c..39f37383e 100644 --- a/python/pkgs/configshell-fb/default.nix +++ b/python/pkgs/configshell-fb/default.nix @@ -7,7 +7,7 @@ pyparsing, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "configshell-fb"; version = "2.0.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "open-iscsi"; repo = "configshell-fb"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-q/Tx/9BBnxW6busbrigeesxNa5NvBgfKYDNeDquDTOc="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "configshell" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/open-iscsi/configshell-fb"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/configupdater/default.nix b/python/pkgs/configupdater/default.nix index b7a997683..c7c2a6b66 100644 --- a/python/pkgs/configupdater/default.nix +++ b/python/pkgs/configupdater/default.nix @@ -5,21 +5,19 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "configupdater"; version = "3.2"; pyproject = true; src = fetchPypi { pname = "ConfigUpdater"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-n9rFODHBsGKSm/OYtkm4fKMOfxpzXz+/SCBygEEGMGs="; }; build-system = [ setuptools-scm ]; - doCheck = false; - pythonImportsCheck = [ "configupdater" ]; meta = { @@ -30,4 +28,4 @@ buildPythonPackage rec { psfl ]; }; -} +}) diff --git a/python/pkgs/confluent-kafka/default.nix b/python/pkgs/confluent-kafka/default.nix index 634e36977..d82292ebd 100644 --- a/python/pkgs/confluent-kafka/default.nix +++ b/python/pkgs/confluent-kafka/default.nix @@ -25,7 +25,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "confluent-kafka"; version = "2.15.0"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "confluentinc"; repo = "confluent-kafka-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZKeIHfFSI4o2hXttveS8rclEH3wMkl8wJiy7HFjScww="; }; @@ -83,4 +83,4 @@ buildPythonPackage rec { homepage = "https://github.com/confluentinc/confluent-kafka-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/confusable-homoglyphs/default.nix b/python/pkgs/confusable-homoglyphs/default.nix index 572460e1e..13028fc43 100644 --- a/python/pkgs/confusable-homoglyphs/default.nix +++ b/python/pkgs/confusable-homoglyphs/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "confusable_homoglyphs"; version = "3.3.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uZUAHJsuG0zqDPXzhAp8eRiKjLutBT1pNXK9jBwexGA="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://sr.ht/~valhalla/confusable_homoglyphs/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/confuse/default.nix b/python/pkgs/confuse/default.nix index efe22a836..2836e38d3 100644 --- a/python/pkgs/confuse/default.nix +++ b/python/pkgs/confuse/default.nix @@ -7,13 +7,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "confuse"; version = "2.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jnYAwyYYUhIutfF7JLBquOVDeyHWIkhTwUIMOKxGnTw="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/beetbox/confuse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/conjure-python-client/default.nix b/python/pkgs/conjure-python-client/default.nix index a7a4dd5bd..3ca77031e 100644 --- a/python/pkgs/conjure-python-client/default.nix +++ b/python/pkgs/conjure-python-client/default.nix @@ -8,7 +8,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "3.3.0"; pname = "conjure-python-client"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "palantir"; repo = "conjure-python-client"; - tag = version; + tag = finalAttrs.version; hash = "sha256-z6+790fFpI7uYI6O4MXnCOZc/o96r2f8ttj+IsXStYI="; }; # https://github.com/palantir/conjure-python-client/blob/3.0.0/setup.py#L57 postPatch = '' - echo '__version__ = "${version}"' > ./conjure_python_client/_version.py + echo '__version__ = "${finalAttrs.version}"' > ./conjure_python_client/_version.py ''; build-system = [ setuptools ]; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/palantir/conjure-python-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/connect-box/default.nix b/python/pkgs/connect-box/default.nix index e04afe15a..653c5cc31 100644 --- a/python/pkgs/connect-box/default.nix +++ b/python/pkgs/connect-box/default.nix @@ -12,7 +12,7 @@ syrupy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "connect-box"; version = "0.4.0"; pyproject = true; @@ -20,13 +20,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-connect-box"; - tag = version; + tag = finalAttrs.version; hash = "sha256-zUvZRnxVzg9izvUbp7QVcyu6Bw3dUXHOr0kOQRWEZVc="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp attrs defusedxml @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-ecosystem/python-connect-box"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/connection-pool/default.nix b/python/pkgs/connection-pool/default.nix index 7881ae454..6a9d1738c 100644 --- a/python/pkgs/connection-pool/default.nix +++ b/python/pkgs/connection-pool/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "connection-pool"; version = "0.0.3"; pyproject = true; src = fetchPypi { pname = "connection_pool"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-v0Keeu9lkhxptO1I89SNPqwTg7BdLfkYhHBYQtl00Nw="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/zhouyl/ConnectionPool"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/connexion/default.nix b/python/pkgs/connexion/default.nix index d004bb087..014bcb6b3 100644 --- a/python/pkgs/connexion/default.nix +++ b/python/pkgs/connexion/default.nix @@ -31,7 +31,7 @@ testfixtures, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "connexion"; version = "3.3.0"; pyproject = true; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spec-first"; repo = "connexion"; - tag = version; + tag = finalAttrs.version; hash = "sha256-mUnot9kdUgpxMXjKnkRzK9Dp2c7ibJzv4qX61ZPuJHM="; }; @@ -73,4 +73,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "connexion"; }; -} +}) diff --git a/python/pkgs/cons/default.nix b/python/pkgs/cons/default.nix index 02d61a08b..1148c3a4a 100644 --- a/python/pkgs/cons/default.nix +++ b/python/pkgs/cons/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cons"; version = "0.4.7"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pythological"; repo = "python-cons"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BS7lThnv+dxtztvw2aRhQa8yx2cRfrZLiXjcwvZ8QR0="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/pythological/python-cons"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/consolekit/default.nix b/python/pkgs/consolekit/default.nix index 2b4c03ead..357386869 100644 --- a/python/pkgs/consolekit/default.nix +++ b/python/pkgs/consolekit/default.nix @@ -12,13 +12,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "consolekit"; version = "2.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-wlZ3zaYnI2jgOF4ozlkx/8TbH51H38i2dYdBmSgt7T4="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/domdfcoding/consolekit"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/constantly/default.nix b/python/pkgs/constantly/default.nix index 8cd067cb7..17814fe2a 100644 --- a/python/pkgs/constantly/default.nix +++ b/python/pkgs/constantly/default.nix @@ -6,13 +6,13 @@ versioneer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "constantly"; version = "23.10.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-qpK3CjPirAuzPNdF62F3ZZTcSHZLBsNeDv0FC38cfL0="; }; @@ -21,8 +21,6 @@ buildPythonPackage rec { versioneer ]; - doCheck = false; - pythonImportsCheck = [ "constantly" ]; meta = { @@ -30,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/constantly"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/construct-classes/default.nix b/python/pkgs/construct-classes/default.nix index 0fcf26148..f5ce475f6 100644 --- a/python/pkgs/construct-classes/default.nix +++ b/python/pkgs/construct-classes/default.nix @@ -6,7 +6,7 @@ fetchFromGitHub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "construct-classes"; version = "0.2.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matejcik"; repo = "construct-classes"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xRYf6Tg4XyQN+g8uOaws46KKb0abD/M/5Q+SlnzEp/8="; }; @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Parse your binary data into dataclasses"; homepage = "https://github.com/matejcik/construct-classes"; - changelog = "https://github.com/matejcik/construct-classes/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/matejcik/construct-classes/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/construct-typing/default.nix b/python/pkgs/construct-typing/default.nix index 009af6986..633235c69 100644 --- a/python/pkgs/construct-typing/default.nix +++ b/python/pkgs/construct-typing/default.nix @@ -14,7 +14,7 @@ ruamel-yaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "construct-typing"; version = "0.8.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timrid"; repo = "construct-typing"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yKk0KmvXShKLG3wxGGWZUydro34qHx3JriwPsF4qaWA="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/timrid/construct-typing"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/construct/default.nix b/python/pkgs/construct/default.nix index e4d307d00..f9e416b33 100644 --- a/python/pkgs/construct/default.nix +++ b/python/pkgs/construct/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "construct"; version = "2.10.70"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-TSRy+WhHMeWMycVsRjvmO6oUR9Z04NZq61Ynsi9RLCk="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Powerful declarative parser (and builder) for binary data"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/consul/default.nix b/python/pkgs/consul/default.nix index 6b292c2a9..6b12246f6 100644 --- a/python/pkgs/consul/default.nix +++ b/python/pkgs/consul/default.nix @@ -12,7 +12,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-consul"; version = "1.7.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "criteo"; repo = "py-consul"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DpGSiwpxAF1kCraRFl6XPJ1eSzvR6Rdq8PkK30J/vA0="; }; @@ -120,4 +120,4 @@ buildPythonPackage rec { homepage = "https://github.com/criteo/py-consul"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/contexter/default.nix b/python/pkgs/contexter/default.nix index 9c359cab7..b80a045bb 100644 --- a/python/pkgs/contexter/default.nix +++ b/python/pkgs/contexter/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "contexter"; version = "0.1.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "c730890b1a915051414a6350d8ea1cddca7d01d8f756badedb30b9bf305ea0a8"; }; + build-system = [ setuptools ]; + meta = { license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/contourpy/default.nix b/python/pkgs/contourpy/default.nix index 11ded1d46..48ddc6fc1 100644 --- a/python/pkgs/contourpy/default.nix +++ b/python/pkgs/contourpy/default.nix @@ -17,7 +17,7 @@ selenium, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "contourpy"; version = "1.3.3"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "contourpy"; repo = "contourpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/tE+F1wH7YkqfgenXwtcfkjxUR5FwfgoS4NYC6n+/2M="; }; @@ -68,4 +68,4 @@ buildPythonPackage rec { homepage = "https://github.com/contourpy/contourpy"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/convertertools/default.nix b/python/pkgs/convertertools/default.nix index 53dfc86d0..51e9e2414 100644 --- a/python/pkgs/convertertools/default.nix +++ b/python/pkgs/convertertools/default.nix @@ -14,7 +14,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "convertertools"; version = "1.1.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "convertertools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YLEZGTq3wtiLsqQkdxcdM4moUEYPN29Uai5o81FUtVc="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/bluetooth-devices/convertertools"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cookiecutter/default.nix b/python/pkgs/cookiecutter/default.nix index 04f5af791..172419b90 100644 --- a/python/pkgs/cookiecutter/default.nix +++ b/python/pkgs/cookiecutter/default.nix @@ -20,7 +20,7 @@ rich, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cookiecutter"; version = "2.7.1"; pyproject = true; @@ -29,7 +29,7 @@ buildPythonPackage rec { disabled = isPyPy; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ynu3vIxv9EH79TkhtVN2aAAOONVuKNdjobc5dcZsYTg="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { mainProgram = "cookiecutter"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cookies/default.nix b/python/pkgs/cookies/default.nix index 11a336fcf..f695506cc 100644 --- a/python/pkgs/cookies/default.nix +++ b/python/pkgs/cookies/default.nix @@ -3,19 +3,23 @@ buildPythonPackage, fetchpatch, fetchPypi, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cookies"; version = "2.2.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1raYeIyuTPpOYu+GQ6nKMyt5vZbLMUKUuGSujX6z7o4="; }; + build-system = [ setuptools ]; + patches = [ (fetchpatch { name = "fix-deprecations.patch"; @@ -36,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/sashahart/cookies"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/coolname/default.nix b/python/pkgs/coolname/default.nix index 466ec7daf..b57557f7d 100644 --- a/python/pkgs/coolname/default.nix +++ b/python/pkgs/coolname/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "coolname"; version = "2.2.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alexanderlukanin13"; repo = "coolname"; - tag = version; + tag = finalAttrs.version; hash = "sha256-6po9SJGVvOEoSSBtRsbbFE59APFrSkF7uQqaJA8ejoU="; }; @@ -26,11 +26,10 @@ buildPythonPackage rec { ]; # Tests require coolname.data to be packaged - doCheck = false; meta = { description = "Random Name and Slug Generator"; homepage = "https://github.com/alexanderlukanin13/coolname"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/coordinates/default.nix b/python/pkgs/coordinates/default.nix index ce6696f23..66d5dbcf0 100644 --- a/python/pkgs/coordinates/default.nix +++ b/python/pkgs/coordinates/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "coordinates"; version = "0.4.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "clbarnes"; repo = "coordinates"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-S/AmH5FinTpHFFcrGAUSyjfqoIgq14QlHk9CnUkqCv4="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/clbarnes/coordinates"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/copykitten/default.nix b/python/pkgs/copykitten/default.nix index 0d62f4ea7..d166d4cbd 100644 --- a/python/pkgs/copykitten/default.nix +++ b/python/pkgs/copykitten/default.nix @@ -36,7 +36,6 @@ buildPythonPackage (finalAttrs: { # On Darwin, the tests try to use `pbcopy`/`pbpaste`, which aren't packaged in Nix. # On Linux, I tried adding `xclip` to `nativeCheckInputs`, but got errors about # displays being null and the clipboard never being initialized. - doCheck = false; pythonImportsCheck = [ "copykitten" ]; diff --git a/python/pkgs/corallium/default.nix b/python/pkgs/corallium/default.nix index 60b3fa111..20267015f 100644 --- a/python/pkgs/corallium/default.nix +++ b/python/pkgs/corallium/default.nix @@ -7,7 +7,7 @@ rich, typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "corallium"; version = "2.4.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KyleKing"; repo = "corallium"; - tag = version; + tag = finalAttrs.version; hash = "sha256-BtePG2XcukAytbNyIfH3rBesx7nu7J1TLtfbzZO37Os="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://corallium.kyleking.me"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/coreapi/default.nix b/python/pkgs/coreapi/default.nix index 466a0e4bc..738ed5419 100644 --- a/python/pkgs/coreapi/default.nix +++ b/python/pkgs/coreapi/default.nix @@ -10,7 +10,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "coreapi"; version = "2.3.3"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "python-client"; owner = "core-api"; - tag = version; + tag = finalAttrs.version; hash = "sha256-nNUzQbBaT7woI3fmvPvIM0SVDnt4iC2rQ9bDgUeFzLA="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/core-api/python-client"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/coreschema/default.nix b/python/pkgs/coreschema/default.nix index e063ae476..d5a2a7c20 100644 --- a/python/pkgs/coreschema/default.nix +++ b/python/pkgs/coreschema/default.nix @@ -1,24 +1,28 @@ { lib, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, jinja2, pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "coreschema"; version = "0.0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { repo = "python-coreschema"; owner = "core-api"; - rev = version; + tag = finalAttrs.version; sha256 = "027pc753mkgbb3r1v1x7dsdaarq93drx0f79ppvw9pfkcjcq6wb1"; }; - propagatedBuildInputs = [ jinja2 ]; + build-system = [ setuptools ]; + + dependencies = [ jinja2 ]; checkPhase = '' cd ./tests pytest @@ -29,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/ivegotasthma/python-coreschema"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/country-list/default.nix b/python/pkgs/country-list/default.nix index d6c9195b2..6ca4d1d99 100644 --- a/python/pkgs/country-list/default.nix +++ b/python/pkgs/country-list/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "country-list"; version = "1.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bulv1ne"; repo = "country_list"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jG2AC8c6mgWjHVBX7XW021PLPliLTwEBkN6+HSecfL4="; fetchSubmodules = true; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/bulv1ne/country_list"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/courlan/default.nix b/python/pkgs/courlan/default.nix index 74821d96c..891837b44 100644 --- a/python/pkgs/courlan/default.nix +++ b/python/pkgs/courlan/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "courlan"; version = "1.4.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "adbar"; @@ -29,7 +28,7 @@ buildPythonPackage (finalAttrs: { # Tests try to write to /tmp directly. use $TMPDIR instead. postPatch = let - courlanBinPath = "${placeholder "out"}/bin/courlan"; + courlanBinPath = "$(out)/bin/courlan"; in '' substituteInPlace tests/unit_tests.py \ diff --git a/python/pkgs/coveralls/default.nix b/python/pkgs/coveralls/default.nix index b1a1ee560..dbe70808b 100644 --- a/python/pkgs/coveralls/default.nix +++ b/python/pkgs/coveralls/default.nix @@ -10,7 +10,7 @@ typer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "coveralls"; version = "4.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "TheKevJames"; repo = "coveralls-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-9gvQDGutOGf1SxfgDS0t28MjO/WPt4iv1HeqPLrfgw8="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/coveralls-clients/coveralls-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cpe/default.nix b/python/pkgs/cpe/default.nix index 64259e0cc..5945a5f91 100644 --- a/python/pkgs/cpe/default.nix +++ b/python/pkgs/cpe/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cpe"; version = "1.3.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nilp0inter"; repo = "cpe"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QI5XHy2TDSUqK6BZBoFWViBcOKfo+zg0ulzEzF4eg4w="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/nilp0inter/cpe"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/cppheaderparser/default.nix b/python/pkgs/cppheaderparser/default.nix index 2b1daec04..f72463050 100644 --- a/python/pkgs/cppheaderparser/default.nix +++ b/python/pkgs/cppheaderparser/default.nix @@ -6,14 +6,14 @@ ply, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cppheaderparser"; version = "2.7.4"; pyproject = true; src = fetchPypi { pname = "CppHeaderParser"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-OCswQW2VsKXoUCshSBDcrCpWQykX4mUUR9Or4lPjzEI="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://sourceforge.net/projects/cppheaderparser/"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/cppy/default.nix b/python/pkgs/cppy/default.nix index 1dc1c6377..c6d9d0603 100644 --- a/python/pkgs/cppy/default.nix +++ b/python/pkgs/cppy/default.nix @@ -5,7 +5,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cppy"; version = "1.3.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nucleic"; repo = "cppy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-/u9JQ2ivjSlBPodfAjeDmJ+HUu1rFZ58p3V5L2dy4Jk="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/nucleic/cppy"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cpufeature/default.nix b/python/pkgs/cpufeature/default.nix index d093c513e..6c1d7dc43 100644 --- a/python/pkgs/cpufeature/default.nix +++ b/python/pkgs/cpufeature/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cpufeature"; version = "0.2.1"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robbmcleod"; repo = "cpufeature"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dp569Tp8E5/avQpYvhPNPgS/A+q2e/ie+7BR7h2Ip+I="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ setuptools ]; + dependencies = [ setuptools ]; nativeCheckInputs = [ unittestCheckHook ]; @@ -40,4 +40,4 @@ buildPythonPackage rec { "x86_64-windows" ]; }; -} +}) diff --git a/python/pkgs/cpyparsing/default.nix b/python/pkgs/cpyparsing/default.nix index e97103ea3..18c263a0a 100644 --- a/python/pkgs/cpyparsing/default.nix +++ b/python/pkgs/cpyparsing/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cpyparsing"; version = "2.4.7.2.4.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5pSZ+fhMiUIe1kLAvlyyfmcKWxtO2m0h9kQY2LrxOjg="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/evhub/cpyparsing"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cram/default.nix b/python/pkgs/cram/default.nix index d20f20ec0..6239115a8 100644 --- a/python/pkgs/cram/default.nix +++ b/python/pkgs/cram/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cram"; version = "0.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fadEWvLOFbkKrV7EeS+FfO9XhtcfFDd+nrmU2Lgzfy8="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "cram" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://bitheap.org/cram/"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/crashtest/default.nix b/python/pkgs/crashtest/default.nix index 78b0d1e24..3af62ff1e 100644 --- a/python/pkgs/crashtest/default.nix +++ b/python/pkgs/crashtest/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crashtest"; version = "0.4.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gNex8xbr+9Qp9kgHbWJ1yHe6MLpIl53kGRcUp1Jm8M4="; }; + build-system = [ poetry-core ]; + # has tests, but only on GitHub, however the pyproject build fails for me pythonImportsCheck = [ "crashtest.frame" @@ -25,4 +29,4 @@ buildPythonPackage rec { description = "Manage Python errors with ease"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/crayons/default.nix b/python/pkgs/crayons/default.nix index 99ea4ba36..0cd55049d 100644 --- a/python/pkgs/crayons/default.nix +++ b/python/pkgs/crayons/default.nix @@ -6,13 +6,13 @@ colorama, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crayons"; version = "0.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "bd33b7547800f2cfbd26b38431f9e64b487a7de74a947b0fafc89b45a601813f"; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/kennethreitz/crayons"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/crc/default.nix b/python/pkgs/crc/default.nix index 0ef3ed383..3f6c97c8f 100644 --- a/python/pkgs/crc/default.nix +++ b/python/pkgs/crc/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crc"; version = "8.0.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Nicoretti"; repo = "crc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yEjYME2WhYdPcdbGplBaXXfppPTpNwz6jQm5CIJrrzY="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; mainProgram = "crc"; }; -} +}) diff --git a/python/pkgs/crc16/default.nix b/python/pkgs/crc16/default.nix index 28281bef4..7f3f2c5bd 100644 --- a/python/pkgs/crc16/default.nix +++ b/python/pkgs/crc16/default.nix @@ -5,20 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crc16"; version = "0.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-wfhqoDkPS68H0mMbFrl5WA6uHZqXOoJs5FNToi7o05Y="; }; build-system = [ setuptools ]; # Tests are outdated - doCheck = false; pythonImportsCheck = [ "crc16" ]; @@ -27,4 +26,4 @@ buildPythonPackage rec { homepage = "https://code.google.com/archive/p/pycrc16/"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/crc32c/default.nix b/python/pkgs/crc32c/default.nix index 34c9d3a57..4ecce7d51 100644 --- a/python/pkgs/crc32c/default.nix +++ b/python/pkgs/crc32c/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crc32c"; version = "2.8"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ICRAR"; repo = "crc32c"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LPiKms0fVHmgIiwUNWGTAdGByV+Pmh9dRaF/tro2rKo="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { changelog = "https://github.com/ICRAR/crc32c/blob/master/CHANGELOG.md"; license = lib.licenses.lgpl21; }; -} +}) diff --git a/python/pkgs/crccheck/default.nix b/python/pkgs/crccheck/default.nix index b1b7f0578..00ff88c70 100644 --- a/python/pkgs/crccheck/default.nix +++ b/python/pkgs/crccheck/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crccheck"; version = "1.3.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MartinScharrer"; repo = "crccheck"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hT+8+moni7turn5MK719b4Xy336htyWWmoMnhgxKkYo="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/crcelk/default.nix b/python/pkgs/crcelk/default.nix index 40397a34c..8808ed00e 100644 --- a/python/pkgs/crcelk/default.nix +++ b/python/pkgs/crcelk/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crcelk"; version = "1.3"; pyproject = true; @@ -13,14 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zeroSteiner"; repo = "crcelk"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eJt0qcG0ejTQJyjOSi6Au2jH801KOMnk7f6cLbd7ADw="; }; build-system = [ setuptools ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "crcelk" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/zeroSteiner/crcelk"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/crcmod/default.nix b/python/pkgs/crcmod/default.nix index d25ab8618..eaa61dd3d 100644 --- a/python/pkgs/crcmod/default.nix +++ b/python/pkgs/crcmod/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crcmod"; version = "1.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3HBRoNtfK9SGZamQ0+wcwwWkZqdzWMpEkoJvQfKDYB4="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://crcmod.sourceforge.net/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/credstash/default.nix b/python/pkgs/credstash/default.nix index ccf5a68dd..70434d1ef 100644 --- a/python/pkgs/credstash/default.nix +++ b/python/pkgs/credstash/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "credstash"; version = "1.17.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fugue"; repo = "credstash"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-a6OzffGt5piHgi0AWEXJED0R/+8RETh/9hYJi/lUVu0="; }; @@ -61,4 +61,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "credstash"; }; -} +}) diff --git a/python/pkgs/crispy-bootstrap3/default.nix b/python/pkgs/crispy-bootstrap3/default.nix index bd745fd08..d7812c928 100644 --- a/python/pkgs/crispy-bootstrap3/default.nix +++ b/python/pkgs/crispy-bootstrap3/default.nix @@ -9,7 +9,7 @@ django-crispy-forms, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crispy-bootstrap3"; version = "2024.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "crispy-bootstrap3"; - tag = version; + tag = finalAttrs.version; hash = "sha256-w5CGWf14Wa8hndpk5r4hlz6gGykvRL+1AhA5Pz5Ejtk="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/django-crispy-forms/crispy-bootstrap3"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/crispy-bootstrap4/default.nix b/python/pkgs/crispy-bootstrap4/default.nix index 6aacd46e2..4e8e5e4ae 100644 --- a/python/pkgs/crispy-bootstrap4/default.nix +++ b/python/pkgs/crispy-bootstrap4/default.nix @@ -9,7 +9,7 @@ django-crispy-forms, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crispy-bootstrap4"; version = "2026.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "crispy-bootstrap4"; - tag = version; + tag = finalAttrs.version; hash = "sha256-mIgVM6Tc6TT6+dItxqdB/4EkwN2nSFHI/9T1fpinTOo="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/django-crispy-forms/crispy-bootstrap4"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/crispy-bootstrap5/default.nix b/python/pkgs/crispy-bootstrap5/default.nix index 813354f16..f7d3e954e 100644 --- a/python/pkgs/crispy-bootstrap5/default.nix +++ b/python/pkgs/crispy-bootstrap5/default.nix @@ -9,7 +9,7 @@ django-crispy-forms, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crispy-bootstrap5"; version = "2026.9"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "crispy-bootstrap5"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tIBiW7PYg6ZC8/41OGbWyygccZwZXBNNKVDu1RqWdks="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/django-crispy-forms/crispy-bootstrap5"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/crochet/default.nix b/python/pkgs/crochet/default.nix index c5f9d7583..09534d8ae 100644 --- a/python/pkgs/crochet/default.nix +++ b/python/pkgs/crochet/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crochet"; version = "2.1.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "itamarst"; repo = "crochet"; - tag = version; + tag = finalAttrs.version; hash = "sha256-grymhvCC9zDBKhNnQC0o07hdLPV5KMWb6HSz/ntSbq8="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/itamarst/crochet"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cron-converter/default.nix b/python/pkgs/cron-converter/default.nix index d0cc68d98..859fa6904 100644 --- a/python/pkgs/cron-converter/default.nix +++ b/python/pkgs/cron-converter/default.nix @@ -6,7 +6,7 @@ python-dateutil, python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cron-converter"; version = "2.0.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Sonic0"; repo = "cron-converter"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bf25BccSCvx5p9U57DZEJ3pv9K15XuH5As832W1fXws="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/Sonic0/cron-converter"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cron-descriptor/default.nix b/python/pkgs/cron-descriptor/default.nix index 827c62611..1a2acc30b 100644 --- a/python/pkgs/cron-descriptor/default.nix +++ b/python/pkgs/cron-descriptor/default.nix @@ -6,7 +6,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cron-descriptor"; version = "2.1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Salamek"; repo = "cron-descriptor"; - tag = version; + tag = finalAttrs.version; hash = "sha256-EdOcAuheCV1I/dQu4FpQ3DYx4TfPy5TyuSSmivQGy3w="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/Salamek/cron-descriptor"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/croniter/default.nix b/python/pkgs/croniter/default.nix index 58a9d74e6..b8935566e 100644 --- a/python/pkgs/croniter/default.nix +++ b/python/pkgs/croniter/default.nix @@ -7,13 +7,13 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "croniter"; version = "6.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-N8UEsxOVYRSpg+ziwrB3kLHxCU/p2BzJRzkhR0glVXc="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/kiorky/croniter"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/crontab/default.nix b/python/pkgs/crontab/default.nix index b29759054..9dd3dff49 100644 --- a/python/pkgs/crontab/default.nix +++ b/python/pkgs/crontab/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crontab"; version = "3.3.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "doctormo"; repo = "python-crontab"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eJXtvTRwokbewWrTArHJ2FXGDLvlkGA/5ZZR01koMW8="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/doctormo/python-crontab/"; license = lib.licenses.lgpl21Only; }; -} +}) diff --git a/python/pkgs/cross-web/default.nix b/python/pkgs/cross-web/default.nix index b60b73780..397aee418 100644 --- a/python/pkgs/cross-web/default.nix +++ b/python/pkgs/cross-web/default.nix @@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "usecross"; repo = "cross-web"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-JxwzTU17jCQMFNCtmcZVAZQnwDZjHNxCGNdKhkCMoPs="; }; diff --git a/python/pkgs/crossplane/default.nix b/python/pkgs/crossplane/default.nix index ff9478ab1..ad2195cad 100644 --- a/python/pkgs/crossplane/default.nix +++ b/python/pkgs/crossplane/default.nix @@ -3,20 +3,24 @@ buildPythonPackage, pytestCheckHook, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crossplane"; version = "0.5.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "nginxinc"; repo = "crossplane"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DfIF+JvjIREi7zd5ZQ7Co/CIKC5iUeOgR/VLDPmrtTQ="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "crossplane" ]; @@ -27,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/nginxinc/crossplane"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/crownstone-cloud/default.nix b/python/pkgs/crownstone-cloud/default.nix index c40506270..9c8f92fad 100644 --- a/python/pkgs/crownstone-cloud/default.nix +++ b/python/pkgs/crownstone-cloud/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crownstone-cloud"; version = "1.4.11"; pyproject = true; src = fetchPypi { pname = "crownstone_cloud"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-s84pK52uMupxQfdMldV14V3nj+yVku1Vw13CRX4o08U="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/Crownstone-Community/crownstone-lib-python-cloud"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/crownstone-core/default.nix b/python/pkgs/crownstone-core/default.nix index b9b3b78ae..c5b545358 100644 --- a/python/pkgs/crownstone-core/default.nix +++ b/python/pkgs/crownstone-core/default.nix @@ -2,23 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pyaes, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crownstone-core"; version = "3.2.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "crownstone"; repo = "crownstone-lib-python-core"; - rev = version; + tag = finalAttrs.version; hash = "sha256-zrlCzx7N3aUcTUNa64jSzDdWgQneX+Hc5n8TTTcZ4ck="; }; - propagatedBuildInputs = [ pyaes ]; + build-system = [ setuptools ]; + + dependencies = [ pyaes ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -29,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/crownstone/crownstone-lib-python-core"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/crownstone-sse/default.nix b/python/pkgs/crownstone-sse/default.nix index c17de1173..aa68d343f 100644 --- a/python/pkgs/crownstone-sse/default.nix +++ b/python/pkgs/crownstone-sse/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crownstone-sse"; version = "2.0.5"; pyproject = true; src = fetchPypi { pname = "crownstone_sse"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-RUqo68UAVGV+JmauKsGlp7dG8FzixHBDnr3eho/IQdY="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { ]; # Tests are only providing coverage - doCheck = false; pythonImportsCheck = [ "crownstone_sse" ]; @@ -35,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/Crownstone-Community/crownstone-lib-python-sse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/crownstone-uart/default.nix b/python/pkgs/crownstone-uart/default.nix index ad0cbf134..0788b5ade 100644 --- a/python/pkgs/crownstone-uart/default.nix +++ b/python/pkgs/crownstone-uart/default.nix @@ -4,27 +4,30 @@ buildPythonPackage, pyserial, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crownstone-uart"; version = "2.7.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "crownstone"; repo = "crownstone-lib-python-uart"; - rev = version; + tag = finalAttrs.version; hash = "sha256-Sc6BCIRbf1+GraTScmV4EAgwtSE/JXNe0f2XhKyACIY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ crownstone-core pyserial ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "crownstone_uart" ]; @@ -33,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/crownstone/crownstone-lib-python-uart"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cryptg/default.nix b/python/pkgs/cryptg/default.nix index 5d5a3398a..45ad40219 100644 --- a/python/pkgs/cryptg/default.nix +++ b/python/pkgs/cryptg/default.nix @@ -9,7 +9,7 @@ setuptools-rust, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cryptg"; version = "0.6.0"; pyproject = true; @@ -17,12 +17,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cher-nov"; repo = "cryptg"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3vdZGtr4NTtba42jqklhEEMWqHgEct/0Rw0Krllgcn4="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit (finalAttrs) src; hash = "sha256-dnSxRHpjUIXgWScZS18ImxMOfhyq1iC2QPFs1h4l1AQ="; }; @@ -38,7 +38,6 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "cryptg" ]; @@ -51,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/cher-nov/cryptg"; license = lib.licenses.cc0; }; -} +}) diff --git a/python/pkgs/cryptography/default.nix b/python/pkgs/cryptography/default.nix index 39e3a2d8c..aa3f4c994 100644 --- a/python/pkgs/cryptography/default.nix +++ b/python/pkgs/cryptography/default.nix @@ -16,7 +16,7 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cryptography"; version = "49.0.0"; pyproject = true; @@ -24,12 +24,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyca"; repo = "cryptography"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yHUIGauFZYnjcoROvocT1UqQ0B8ZuVTaJ0ZAfri6T1E="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-yMCBu/RGRcEQST8tEWCNgVvlQsp2KamOqt60qvOYdt8="; }; @@ -83,4 +83,4 @@ buildPythonPackage rec { psfl ]; }; -} +}) diff --git a/python/pkgs/cryptography/vectors.nix b/python/pkgs/cryptography/vectors.nix index 594b469ce..fb38d7bfc 100644 --- a/python/pkgs/cryptography/vectors.nix +++ b/python/pkgs/cryptography/vectors.nix @@ -5,18 +5,17 @@ uv-build, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cryptography-vectors"; # The test vectors must have the same version as the cryptography package inherit (cryptography) version src; pyproject = true; - sourceRoot = "${src.name}/vectors"; + sourceRoot = "${finalAttrs.src.name}/vectors"; build-system = [ uv-build ]; # No tests included - doCheck = false; pythonImportsCheck = [ "cryptography_vectors" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { bsd3 ]; }; -} +}) diff --git a/python/pkgs/crysp/default.nix b/python/pkgs/crysp/default.nix index bc7ac4b56..e811f3175 100644 --- a/python/pkgs/crysp/default.nix +++ b/python/pkgs/crysp/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, grandalf, matplotlib, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "crysp"; version = "1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "bdcht"; repo = "crysp"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-51SKS6OOXIFT1L3YICR6a4QGSz/rbB8V+Z0u0jMO474="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ grandalf matplotlib ]; @@ -38,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/bdcht/crysp"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/cs50/default.nix b/python/pkgs/cs50/default.nix index 7787542d4..48ed3bb56 100644 --- a/python/pkgs/cs50/default.nix +++ b/python/pkgs/cs50/default.nix @@ -11,7 +11,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cs50"; version = "9.5.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cs50"; repo = "python-cs50"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jJji5EyvKfJ9vkzETsh0CJ9WIi7hWF2amHrOvf4/JbI="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/cs50/python-cs50/"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/csaf-tool/default.nix b/python/pkgs/csaf-tool/default.nix index ed9342d30..df37cee0e 100644 --- a/python/pkgs/csaf-tool/default.nix +++ b/python/pkgs/csaf-tool/default.nix @@ -8,7 +8,7 @@ versionCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "csaf-tool"; version = "0.3.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "anthonyharrison"; repo = "csaf"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LR6r03z0nvvAQgFHaTWfukoJmLZ6SLPXfbp/G8N/HtM="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # has not tests - doCheck = false; pythonImportsCheck = [ "csaf" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/anthonyharrison/csaf"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/csaps/default.nix b/python/pkgs/csaps/default.nix index b105dcd9d..e6cffd2a2 100644 --- a/python/pkgs/csaps/default.nix +++ b/python/pkgs/csaps/default.nix @@ -12,7 +12,7 @@ scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "csaps"; version = "1.3.3"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "espdev"; repo = "csaps"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1pNJaNExhcRWDjJenEKp1eJ4wZMFXxwWcmepEt6/p0s="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/espdev/csaps"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cson/default.nix b/python/pkgs/cson/default.nix index 228df5b65..cc5468336 100644 --- a/python/pkgs/cson/default.nix +++ b/python/pkgs/cson/default.nix @@ -6,13 +6,13 @@ speg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cson"; version = "0.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7owBZvzR9ReJiHGX4+g1Sse++jlvwpcGvOta8l7cngE="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/avakar/pycson"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/css-inline/default.nix b/python/pkgs/css-inline/default.nix index 79a1e6bd3..17c2280f1 100644 --- a/python/pkgs/css-inline/default.nix +++ b/python/pkgs/css-inline/default.nix @@ -14,7 +14,7 @@ hypothesis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "css-inline"; version = "0.21.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Stranger6667"; repo = "css-inline"; - rev = "python-v${version}"; + tag = "python-v${finalAttrs.version}"; hash = "sha256-hXrcomE//BScA395zXSKQayeRn8G8ivfcIJkIKu+PUE="; }; @@ -37,7 +37,7 @@ buildPythonPackage rec { # call `cargo build --release` in bindings/python and copy the # resulting lock file cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; postPatch = '' cd bindings/python ln -s ${./Cargo.lock} Cargo.lock @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://github.com/Stranger6667/css-inline"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/css-parser/default.nix b/python/pkgs/css-parser/default.nix index 0f81f1147..474326d5b 100644 --- a/python/pkgs/css-parser/default.nix +++ b/python/pkgs/css-parser/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "css-parser"; version = "1.0.10"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vx6XKtMzROkyBpZPtM2QjZ3e+fzQwB+pPg1zRnU5Q2M="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "css_parser" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { description = "CSS Cascading Style Sheets library for Python"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/cssbeautifier/default.nix b/python/pkgs/cssbeautifier/default.nix index 67a83e342..941ee61d0 100644 --- a/python/pkgs/cssbeautifier/default.nix +++ b/python/pkgs/cssbeautifier/default.nix @@ -7,25 +7,24 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cssbeautifier"; version = "2.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LC/RKTQlYQKd6GsXRO+iMcn6/iYCPbyYih3rDKD1yEU="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ editorconfig jsbeautifier ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "cssbeautifier" ]; @@ -35,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/beautifier/js-beautify"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/csscompressor/default.nix b/python/pkgs/csscompressor/default.nix index 7eba0853c..5686e3705 100644 --- a/python/pkgs/csscompressor/default.nix +++ b/python/pkgs/csscompressor/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "csscompressor"; version = "0.9.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-r6IrrbzzEgpPOS5NIvn/9IXARKH+2kqVDsxeup3TGgU="; }; @@ -19,11 +19,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "csscompressor" ]; - doCheck = false; - meta = { homepage = "https://pypi.org/project/csscompressor/"; description = "Python port of YUI CSS Compressor"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cssmin/default.nix b/python/pkgs/cssmin/default.nix index d795cf2b9..b2d21bea2 100644 --- a/python/pkgs/cssmin/default.nix +++ b/python/pkgs/cssmin/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cssmin"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4BLwzIQB788mIDMjOQEVZHOK4yvoyEsuQ86L6uwQZ7Y="; }; + build-system = [ setuptools ]; + # no tests - doCheck = false; pythonImportsCheck = [ "cssmin" ]; @@ -25,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/zacharyvoase/cssmin"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cssselect/default.nix b/python/pkgs/cssselect/default.nix index e23d80d26..af8ed6fe4 100644 --- a/python/pkgs/cssselect/default.nix +++ b/python/pkgs/cssselect/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cssselect"; version = "1.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PL6C3XrL7pup5XI7X55HSYJpEvH7Mc1/kqq+1f3hWxU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://cssselect.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cssselect2/default.nix b/python/pkgs/cssselect2/default.nix index 0626d9bfd..38574c0f8 100644 --- a/python/pkgs/cssselect2/default.nix +++ b/python/pkgs/cssselect2/default.nix @@ -7,13 +7,13 @@ webencodings, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cssselect2"; version = "0.10.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-g7DYIO9YnauvaTKJtkfC9bQQ920oX1beupEf+nWnudE="; }; @@ -24,8 +24,6 @@ buildPythonPackage rec { webencodings ]; - doCheck = false; - pythonImportsCheck = [ "cssselect2" ]; meta = { @@ -33,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/Kozea/cssselect2"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cssutils/default.nix b/python/pkgs/cssutils/default.nix index 1948a3521..a5647f83b 100644 --- a/python/pkgs/cssutils/default.nix +++ b/python/pkgs/cssutils/default.nix @@ -11,7 +11,7 @@ mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cssutils"; version = "2.15.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaraco"; repo = "cssutils"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-K9jbuX7AueSB3AB7PAVjpQhzb3Umn9OoHaL4RrMzKEs="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/cssutils"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/cstruct/default.nix b/python/pkgs/cstruct/default.nix index efc147e4c..a0dd80372 100644 --- a/python/pkgs/cstruct/default.nix +++ b/python/pkgs/cstruct/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cstruct"; version = "6.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "andreax79"; repo = "python-cstruct"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jLpuvApEP8Acva/OV3ulwl4+dOy8t/cD/LFJWWnD3BM="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/andreax79/python-cstruct"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/csv2md/default.nix b/python/pkgs/csv2md/default.nix index 4af956a6a..743c39509 100644 --- a/python/pkgs/csv2md/default.nix +++ b/python/pkgs/csv2md/default.nix @@ -13,7 +13,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "lzakharov"; repo = "csv2md"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UgX05ObIG3+Cucb0lC/+5w1WRB8eZbOeBpJoYHTotiw="; }; diff --git a/python/pkgs/ctap-keyring-device/default.nix b/python/pkgs/ctap-keyring-device/default.nix index 8643e2704..f9a7a1808 100644 --- a/python/pkgs/ctap-keyring-device/default.nix +++ b/python/pkgs/ctap-keyring-device/default.nix @@ -34,13 +34,13 @@ let ]; }); in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ctap-keyring-device"; version = "1.0.6"; pyproject = true; src = fetchPypi { - inherit version pname; + inherit (finalAttrs) version pname; hash = "sha256-pEJkuz0wxKt2PkowmLE2YC+HPYa2ZiENK7FAW14Ec/Y="; }; @@ -78,4 +78,4 @@ buildPythonPackage rec { homepage = "https://github.com/dany74q/ctap-keyring-device"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ctypesgen/default.nix b/python/pkgs/ctypesgen/default.nix index cbd8afb3e..76b04f018 100644 --- a/python/pkgs/ctypesgen/default.nix +++ b/python/pkgs/ctypesgen/default.nix @@ -8,7 +8,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ctypesgen"; version = "1.1.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ctypesgen"; repo = "ctypesgen"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TwIWPellmjMpTGQ+adJBLNMdAqB0kLOMl4YAubvXKqo="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # Various compiler errors - doCheck = false; pythonImportsCheck = [ "ctypesgen" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/ctypesgen/ctypesgen"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/cu2qu/default.nix b/python/pkgs/cu2qu/default.nix index 8f8d33f84..6c1fb0794 100644 --- a/python/pkgs/cu2qu/default.nix +++ b/python/pkgs/cu2qu/default.nix @@ -15,12 +15,12 @@ let pname = "cu2qu"; version = "1.6.7.post2"; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { inherit pname version; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-HfVi2ZvWBZImCI9ENwK/Uc/djMY2I/IxN0WaeNe/WAg="; extension = "zip"; }; @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ defcon fonttools ] @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/googlefonts/cu2qu"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cuda-pathfinder/default.nix b/python/pkgs/cuda-pathfinder/default.nix index 8e96bec77..576d0915e 100644 --- a/python/pkgs/cuda-pathfinder/default.nix +++ b/python/pkgs/cuda-pathfinder/default.nix @@ -15,7 +15,6 @@ buildPythonPackage (finalAttrs: { pname = "cuda-pathfinder"; version = "1.5.6"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "NVIDIA"; diff --git a/python/pkgs/curated-tokenizers/default.nix b/python/pkgs/curated-tokenizers/default.nix index 6fc0618ad..416f8e6c1 100644 --- a/python/pkgs/curated-tokenizers/default.nix +++ b/python/pkgs/curated-tokenizers/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "curated-tokenizers"; version = "2.0.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "explosion"; repo = "curated-tokenizers"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VkDV/9c5b8TzYlthCZ38ufbrne4rihtkmkZ/gyAQXLE="; fetchSubmodules = true; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/curated-tokenizers"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/curio-compat/default.nix b/python/pkgs/curio-compat/default.nix index b812aada9..db09a99be 100644 --- a/python/pkgs/curio-compat/default.nix +++ b/python/pkgs/curio-compat/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "curio-compat"; version = "1.6.7"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "klen"; repo = "curio"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Crd9r4Icwga85wvtXaePbE56R192o+FXU9Zn+Lc7trI="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/klen/curio"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/curio/default.nix b/python/pkgs/curio/default.nix index 7303aca54..7df4a8b81 100644 --- a/python/pkgs/curio/default.nix +++ b/python/pkgs/curio/default.nix @@ -8,7 +8,7 @@ unstableGitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "curio"; version = "1.6-unstable-2024-04-11"; pyproject = true; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/dabeaz/curio"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/curlify/default.nix b/python/pkgs/curlify/default.nix index 750abf841..3b2c113fc 100644 --- a/python/pkgs/curlify/default.nix +++ b/python/pkgs/curlify/default.nix @@ -2,13 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, requests, }: buildPythonPackage { pname = "curlify"; version = "2.2.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ofw"; @@ -17,7 +19,9 @@ buildPythonPackage { hash = "sha256-yDHmH35TtQDJB0na1V98RtBuVHX5TmKC72hzzs1DQK8="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; meta = { description = "Convert python requests request object to cURL command"; diff --git a/python/pkgs/curtsies/default.nix b/python/pkgs/curtsies/default.nix index e06c16d6b..481682749 100644 --- a/python/pkgs/curtsies/default.nix +++ b/python/pkgs/curtsies/default.nix @@ -7,13 +7,13 @@ cwcwidth, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "curtsies"; version = "0.4.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ECoP+/lSEk8b4iL9aYnaTsfM4E5J9hMAnl9UrTdhiCU="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/bpython/curtsies"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cutie/default.nix b/python/pkgs/cutie/default.nix index 521e4c1ae..0a2b9502c 100644 --- a/python/pkgs/cutie/default.nix +++ b/python/pkgs/cutie/default.nix @@ -18,7 +18,6 @@ buildPythonPackage (finalAttrs: { pname = "cutie"; version = "0.3.2"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "kamik423"; diff --git a/python/pkgs/cutlass/default.nix b/python/pkgs/cutlass/default.nix index 06d91a5b1..d2319c44f 100644 --- a/python/pkgs/cutlass/default.nix +++ b/python/pkgs/cutlass/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { pname = "cutlass"; version = "0.9.0"; pyproject = true; - __structuredAttrs = true; # No tags on GitHub src = fetchPypi { diff --git a/python/pkgs/cv2-enumerate-cameras/default.nix b/python/pkgs/cv2-enumerate-cameras/default.nix index b9ecb57e6..e4f38b6ae 100644 --- a/python/pkgs/cv2-enumerate-cameras/default.nix +++ b/python/pkgs/cv2-enumerate-cameras/default.nix @@ -6,14 +6,14 @@ stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cv2_enumerate_cameras"; version = "1.3.3"; src = fetchFromGitHub { owner = "lukehugh"; repo = "cv2_enumerate_cameras"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4QB/yWpurH/ai49PBRECdCfRRQ0tAvzGnpXj+DeP1pE="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { # Needs pyobjc-framework-avfoundation; not currently packaged. broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/python/pkgs/cvss/default.nix b/python/pkgs/cvss/default.nix index 88285435e..7a9dc8df2 100644 --- a/python/pkgs/cvss/default.nix +++ b/python/pkgs/cvss/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cvss"; version = "3.6"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RedHatProductSecurity"; repo = "cvss"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-udUs76wfvC9LfjlKyWmuPV0RT2P/COTwYw3hgDt3tPs="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl3Plus; mainProgram = "cvss_calculator"; }; -} +}) diff --git a/python/pkgs/cwcwidth/default.nix b/python/pkgs/cwcwidth/default.nix index 8c228988a..5b4040b34 100644 --- a/python/pkgs/cwcwidth/default.nix +++ b/python/pkgs/cwcwidth/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cwcwidth"; version = "0.1.12"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-v8FlMdEkbdJVjrmzpjqjepl4ZyuVaGDcVCbaI0Pr82Y="; }; @@ -21,8 +21,6 @@ buildPythonPackage rec { setuptools ]; - doCheck = false; - pythonImportsCheck = [ "cwcwidth" ]; meta = { @@ -30,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/sebastinas/cwcwidth"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cwlformat/default.nix b/python/pkgs/cwlformat/default.nix index 8f5ea37af..08e30832c 100644 --- a/python/pkgs/cwlformat/default.nix +++ b/python/pkgs/cwlformat/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cwlformat"; version = "2022.02.18"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rabix"; repo = "cwl-format"; - tag = version; + tag = finalAttrs.version; hash = "sha256-FI8hUgb/KglTkubZ+StzptoSsYal71ITyyFNg7j48yk="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/rabix/cwl-format"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cwsandbox/default.nix b/python/pkgs/cwsandbox/default.nix index 7d59546b1..f9a534d73 100644 --- a/python/pkgs/cwsandbox/default.nix +++ b/python/pkgs/cwsandbox/default.nix @@ -24,7 +24,6 @@ buildPythonPackage (finalAttrs: { pname = "cwsandbox"; version = "1.14.2"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "coreweave"; diff --git a/python/pkgs/cxxfilt/default.nix b/python/pkgs/cxxfilt/default.nix index 173aefe0d..a9e373a63 100644 --- a/python/pkgs/cxxfilt/default.nix +++ b/python/pkgs/cxxfilt/default.nix @@ -3,18 +3,22 @@ stdenv, buildPythonPackage, fetchPypi, + # build-system + setuptools, gcc-unwrapped, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cxxfilt"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "7df6464ba5e8efbf0d8974c0b2c78b32546676f06059a83515dbdfa559b34214"; }; + build-system = [ setuptools ]; + postPatch = let libstdcpp = "${lib.getLib gcc-unwrapped}/lib/libstdc++${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -32,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/afq984/python-cxxfilt"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/cxxheaderparser/default.nix b/python/pkgs/cxxheaderparser/default.nix index e0f170d62..bd0e7e25f 100644 --- a/python/pkgs/cxxheaderparser/default.nix +++ b/python/pkgs/cxxheaderparser/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cxxheaderparser"; version = "1.8.1"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robotpy"; repo = "cxxheaderparser"; - tag = version; + tag = finalAttrs.version; hash = "sha256-l81b/M6ir3aWnycrl8RfuN3JQYkcRcTFRhejBWXGgb4="; }; postPatch = '' # version.py is generated based on latest git tag - echo "__version__ = '${version}'" > cxxheaderparser/version.py + echo "__version__ = '${finalAttrs.version}'" > cxxheaderparser/version.py ''; build-system = [ @@ -30,9 +30,10 @@ buildPythonPackage rec { hatchling ]; - checkInputs = [ pcpp ]; - - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pcpp + pytestCheckHook + ]; pythonImportsCheck = [ "cxxheaderparser" ]; @@ -42,4 +43,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/cybox/default.nix b/python/pkgs/cybox/default.nix index 5bbcb2649..479776031 100644 --- a/python/pkgs/cybox/default.nix +++ b/python/pkgs/cybox/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cybox"; version = "2.1.0.21"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CybOXProject"; repo = "python-cybox"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Gn/gH7pvvOqLIGExgCNa5KswPazIZUZXdQe3LRAUVjw="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/CybOXProject/python-cybox/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cycler/default.nix b/python/pkgs/cycler/default.nix index 0806e675c..6ea8ad891 100644 --- a/python/pkgs/cycler/default.nix +++ b/python/pkgs/cycler/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cycler"; version = "0.12.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matplotlib"; repo = "cycler"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5L0APSi/mJ85SuKCVz+c6Fn8zZNpRm6vCeBO0fpGKxg="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/matplotlib/cycler"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/cymruwhois/default.nix b/python/pkgs/cymruwhois/default.nix index 6e81c5a7a..9030a951a 100644 --- a/python/pkgs/cymruwhois/default.nix +++ b/python/pkgs/cymruwhois/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cymruwhois"; version = "1.6"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JustinAzoff"; repo = "python-cymruwhois"; - tag = version; + tag = finalAttrs.version; hash = "sha256-d9m668JYI9mxUycoVWyaDCR7SOca+ebymZxWtgSPWNU="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/JustinAzoff/python-cymruwhois"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cyrtranslit/default.nix b/python/pkgs/cyrtranslit/default.nix index cd2affe0c..9283d8333 100644 --- a/python/pkgs/cyrtranslit/default.nix +++ b/python/pkgs/cyrtranslit/default.nix @@ -6,7 +6,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cyrtranslit"; version = "1.2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "opendatakosovo"; repo = "cyrillic-transliteration"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hE5fru9Y5gU4zG2Kz76w5HbVXKBua/cJdhItz3ou0kY="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/cyscale/default.nix b/python/pkgs/cyscale/default.nix index 67b441ac9..d585cd364 100644 --- a/python/pkgs/cyscale/default.nix +++ b/python/pkgs/cyscale/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "0.8.0"; pyproject = true; - __structuredAttrs = true; - requiredSystemFeatures = [ "big-parallel" ]; src = fetchFromGitHub { diff --git a/python/pkgs/cysignals/default.nix b/python/pkgs/cysignals/default.nix index 833698c5e..e28fa1b79 100644 --- a/python/pkgs/cysignals/default.nix +++ b/python/pkgs/cysignals/default.nix @@ -7,7 +7,7 @@ ninja, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cysignals"; version = "1.12.6"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sagemath"; repo = "cysignals"; - tag = version; + tag = finalAttrs.version; hash = "sha256-uZNKmnn1Jf1pERdG4bywpAUClKMw3og+7Q5B0yPlqEY="; }; @@ -33,7 +33,6 @@ buildPythonPackage rec { hardeningDisable = [ "fortify" ]; # known failure: https://github.com/sagemath/cysignals/blob/582dbf6a7b0f9ade0abe7a7b8720b7fb32435c3c/testgdb.py#L5 - doCheck = false; checkTarget = "check-install"; meta = { description = "Interrupt and signal handling for Cython"; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/sagemath/cysignals/"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/cython-test-exception-raiser/default.nix b/python/pkgs/cython-test-exception-raiser/default.nix index 9b0f97c74..88251a7fa 100644 --- a/python/pkgs/cython-test-exception-raiser/default.nix +++ b/python/pkgs/cython-test-exception-raiser/default.nix @@ -7,7 +7,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cython-test-exception-raiser"; version = "1.0.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "twisted"; repo = "cython-test-exception-raiser"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fwMq0pOrFUJnPndH/a6ghoo6mlcVSxtsWazqE9mCx3M="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/cython/0.nix b/python/pkgs/cython/0.nix index 53d0847d1..678becc60 100644 --- a/python/pkgs/cython/0.nix +++ b/python/pkgs/cython/0.nix @@ -32,7 +32,7 @@ let "overflow_check_longlong" ]; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cython"; version = "0.29.37.1"; pyproject = true; @@ -43,7 +43,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cython"; repo = "cython"; - tag = version; + tag = finalAttrs.version; hash = "sha256-XsEy2NrG7hq+VXRCRbD4BRaBieU6mVoE0GT52L3mMhs="; }; @@ -90,7 +90,6 @@ buildPythonPackage rec { # https://github.com/cython/cython/issues/2785 # Temporary solution - doCheck = false; # doCheck = !stdenv.hostPlatform.isDarwin; # force regeneration of generated code in source distributions @@ -98,9 +97,9 @@ buildPythonPackage rec { setupHook = ./setup-hook.sh; meta = { - changelog = "https://github.com/cython/cython/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/cython/cython/blob/${finalAttrs.version}/CHANGES.rst"; description = "Optimising static compiler for both the Python programming language and the extended Cython programming language"; homepage = "https://cython.org"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/cython/default.nix b/python/pkgs/cython/default.nix index 309ee4aa9..ff25d2103 100644 --- a/python/pkgs/cython/default.nix +++ b/python/pkgs/cython/default.nix @@ -8,7 +8,7 @@ stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cython"; version = "3.3.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cython"; repo = "cython"; - tag = version; + tag = finalAttrs.version; hash = "sha256-gIEqq8DAJF197gH1cMuq5JxI4rV/VHS70vg8hywXDqw="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # https://github.com/cython/cython/issues/2785 # Temporary solution - doCheck = false; strictDeps = true; @@ -103,5 +102,5 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "cython"; }; -} +}) # TODO: investigate recursive loop when doCheck is true diff --git a/python/pkgs/dacite/default.nix b/python/pkgs/dacite/default.nix index 2f30fee6a..f6a6c982a 100644 --- a/python/pkgs/dacite/default.nix +++ b/python/pkgs/dacite/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dacite"; version = "1.9.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "konradhalas"; repo = "dacite"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mAPqWvBpkTbtzHpwtCSDXMNkoc8/hbRH3OIEeK2yStU="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/konradhalas/dacite"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/daemonize/default.nix b/python/pkgs/daemonize/default.nix index 59e9b525c..e875794db 100644 --- a/python/pkgs/daemonize/default.nix +++ b/python/pkgs/daemonize/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "daemonize"; version = "2.5.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3QJuT/jSLLAW7SEwvHOLfUsdpZfvk8B00q255N6gi8M="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "daemonize" ]; meta = { @@ -21,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/thesharp/daemonize"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/daff/default.nix b/python/pkgs/daff/default.nix index 59fa2be7b..af0b52455 100644 --- a/python/pkgs/daff/default.nix +++ b/python/pkgs/daff/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "daff"; version = "1.4.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-R/A5Htp+K1AR98ysAGuReKzLRlvLlKLJ8oQlf/9dJoY="; }; + build-system = [ setuptools ]; + # there are no tests - doCheck = false; pythonImportsCheck = [ "daff" ]; @@ -24,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/paulfitz/daff"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/daiquiri/default.nix b/python/pkgs/daiquiri/default.nix index 7984e4787..d088ddd55 100644 --- a/python/pkgs/daiquiri/default.nix +++ b/python/pkgs/daiquiri/default.nix @@ -7,13 +7,13 @@ python-json-logger, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "daiquiri"; version = "3.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yh0ywsCgbzYU/4A6h6wdUNYo2zTQv37ZffDKV2MyBU8="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/Mergifyio/daiquiri"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/daltonlens/default.nix b/python/pkgs/daltonlens/default.nix index 256697c9e..df9db7706 100644 --- a/python/pkgs/daltonlens/default.nix +++ b/python/pkgs/daltonlens/default.nix @@ -7,13 +7,13 @@ pillow, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "daltonlens"; version = "0.1.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-T7fXlRdFtcVw5WURPqZhCmulUi1ZnCfCXgcLtTHeNas="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/DaltonLens/DaltonLens-Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/darabonba-core/default.nix b/python/pkgs/darabonba-core/default.nix index 9a2e5cd4e..e5a7c6f22 100644 --- a/python/pkgs/darabonba-core/default.nix +++ b/python/pkgs/darabonba-core/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.9"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "darabonba_core"; inherit (finalAttrs) version; @@ -34,7 +32,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "Tea" ]; # Module has no tests - doCheck = false; meta = { description = "The darabonba module of alibabaCloud Python SDK"; diff --git a/python/pkgs/darkdetect/default.nix b/python/pkgs/darkdetect/default.nix index c480a1e7e..56f49fa5b 100644 --- a/python/pkgs/darkdetect/default.nix +++ b/python/pkgs/darkdetect/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "darkdetect"; version = "0.8.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "albertosottile"; repo = "darkdetect"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OOINgrgjSLr3L07E9zf1+mlTPr+7ZlgN3CfkWE8+LoE="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/albertosottile/darkdetect"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/dasbus/default.nix b/python/pkgs/dasbus/default.nix index e79fee4bf..fa890ff78 100644 --- a/python/pkgs/dasbus/default.nix +++ b/python/pkgs/dasbus/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dasbus"; version = "1.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-qIUNhBrf6O5fe7n4LPRJq5tJUNwGM4lwcXGODQA2tvY="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/rhinstaller/dasbus"; license = lib.licenses.lgpl21Only; }; -} +}) diff --git a/python/pkgs/dash-bootstrap-components/default.nix b/python/pkgs/dash-bootstrap-components/default.nix index 1db888b5a..7769c5d84 100644 --- a/python/pkgs/dash-bootstrap-components/default.nix +++ b/python/pkgs/dash-bootstrap-components/default.nix @@ -6,13 +6,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dash-bootstrap-components"; version = "2.0.5a2"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "dash_bootstrap_components"; hash = "sha256-quEneBgSbhIgTvwGkHaGB1X7rhj/Uwz/UN6CWAkrMSM="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { dependencies = [ dash ]; # Tests a additional requirements - doCheck = false; pythonImportsCheck = [ "dash_bootstrap_components" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/facultyai/dash-bootstrap-components"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dash-bootstrap-templates/default.nix b/python/pkgs/dash-bootstrap-templates/default.nix index 20c35b967..d41a47c7a 100644 --- a/python/pkgs/dash-bootstrap-templates/default.nix +++ b/python/pkgs/dash-bootstrap-templates/default.nix @@ -9,7 +9,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dash-bootstrap-templates"; version = "2.1.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AnnMarieW"; repo = "dash-bootstrap-templates"; - tag = "V${version}"; + tag = "V${finalAttrs.version}"; hash = "sha256-B7iyN4sJA6DmoLf3DpFEONDe5tUd4cBlDIH4E7JtULk="; }; build-system = [ @@ -34,11 +34,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "dash_bootstrap_templates" ]; # There are no tests. - doCheck = false; meta = { description = "Collection of 52 Plotly figure templates with a Bootstrap theme"; homepage = "https://github.com/AnnMarieW/dash-bootstrap-templates"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dash-core-components/default.nix b/python/pkgs/dash-core-components/default.nix index 71c548905..92f69d804 100644 --- a/python/pkgs/dash-core-components/default.nix +++ b/python/pkgs/dash-core-components/default.nix @@ -2,12 +2,14 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: buildPythonPackage (finalAttrs: { pname = "dash-core-components"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "dash_core_components"; @@ -15,8 +17,9 @@ buildPythonPackage (finalAttrs: { hash = "sha256-xnM4dK+XXlUvlaE5ihbC7n3xTOQ/pguzcYo8bgtj/+4="; }; + build-system = [ setuptools ]; + # No tests in archive - doCheck = false; meta = { description = "Dash component starter pack"; diff --git a/python/pkgs/dash-html-components/default.nix b/python/pkgs/dash-html-components/default.nix index f9a08eca5..3e6633665 100644 --- a/python/pkgs/dash-html-components/default.nix +++ b/python/pkgs/dash-html-components/default.nix @@ -2,25 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dash-html-components"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "dash_html_components"; - inherit version; + inherit (finalAttrs) version; sha256 = "8703a601080f02619a6390998e0b3da4a5daabe97a1fd7a9cebc09d015f26e50"; }; + build-system = [ setuptools ]; + # No tests in archive - doCheck = false; meta = { description = "HTML components for Dash"; homepage = "https://dash.plot.ly/dash-html-components"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dash-table/default.nix b/python/pkgs/dash-table/default.nix index e03b61266..44a3c02aa 100644 --- a/python/pkgs/dash-table/default.nix +++ b/python/pkgs/dash-table/default.nix @@ -2,25 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dash-table"; version = "5.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "dash_table"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-GGJNaT1MjvLd7Jmm8WdZNDen6gvxU6og8xjBcMW8cwg="; }; + build-system = [ setuptools ]; + # No tests in archive - doCheck = false; meta = { description = "First-Class Interactive DataTable for Dash"; homepage = "https://dash.plot.ly/datatable"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dashing/default.nix b/python/pkgs/dashing/default.nix index 45e2cbc3e..3091a9d0b 100644 --- a/python/pkgs/dashing/default.nix +++ b/python/pkgs/dashing/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, blessed, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dashing"; version = "0.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JRRgjg8pp3Xb0bERFWEhnOg9U8+kuqL+QQH6uE/Vbxs="; }; - propagatedBuildInputs = [ blessed ]; + build-system = [ setuptools ]; + + dependencies = [ blessed ]; meta = { homepage = "https://github.com/FedericoCeratto/dashing"; description = "Terminal dashboards for Python"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/dashscope/default.nix b/python/pkgs/dashscope/default.nix index 218d3a4aa..a52c86bf3 100644 --- a/python/pkgs/dashscope/default.nix +++ b/python/pkgs/dashscope/default.nix @@ -18,7 +18,7 @@ websocket-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dashscope"; version = "1.27.4"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dashscope"; repo = "dashscope-sdk-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oLg/ghUllfsS/2Aqu6QrkBnQYxsBshZlWPHg+UZp6Yw="; }; @@ -48,7 +48,7 @@ buildPythonPackage rec { # Specify the version explicitly postPatch = '' substituteInPlace setup.py \ - --replace-fail "version=get_version()," "version='${version}'," + --replace-fail "version=get_version()," "version='${finalAttrs.version}'," ''; pythonImportsCheck = [ "dashscope" ]; meta = { @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/dashscope/dashscope-sdk-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dask-gateway/default.nix b/python/pkgs/dask-gateway/default.nix index 306bbb3da..d035583f0 100644 --- a/python/pkgs/dask-gateway/default.nix +++ b/python/pkgs/dask-gateway/default.nix @@ -8,7 +8,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dask-gateway"; # update dask-gateway lock step with dask-gateway-server version = "2025.4.0"; @@ -17,11 +17,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dask"; repo = "dask-gateway"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Ezt5QkA21SDfuCMm+XY8d+xso8SDb4lmK/yd89Guu0Y="; }; - sourceRoot = "${src.name}/dask-gateway"; + sourceRoot = "${finalAttrs.src.name}/dask-gateway"; build-system = [ hatchling ]; @@ -32,7 +32,6 @@ buildPythonPackage rec { ]; # tests requires cluster for testing - doCheck = false; pythonImportsCheck = [ "dask_gateway" ]; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://gateway.dask.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/dask/default.nix b/python/pkgs/dask/default.nix index 4fa9244ff..7889c42f7 100644 --- a/python/pkgs/dask/default.nix +++ b/python/pkgs/dask/default.nix @@ -44,7 +44,6 @@ buildPythonPackage (finalAttrs: { pname = "dask"; version = "2026.8.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "dask"; diff --git a/python/pkgs/databackend/default.nix b/python/pkgs/databackend/default.nix index 1d27ee193..aa48b9dc4 100644 --- a/python/pkgs/databackend/default.nix +++ b/python/pkgs/databackend/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "databackend"; version = "0.0.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "machow"; repo = "databackend"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-M5Nm33Vae6FDy4aurru4CeHjeNxyZZnqzpdkqNEvrm0="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/machow/databackend"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/databases/default.nix b/python/pkgs/databases/default.nix index 54b4b90d4..d988acd25 100644 --- a/python/pkgs/databases/default.nix +++ b/python/pkgs/databases/default.nix @@ -12,7 +12,7 @@ sqlalchemy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "databases"; version = "0.9.0"; pyproject = true; @@ -20,13 +20,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; repo = "databases"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Zf9QqBgDhWAnHdNvzjXtri5rdT00BOjc4YTNzJALldM="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ sqlalchemy ]; + dependencies = [ sqlalchemy ]; optional-dependencies = { postgresql = [ asyncpg ]; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/encode/databases"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/databricks-cli/default.nix b/python/pkgs/databricks-cli/default.nix index ddb9d214c..79d251b17 100644 --- a/python/pkgs/databricks-cli/default.nix +++ b/python/pkgs/databricks-cli/default.nix @@ -5,6 +5,8 @@ configparser, decorator, fetchFromGitHub, + # build-system + setuptools, mock, oauthlib, pyjwt, @@ -14,19 +16,21 @@ tabulate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "databricks-cli"; version = "0.18.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-cli"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dH95C2AY/B6F9BROr6rh+gVtKqxsg1gyEU5MzCd5aqs="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ click configparser oauthlib @@ -43,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/databricks/databricks-cli"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/databricks-sdk/default.nix b/python/pkgs/databricks-sdk/default.nix index bbdd70642..2472fb91f 100644 --- a/python/pkgs/databricks-sdk/default.nix +++ b/python/pkgs/databricks-sdk/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { pname = "databricks-sdk"; version = "0.136.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "databricks"; diff --git a/python/pkgs/databricks-sql-connector/default.nix b/python/pkgs/databricks-sql-connector/default.nix index e6e8371de..143e3d676 100644 --- a/python/pkgs/databricks-sql-connector/default.nix +++ b/python/pkgs/databricks-sql-connector/default.nix @@ -18,7 +18,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "databricks-sql-connector"; version = "4.2.4"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QoauhA2Zx2UvlCuKe9mxaOFJKpglVHQmPVVS56np4A0="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { homepage = "https://docs.databricks.com/dev-tools/python-sql-connector.html"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dataclass-csv/default.nix b/python/pkgs/dataclass-csv/default.nix index e897457c7..97a64590f 100644 --- a/python/pkgs/dataclass-csv/default.nix +++ b/python/pkgs/dataclass-csv/default.nix @@ -5,7 +5,7 @@ pytestCheckHook, hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dataclass-csv"; version = "1.4.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dfurtado"; repo = "dataclass-csv"; - tag = version; + tag = finalAttrs.version; hash = "sha256-hDnuPg5xniybR2J91KnJxSlOI+dWzUPQJtYKfqsNCvw="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/dfurtado/dataclass-csv"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/dataclass-wizard/default.nix b/python/pkgs/dataclass-wizard/default.nix index 6af655fcd..c06183f00 100644 --- a/python/pkgs/dataclass-wizard/default.nix +++ b/python/pkgs/dataclass-wizard/default.nix @@ -12,7 +12,7 @@ tomli-w, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dataclass-wizard"; version = "0.39.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rnag"; repo = "dataclass-wizard"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-X4/qe1nv/NwUvQGvVqbqIgi9Ej43jwJjzXyMaKAtN2A="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "wiz"; }; -} +}) diff --git a/python/pkgs/dataclasses-json/default.nix b/python/pkgs/dataclasses-json/default.nix index 1f887fad8..cde70d316 100644 --- a/python/pkgs/dataclasses-json/default.nix +++ b/python/pkgs/dataclasses-json/default.nix @@ -8,7 +8,7 @@ typing-inspect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dataclasses-json"; version = "0.6.7"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lidatong"; repo = "dataclasses-json"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AH/T6pa/CHtQNox67fqqs/BBnUcmThvbnSHug2p33qM="; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'documentation =' 'Documentation =' \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/lidatong/dataclasses-json"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/datadog/default.nix b/python/pkgs/datadog/default.nix index 52252b7cd..80d24a766 100644 --- a/python/pkgs/datadog/default.nix +++ b/python/pkgs/datadog/default.nix @@ -6,7 +6,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datadog"; version = "0.53.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DataDog"; repo = "datadogpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CCbeHDaRg+BV+nwoLbrhMUqtWFkjbvyq1XHAEtkXgW4="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/DataDog/datadogpy"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/datafusion/default.nix b/python/pkgs/datafusion/default.nix index 099f076b5..0207571f1 100644 --- a/python/pkgs/datafusion/default.nix +++ b/python/pkgs/datafusion/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "datafusion"; version = "53.0.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { name = "datafusion-source"; diff --git a/python/pkgs/datamodeldict/default.nix b/python/pkgs/datamodeldict/default.nix index 184df7d05..598b23e72 100644 --- a/python/pkgs/datamodeldict/default.nix +++ b/python/pkgs/datamodeldict/default.nix @@ -2,24 +2,27 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datamodeldict"; version = "0.9.9"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "DataModelDict"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-DadBRsc8qEu9PWgMNllGS2ESKL7kgBLDhg4yDr87WRk="; }; - propagatedBuildInputs = [ xmltodict ]; + build-system = [ setuptools ]; + + dependencies = [ xmltodict ]; # no tests - doCheck = false; pythonImportsCheck = [ "DataModelDict" ]; @@ -28,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/usnistgov/DataModelDict/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/datapoint/default.nix b/python/pkgs/datapoint/default.nix index 8d7a41851..cf28a49e9 100644 --- a/python/pkgs/datapoint/default.nix +++ b/python/pkgs/datapoint/default.nix @@ -11,7 +11,7 @@ versioningit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datapoint"; version = "0.13.0"; pyproject = true; @@ -19,13 +19,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Perseudonymous"; repo = "datapoint-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vgwuoG/2Lzo56cAiXEYNPsXQYfx8Cwg0NJgojDBxoug="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/Perseudonymous/datapoint-python"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/dataproperty/default.nix b/python/pkgs/dataproperty/default.nix index 7ebfb8093..78709dece 100644 --- a/python/pkgs/dataproperty/default.nix +++ b/python/pkgs/dataproperty/default.nix @@ -10,7 +10,7 @@ typepy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dataproperty"; version = "1.1.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thombashi"; repo = "dataproperty"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PLXF9g0VIkmsRLl5+KvXcbbwVwaJSYjWB7l8xz1mPZM="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/thombashi/DataProperty"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dataset/default.nix b/python/pkgs/dataset/default.nix index ef3160b41..fb0beed5e 100644 --- a/python/pkgs/dataset/default.nix +++ b/python/pkgs/dataset/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dataset"; version = "2.0.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pudo"; repo = "dataset"; - tag = version; + tag = finalAttrs.version; hash = "sha256-A8X1Gv+b+K90LAZ5YDjeUbl3Y1fiaFwGj6urapLN3AQ="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://dataset.readthedocs.io"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/datasets/3.nix b/python/pkgs/datasets/3.nix index 449c4251c..ba8a0b151 100644 --- a/python/pkgs/datasets/3.nix +++ b/python/pkgs/datasets/3.nix @@ -64,7 +64,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests require pervasive internet access - doCheck = false; # Module import will attempt to create a cache directory postFixup = "export HF_MODULES_CACHE=$TMPDIR"; diff --git a/python/pkgs/datasette-publish-fly/default.nix b/python/pkgs/datasette-publish-fly/default.nix index 374e20509..24890fa0c 100644 --- a/python/pkgs/datasette-publish-fly/default.nix +++ b/python/pkgs/datasette-publish-fly/default.nix @@ -4,23 +4,27 @@ cogapp, datasette, fetchFromGitHub, + # build-system + setuptools, pytest-mock, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datasette-publish-fly"; version = "1.3.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "datasette-publish-fly"; - tag = version; + tag = finalAttrs.version; hash = "sha256-diaxr+fNNgkJvLGkLo+lK0ThTsXYDePFsvTetMbDRMk="; }; - propagatedBuildInputs = [ datasette ]; + build-system = [ setuptools ]; + + dependencies = [ datasette ]; nativeCheckInputs = [ cogapp @@ -35,4 +39,4 @@ buildPythonPackage rec { homepage = "https://datasette.io/plugins/datasette-publish-fly"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/datasette-template-sql/default.nix b/python/pkgs/datasette-template-sql/default.nix index d204ae2cf..e1b5a9080 100644 --- a/python/pkgs/datasette-template-sql/default.nix +++ b/python/pkgs/datasette-template-sql/default.nix @@ -3,24 +3,27 @@ buildPythonPackage, datasette, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datasette-template-sql"; version = "1.0.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "datasette-template-sql"; - rev = version; + tag = finalAttrs.version; hash = "sha256-VmdIEDk3iCBFrTPMm6ud00Z5CWqO0Wk707IQ4oVx5ak="; }; - propagatedBuildInputs = [ datasette ]; + build-system = [ setuptools ]; + + dependencies = [ datasette ]; # Tests require a running datasette instance - doCheck = false; pythonImportsCheck = [ "datasette_template_sql" ]; @@ -29,4 +32,4 @@ buildPythonPackage rec { homepage = "https://datasette.io/plugins/datasette-template-sql"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/datasette/default.nix b/python/pkgs/datasette/default.nix index 7cc3255e3..ad930aea0 100644 --- a/python/pkgs/datasette/default.nix +++ b/python/pkgs/datasette/default.nix @@ -28,7 +28,7 @@ trustme, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datasette"; version = "0.65.3"; pyproject = true; @@ -36,7 +36,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = "datasette"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2YID5Y8gRppYAKBk8x0oHnxTxkeXrWDKL6olX3+uutA="; }; @@ -92,4 +92,4 @@ buildPythonPackage rec { homepage = "https://datasette.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/datashader/default.nix b/python/pkgs/datashader/default.nix index 7e557f3ef..a969c0458 100644 --- a/python/pkgs/datashader/default.nix +++ b/python/pkgs/datashader/default.nix @@ -22,7 +22,7 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datashader"; version = "0.19.1"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "holoviz"; repo = "datashader"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jP6e7YmLyg3wd8QQZ4Vzr7vRFsRmttjIrEgIFqd6+hQ="; }; @@ -73,4 +73,4 @@ buildPythonPackage rec { homepage = "https://datashader.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/datashaper/default.nix b/python/pkgs/datashaper/default.nix index 08fc3b036..fb74b0854 100644 --- a/python/pkgs/datashaper/default.nix +++ b/python/pkgs/datashaper/default.nix @@ -10,13 +10,13 @@ pyarrow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datashaper"; version = "0.0.49"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Bb+6WWRHSmK91SWew/oBc9AeNlIItqSv9OoOYwlqdTM="; }; @@ -35,11 +35,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "datashaper" ]; # pypi tarball has no tests - doCheck = false; meta = { description = "Collection of utilities for doing lightweight data wrangling"; homepage = "https://github.com/microsoft/datashaper/tree/main/python/datashaper"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/datauri/default.nix b/python/pkgs/datauri/default.nix index d03b34163..dea8ceb9a 100644 --- a/python/pkgs/datauri/default.nix +++ b/python/pkgs/datauri/default.nix @@ -9,7 +9,7 @@ cached-property, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datauri"; version = "3.0.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fcurella"; repo = "python-datauri"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WrOQPUZ9vaLSR0hxIvCK8kBnARiOLh6qqWBw/h6XpaY="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/fcurella/python-datauri"; license = lib.licenses.unlicense; }; -} +}) diff --git a/python/pkgs/datefinder/default.nix b/python/pkgs/datefinder/default.nix index 2cf0daf5e..ffc8a4661 100644 --- a/python/pkgs/datefinder/default.nix +++ b/python/pkgs/datefinder/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "0.7.3"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "akoumjian"; repo = "datefinder"; diff --git a/python/pkgs/dateparser/default.nix b/python/pkgs/dateparser/default.nix index 4bfc762c8..b5521af17 100644 --- a/python/pkgs/dateparser/default.nix +++ b/python/pkgs/dateparser/default.nix @@ -13,7 +13,7 @@ langdetect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dateparser"; version = "1.4.3"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scrapinghub"; repo = "dateparser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HaT+8aJ1qJ0irbDsv0nGn5Ln58lxfIIO6MnV+iOdEPM="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "dateparser-download"; }; -} +}) diff --git a/python/pkgs/datetime/default.nix b/python/pkgs/datetime/default.nix index 73f5c20b5..3bd7f9195 100644 --- a/python/pkgs/datetime/default.nix +++ b/python/pkgs/datetime/default.nix @@ -7,17 +7,22 @@ zope_interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "DateTime"; version = "6.0"; pyproject = true; src = fetchPypi { pname = "datetime"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-wVFJNtL5AeEMjgjYO/BObJ29fKTyRNqU/smAmAo7xNU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools >= 78.1.1,< 81" "setuptools" + ''; + build-system = [ setuptools ]; dependencies = [ @@ -32,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/DateTime"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/dateutils/default.nix b/python/pkgs/dateutils/default.nix index f20f60fa1..501ccc311 100644 --- a/python/pkgs/dateutils/default.nix +++ b/python/pkgs/dateutils/default.nix @@ -7,13 +7,13 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dateutils"; version = "0.6.12"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/jmcantrell/python-dateutils"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/datrie/default.nix b/python/pkgs/datrie/default.nix index 761105f8c..b995e3642 100644 --- a/python/pkgs/datrie/default.nix +++ b/python/pkgs/datrie/default.nix @@ -9,13 +9,13 @@ hypothesis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datrie"; version = "0.8.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6gIa1MiovxTginHHhypiKqOZpRD5gSloJQkcfKBDboA="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/kmike/datrie"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/dawg-python/default.nix b/python/pkgs/dawg-python/default.nix index afcfe67ee..71062b2a1 100644 --- a/python/pkgs/dawg-python/default.nix +++ b/python/pkgs/dawg-python/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "DAWG-Python"; version = "0.7.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Sl4yhuYmHMoC8gXP1VFqerEBkPowxRwo00WAj1leNCE="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytries/DAWG-Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dawg2-python/default.nix b/python/pkgs/dawg2-python/default.nix index ec5e48476..0846982b9 100644 --- a/python/pkgs/dawg2-python/default.nix +++ b/python/pkgs/dawg2-python/default.nix @@ -13,7 +13,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dawg2-python"; version = "0.9.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pymorphy2-fork"; repo = "DAWG-Python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-45k7QmozbMt7qYdDFRSL5JDeEtqdMHBoEXXQkLDoGfE="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/pymorphy2-fork/DAWG-Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dazl/default.nix b/python/pkgs/dazl/default.nix index 9f8a323d0..9517a57f0 100644 --- a/python/pkgs/dazl/default.nix +++ b/python/pkgs/dazl/default.nix @@ -17,7 +17,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dazl"; version = "8.9.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "digital-asset"; repo = "dazl-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZJBaamazyNAYU5xbUvNGLUV5OsyymCdJCoUvoUlIkm4="; }; @@ -55,7 +55,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "dazl" ]; # daml: command not found - doCheck = false; nativeCheckInputs = [ pytestCheckHook @@ -67,4 +66,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; homepage = "https://github.com/digital-asset/dazl-client"; }; -} +}) diff --git a/python/pkgs/db-dtypes/default.nix b/python/pkgs/db-dtypes/default.nix index 1ef9a50cf..13145abeb 100644 --- a/python/pkgs/db-dtypes/default.nix +++ b/python/pkgs/db-dtypes/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "db-dtypes"; version = "1.5.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "python-db-dtypes-pandas"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cF40Y2J944AojOXKoTzQ/ybTFY4GP5G8KWY6+NWyRT8="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-db-dtypes-pandas"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dbf/default.nix b/python/pkgs/dbf/default.nix index c1c8f7389..75898e42e 100644 --- a/python/pkgs/dbf/default.nix +++ b/python/pkgs/dbf/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "0.99.11"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "dbf"; inherit (finalAttrs) version; diff --git a/python/pkgs/dbfread/default.nix b/python/pkgs/dbfread/default.nix index a0d047d90..8c238e35d 100644 --- a/python/pkgs/dbfread/default.nix +++ b/python/pkgs/dbfread/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbfread"; version = "2.0.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-B8iprwb/rT9vA+j+ka19JzPjGibStyxN1M+64H7jtz0="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://dbfread.readthedocs.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dbglib/default.nix b/python/pkgs/dbglib/default.nix index 142a47e1c..b8efbaad4 100644 --- a/python/pkgs/dbglib/default.nix +++ b/python/pkgs/dbglib/default.nix @@ -5,18 +5,18 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbglib"; version = "0.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "7b4fd5c4949af435a7ab558f87b406acd5ddf9dc7f01fc3b3e99ebcec9a4674c"; }; - propagatedBuildInputs = [ poetry-core ]; + dependencies = [ poetry-core ]; pythonImportsCheck = [ "dbglib" ]; meta = { homepage = "https://github.com/savioxavier/dbglib/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dbt-adapters/default.nix b/python/pkgs/dbt-adapters/default.nix index fa7859fb8..28725ec05 100644 --- a/python/pkgs/dbt-adapters/default.nix +++ b/python/pkgs/dbt-adapters/default.nix @@ -12,7 +12,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbt-adapters"; version = "1.24.5"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { # missing tags on GitHub src = fetchPypi { pname = "dbt_adapters"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-h94Jag1bIZkF8QebAC8T40R/+2NVj088W3J4Zw0Ziss="; }; @@ -45,10 +45,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "dbt.adapters" ]; # circular dependencies - doCheck = false; meta = { description = "Set of adapter protocols and base functionality that supports integration with dbt-core"; homepage = "https://github.com/dbt-labs/dbt-adapters"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dbt-bigquery/default.nix b/python/pkgs/dbt-bigquery/default.nix index a5bdfa006..e8e66596e 100644 --- a/python/pkgs/dbt-bigquery/default.nix +++ b/python/pkgs/dbt-bigquery/default.nix @@ -18,7 +18,7 @@ # tests }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbt-bigquery"; version = "1.9.1"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-bigquery"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YZA8lcUGoq5jMNS1GlbBd036X2F3khsZWr5Pv65zpPI="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-bigquery"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dbt-common/default.nix b/python/pkgs/dbt-common/default.nix index b69723fda..a108e0b92 100644 --- a/python/pkgs/dbt-common/default.nix +++ b/python/pkgs/dbt-common/default.nix @@ -27,7 +27,7 @@ pytest-xdist, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbt-common"; version = "1.37.3-unstable-2026-03-27"; pyproject = true; @@ -74,7 +74,7 @@ buildPythonPackage rec { #!nix-shell -i bash -p git common-updater-scripts perl tmpdir="$(mktemp -d)" - git clone --depth=1 "${src.gitRepoUrl}" "$tmpdir" + git clone --depth=1 "${finalAttrs.src.gitRepoUrl}" "$tmpdir" pushd "$tmpdir" @@ -95,4 +95,4 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-common"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dbt-core/default.nix b/python/pkgs/dbt-core/default.nix index 991175035..ef2a7a767 100644 --- a/python/pkgs/dbt-core/default.nix +++ b/python/pkgs/dbt-core/default.nix @@ -96,7 +96,6 @@ buildPythonPackage (finalAttrs: { ++ mashumaro.optional-dependencies.msgpack; # tests exist for the dbt tool but not for this package specifically - doCheck = false; passthru = { withAdapters = callPackage ./with-adapters.nix { }; diff --git a/python/pkgs/dbt-extractor/default.nix b/python/pkgs/dbt-extractor/default.nix index 3c4b7a086..d0ce22087 100644 --- a/python/pkgs/dbt-extractor/default.nix +++ b/python/pkgs/dbt-extractor/default.nix @@ -7,19 +7,19 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbt-extractor"; version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "dbt_extractor"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-1s8I7Hk7i8K9biYO+BgjCuaKT3FDb6SJ8I19saUuL/4="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-6Y4zfqhj1/IeEX+Ve49jblxeW565Q2ypNClb/Ej0xoc="; }; @@ -31,7 +31,6 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # no python tests exist - doCheck = false; pythonImportsCheck = [ "dbt_extractor" ]; @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-extractor"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dbt-postgres/default.nix b/python/pkgs/dbt-postgres/default.nix index 9c40e9318..ec5d5c1f2 100644 --- a/python/pkgs/dbt-postgres/default.nix +++ b/python/pkgs/dbt-postgres/default.nix @@ -10,7 +10,7 @@ psycopg2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbt-postgres"; version = "1.9.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-postgres"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lywWf78rluX17D5bcfehHd7X18tAdw3HZ65v440jETc="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-core"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dbt-protos/default.nix b/python/pkgs/dbt-protos/default.nix index eab14f200..a36af00f6 100644 --- a/python/pkgs/dbt-protos/default.nix +++ b/python/pkgs/dbt-protos/default.nix @@ -6,7 +6,7 @@ protobuf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbt-protos"; version = "1.0.455"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dbt-labs"; repo = "proto-python-public"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-o0H5sGXVxiZgc9Vdwgd5IUlzqHRqSuYbkwI/R9M8uY8="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/proto-python-public"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dbt-redshift/default.nix b/python/pkgs/dbt-redshift/default.nix index 4def8b81d..2c13d97af 100644 --- a/python/pkgs/dbt-redshift/default.nix +++ b/python/pkgs/dbt-redshift/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbt-redshift"; version = "1.9.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-redshift"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ayt5KRH3jAoi7k+0yfk1ZSqG4qsM+zny8tDnWOWO5oA="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-redshift"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dbt-snowflake/default.nix b/python/pkgs/dbt-snowflake/default.nix index eca9692f5..af28d5e62 100644 --- a/python/pkgs/dbt-snowflake/default.nix +++ b/python/pkgs/dbt-snowflake/default.nix @@ -7,7 +7,7 @@ snowflake-connector-python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbt-snowflake"; version = "1.11.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { # missing tags on GitHub src = fetchPypi { pname = "dbt_snowflake"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-C2uS13vwN9AuZ0XgrdRHMsunuzSwoM06HGFmJ45Bs0A="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-adapters/blob/main/dbt-snowflake"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dbus-client-gen/default.nix b/python/pkgs/dbus-client-gen/default.nix index ce0bbb0e4..ee0eb4eb1 100644 --- a/python/pkgs/dbus-client-gen/default.nix +++ b/python/pkgs/dbus-client-gen/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbus-client-gen"; version = "0.5.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vRXo72aWoreH/VwzdEAOgoGSRzRf7vy8Z/IA+lnLoWw="; }; + build-system = [ setuptools ]; + meta = { description = "Python Library for Generating D-Bus Client Code"; homepage = "https://github.com/stratis-storage/dbus-client-gen"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/dbus-deviation/default.nix b/python/pkgs/dbus-deviation/default.nix index 3dc15ffd1..e9128c25d 100644 --- a/python/pkgs/dbus-deviation/default.nix +++ b/python/pkgs/dbus-deviation/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbus-deviation"; version = "0.6.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4GuI7+IjiF0nJd9Rz3ybe0Y9HG8E6knUaQh0MY0Ot6M="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { description = "Project for parsing D-Bus introspection XML and processing it in various ways"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/dbus-next/default.nix b/python/pkgs/dbus-next/default.nix index e8692f0f0..e4e16faa7 100644 --- a/python/pkgs/dbus-next/default.nix +++ b/python/pkgs/dbus-next/default.nix @@ -7,7 +7,7 @@ dbus, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbus-next"; version = "0.2.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "altdesktop"; repo = "python-dbus-next"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EKEQZFRUe+E65Z6DNCJFL5uCI5kbXrN7Tzd4O0X5Cqo="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/altdesktop/python-dbus-next"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dbus-python/default.nix b/python/pkgs/dbus-python/default.nix index cdbb1b851..9c38c97cd 100644 --- a/python/pkgs/dbus-python/default.nix +++ b/python/pkgs/dbus-python/default.nix @@ -16,7 +16,7 @@ lib.fix ( finalPackage: - buildPythonPackage rec { + buildPythonPackage (finalAttrs: { pname = "dbus-python"; version = "1.4.0"; pyproject = true; @@ -29,7 +29,7 @@ lib.fix ( ]; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-mRZm5Jj2Db8+Sbi3Z49VWbimUDT99hquYs3s232Jx3A="; }; @@ -75,5 +75,5 @@ lib.fix ( ln -s $dev/include/*/dbus_python/dbus-1.0/ $dev/include/dbus-1.0 ''; - } + }) ) diff --git a/python/pkgs/dbus-signature-pyparsing/default.nix b/python/pkgs/dbus-signature-pyparsing/default.nix index a225541e3..bf034ab4b 100644 --- a/python/pkgs/dbus-signature-pyparsing/default.nix +++ b/python/pkgs/dbus-signature-pyparsing/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pyparsing, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbus-signature-pyparsing"; version = "0.4.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "stratis-storage"; repo = "dbus-signature-pyparsing"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+jY8kg3jBDpZr5doih3DiyUEcSskq7TgubmW3qdBoZM="; }; - propagatedBuildInputs = [ pyparsing ]; + build-system = [ setuptools ]; + + dependencies = [ pyparsing ]; pythonImportsCheck = [ "dbus_signature_pyparsing" ]; meta = { @@ -25,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/stratis-storage/dbus-signature-pyparsing"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dbutils/default.nix b/python/pkgs/dbutils/default.nix index 46e50e5df..cf509dc72 100644 --- a/python/pkgs/dbutils/default.nix +++ b/python/pkgs/dbutils/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbutils"; version = "3.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3+P16244MELWitB+Tpd4squ8xGJ6KD+F78ghAxnAddI="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://webwareforpython.github.io/DBUtils/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ddt/default.nix b/python/pkgs/ddt/default.nix index a4016a74c..8f1b50cea 100644 --- a/python/pkgs/ddt/default.nix +++ b/python/pkgs/ddt/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ddt"; version = "1.7.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0hXWsIOWMBPEoZseTc1qlugOQ6t3UZWXpqz88umj4Es="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "ddt" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/txels/ddt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/deap/default.nix b/python/pkgs/deap/default.nix index cb88e6a6f..d195b64fb 100644 --- a/python/pkgs/deap/default.nix +++ b/python/pkgs/deap/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "1.4.4"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) version; pname = "deap"; diff --git a/python/pkgs/debian-inspector/default.nix b/python/pkgs/debian-inspector/default.nix index e14cbcb2f..a91ae6d70 100644 --- a/python/pkgs/debian-inspector/default.nix +++ b/python/pkgs/debian-inspector/default.nix @@ -9,14 +9,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "debian-inspector"; version = "31.1.1"; pyproject = true; src = fetchPypi { pname = "debian_inspector"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-uyFsYrb7D9cM1OQzkIERX0oV711uI/TEKF6t67z8egU="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/debtcollector/default.nix b/python/pkgs/debtcollector/default.nix index d3fa7795a..a4486deb3 100644 --- a/python/pkgs/debtcollector/default.nix +++ b/python/pkgs/debtcollector/default.nix @@ -8,13 +8,13 @@ wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "debtcollector"; version = "3.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-J4pFYIzxbnnArhCFHYaRhca3j4ZhDfjyekUaGMH+xzI="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/debtcollector"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/debts/default.nix b/python/pkgs/debts/default.nix index c96c25545..e2c73d165 100644 --- a/python/pkgs/debts/default.nix +++ b/python/pkgs/debts/default.nix @@ -3,14 +3,16 @@ python, buildPythonPackage, fetchFromGitLab, + # build-system + setuptools, jinja2, pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "debts"; version = "0.5"; - format = "setuptools"; + pyproject = true; # pypi does not ship tests src = fetchFromGitLab { @@ -21,7 +23,9 @@ buildPythonPackage rec { sha256 = "1d66nka81mv9c07mki78lp5hdajqv4cq6aq2k7bh3mhkc5hwnwlg"; }; - propagatedBuildInputs = [ jinja2 ]; + build-system = [ setuptools ]; + + dependencies = [ jinja2 ]; nativeCheckInputs = [ pytest ]; @@ -33,9 +37,9 @@ buildPythonPackage rec { ''; meta = { - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "Simple library and cli-tool to help you solve some debts settlement scenarios"; mainProgram = "debts"; license = lib.licenses.beerware; }; -} +}) diff --git a/python/pkgs/debuglater/default.nix b/python/pkgs/debuglater/default.nix index adcbdc398..e56f86e8d 100644 --- a/python/pkgs/debuglater/default.nix +++ b/python/pkgs/debuglater/default.nix @@ -4,24 +4,28 @@ colorama, dill, fetchFromGitHub, + # build-system + setuptools, numpy, pandas, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "debuglater"; version = "1.4.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ploomber"; repo = "debuglater"; - tag = version; + tag = finalAttrs.version; hash = "sha256-o9IAk3EN8ghEft7Y7Xx+sEjWMNgoyiZ0eiBqnCyXkm8="; }; - propagatedBuildInputs = [ colorama ]; + build-system = [ setuptools ]; + + dependencies = [ colorama ]; optional-dependencies = { all = [ dill ]; @@ -32,7 +36,7 @@ buildPythonPackage rec { pandas pytestCheckHook ] - ++ optional-dependencies.all; + ++ finalAttrs.optional-dependencies.all; pythonImportsCheck = [ "debuglater" ]; @@ -41,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/ploomber/debuglater"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/debugpy/default.nix b/python/pkgs/debugpy/default.nix index 0999f0061..f7de313c1 100644 --- a/python/pkgs/debugpy/default.nix +++ b/python/pkgs/debugpy/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "debugpy"; version = "1.8.21"; pyproject = true; @@ -16,10 +16,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "debugpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; postFetch = '' - sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' "$out/src/debugpy/_version.py" + sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${finalAttrs.src.tag})"/' "$out/src/debugpy/_version.py" ''; hash = "sha256-7XM476tfL6QLCHB1kwlbN/dmlgnjuTE+ulQ9yOHfgEE="; @@ -66,4 +66,4 @@ buildPythonPackage rec { "riscv64-linux" ]; }; -} +}) diff --git a/python/pkgs/decli/default.nix b/python/pkgs/decli/default.nix index 2fbc99a52..406a72db1 100644 --- a/python/pkgs/decli/default.nix +++ b/python/pkgs/decli/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "decli"; version = "0.6.3"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "woile"; repo = "decli"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-W4GURqlkHzDwrPAlmiBjc2ZqN//nUK084uRMM7GIme0="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/Woile/decli"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/declinate/default.nix b/python/pkgs/declinate/default.nix index 0303bdc3c..7c7b020db 100644 --- a/python/pkgs/declinate/default.nix +++ b/python/pkgs/declinate/default.nix @@ -14,7 +14,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "declinate"; version = "0.0.6"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "ternaris"; repo = "declinate"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JEO/GtbG/yQuj8vJJaWex9mGy6qpWOPHGlKrdG9vt28="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/ternaris/declinate"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/decopatch/default.nix b/python/pkgs/decopatch/default.nix index 0ffb92ed0..bb09fef68 100644 --- a/python/pkgs/decopatch/default.nix +++ b/python/pkgs/decopatch/default.nix @@ -7,13 +7,13 @@ makefun, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "decopatch"; version = "1.4.10"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lX9JyT9BUBgsI/j7UdE7syE+DxenngnIzKcFdZi1VyA="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/smarie/python-decopatch"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/decora-wifi/default.nix b/python/pkgs/decora-wifi/default.nix index 2f875ecb0..bb40c566e 100644 --- a/python/pkgs/decora-wifi/default.nix +++ b/python/pkgs/decora-wifi/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "decora-wifi"; version = "1.5"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { #No tag in github, so fetchPypi is OK to use. src = fetchPypi { pname = "decora_wifi"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-oWETtzZueNJC0lTWdLfk3SOuvnqrJ9wp5rOSPJxH3M4="; }; @@ -29,11 +29,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "decora_wifi" ]; # No tests in Pypi source - doCheck = false; meta = { description = "Python library for controlling Leviton Decora Smart Wi-Fi devices"; homepage = "https://github.com/tlyakhov/python-decora_wifi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/decorator/default.nix b/python/pkgs/decorator/default.nix index c2c6c5dde..cac1779e6 100644 --- a/python/pkgs/decorator/default.nix +++ b/python/pkgs/decorator/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "decorator"; version = "5.2.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "micheles"; repo = "decorator"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UBjZ8LdgJ6iLBjNTlA3up0qAVBqTSZMJt7oEhUo3ZEo="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { description = "Better living through Python with decorators"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/dedupe-levenshtein-search/default.nix b/python/pkgs/dedupe-levenshtein-search/default.nix index 7df442e84..818a7d6e1 100644 --- a/python/pkgs/dedupe-levenshtein-search/default.nix +++ b/python/pkgs/dedupe-levenshtein-search/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dedupe-levenshtein-search"; version = "1.4.5"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dedupeio"; repo = "Levenshtein_search"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YhsZA28H4OUkQEBtJ+9OXJld4Z/PJbOPqAQQ9qaXSjk="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/dedupeio/Levenshtein_search"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/deemix/default.nix b/python/pkgs/deemix/default.nix index 081ded0be..b18f1a055 100644 --- a/python/pkgs/deemix/default.nix +++ b/python/pkgs/deemix/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, spotipy, click, pycryptodomex, @@ -10,17 +12,19 @@ deezer-py, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deemix"; version = "3.6.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xEahzA1PIrGPfnnOcuXQLVQpSVOUFk6/0v9ViLgWCwk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ spotipy click pycryptodomex @@ -30,7 +34,6 @@ buildPythonPackage rec { ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "deezer" ]; @@ -40,4 +43,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/RemixDev/deemix-py"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/deep-chainmap/default.nix b/python/pkgs/deep-chainmap/default.nix index 5eb1dc826..6b30d7440 100644 --- a/python/pkgs/deep-chainmap/default.nix +++ b/python/pkgs/deep-chainmap/default.nix @@ -6,14 +6,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deep-chainmap"; version = "0.2.0"; pyproject = true; src = fetchPypi { pname = "deep_chainmap"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-lrCg6GGxjq/Y3t1c1HpJuaP+XVvVrOcB5aVaem5E/I8="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/neutrinoceros/deep_chainmap"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/deep-translator/default.nix b/python/pkgs/deep-translator/default.nix index 0572eaa60..f930657f1 100644 --- a/python/pkgs/deep-translator/default.nix +++ b/python/pkgs/deep-translator/default.nix @@ -8,20 +8,20 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deep-translator"; version = "1.11.4"; pyproject = true; src = fetchPypi { pname = "deep_translator"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-gBJgxpIxE4cH6oiglV5ITbfUDiEMngrg93Ny/9pfS/U="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 requests click @@ -34,11 +34,10 @@ buildPythonPackage rec { # Again, initializing an instance needs network connection. # Tests will fail. - doCheck = false; meta = { description = "Python tool to translate between different languages by using multiple translators"; homepage = "https://deep-translator.readthedocs.io"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/deepdiff/default.nix b/python/pkgs/deepdiff/default.nix index 456cb9b4c..2d28a5d65 100644 --- a/python/pkgs/deepdiff/default.nix +++ b/python/pkgs/deepdiff/default.nix @@ -15,7 +15,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deepdiff"; version = "9.0.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "seperman"; repo = "deepdiff"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+QHYYts6FGOrg01+SjUQTxW6kjbwIG3NVSKDYKWvels="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/seperman/deepdiff"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/deepdish/default.nix b/python/pkgs/deepdish/default.nix index d18f7cb65..7f7ecfb70 100644 --- a/python/pkgs/deepdish/default.nix +++ b/python/pkgs/deepdish/default.nix @@ -12,13 +12,13 @@ tables, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deepdish"; version = "0.3.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-av86vvaTzsNEOPGD8p0aLZhiq6J7uVnU8k1W4AfkH/M="; }; @@ -44,7 +44,6 @@ buildPythonPackage rec { # ]; # The tests are broken: `ModuleNotFoundError: No module named 'deepdish.six.conf'` - doCheck = false; meta = { description = "Flexible HDF5 saving/loading and other data science tools from the University of Chicago"; @@ -52,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/uchicago-cs/deepdish"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/deepl/default.nix b/python/pkgs/deepl/default.nix index eb0aa0108..10c135895 100644 --- a/python/pkgs/deepl/default.nix +++ b/python/pkgs/deepl/default.nix @@ -6,24 +6,23 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deepl"; version = "1.32.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-MBa/hvH1Prbl/ttFh0bGv2V5qEC1fFSi7XAbA0S8eeE="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ requests ]; # Requires internet access and an API key - doCheck = false; pythonImportsCheck = [ "deepl" ]; @@ -33,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/DeepLcom/deepl-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/deepmerge/default.nix b/python/pkgs/deepmerge/default.nix index 161dafe23..ef39062f8 100644 --- a/python/pkgs/deepmerge/default.nix +++ b/python/pkgs/deepmerge/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deepmerge"; version = "3.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NbOaTLks8yjW7KYcu/ZfaKN8LOswhfD4U8uy5SpZ/CM="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/toumorokoshi/deepmerge"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/deepsearch-toolkit/default.nix b/python/pkgs/deepsearch-toolkit/default.nix index 9f3e8f901..ebb409d82 100644 --- a/python/pkgs/deepsearch-toolkit/default.nix +++ b/python/pkgs/deepsearch-toolkit/default.nix @@ -23,7 +23,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deepsearch-toolkit"; version = "2.0.1"; pyproject = true; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DS4SD"; repo = "deepsearch-toolkit"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nrz9pvyA5gPIaKt6CsJOB9cLy3sXiWW5e1Rk4vtNIY8="; }; @@ -89,4 +89,4 @@ buildPythonPackage rec { homepage = "https://github.com/DS4SD/deepsearch-toolkit"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/deeptoolsintervals/default.nix b/python/pkgs/deeptoolsintervals/default.nix index 42a44035d..5228c4a51 100644 --- a/python/pkgs/deeptoolsintervals/default.nix +++ b/python/pkgs/deeptoolsintervals/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, zlib, xz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deeptoolsintervals"; version = "0.1.9"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1xnl80nblysj6dylj4683wgrfa425rkx4dp5k65hvwdns9pw753x"; }; + build-system = [ setuptools ]; + buildInputs = [ zlib xz @@ -26,4 +30,4 @@ buildPythonPackage rec { description = "Helper library for deeptools"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/deezer-py/default.nix b/python/pkgs/deezer-py/default.nix index 7a5e5c7d1..a5db899e7 100644 --- a/python/pkgs/deezer-py/default.nix +++ b/python/pkgs/deezer-py/default.nix @@ -10,13 +10,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deezer-py"; version = "1.3.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-saMy+IeAy6H9SgS8XHnZ9klFerGyr+vQqhuCtimgbEo="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/RemixDev/deezer-py"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/deezer-python-async/default.nix b/python/pkgs/deezer-python-async/default.nix index c68819ab5..dfaaf6d87 100644 --- a/python/pkgs/deezer-python-async/default.nix +++ b/python/pkgs/deezer-python-async/default.nix @@ -11,7 +11,7 @@ asyncio-throttle, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deezer-python-async"; version = "0.3.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "music-assistant"; repo = "deezer-python-async"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uuAB+SC/ECG50ox/6Bi+94bAt+YZokeQChpDQUAK+zc="; }; @@ -32,8 +32,6 @@ buildPythonPackage rec { asyncio-throttle ]; - doCheck = false; # requires access to the deezer api - pythonImportsCheck = [ "deezer" ]; @@ -43,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/music-assistant/deezer-python-async"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/defang/default.nix b/python/pkgs/defang/default.nix index 5a7f440ed..74eae18e6 100644 --- a/python/pkgs/defang/default.nix +++ b/python/pkgs/defang/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "defang"; version = "0.5.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromBitbucket { owner = "johannestaas"; repo = "defang"; - tag = version; + tag = finalAttrs.version; hash = "sha256-OJfayJeVf2H1/jg7/fu2NiHhRHNCaLGI29SY8BnJyxI="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://bitbucket.org/johannestaas/defang"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/defcon/default.nix b/python/pkgs/defcon/default.nix index cc4089dd3..a973a2e5f 100644 --- a/python/pkgs/defcon/default.nix +++ b/python/pkgs/defcon/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, setuptools-scm, fonttools, fontpens, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "defcon"; version = "0.12.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Jd/n/QFSzPKSyxkNGSikfViImcILBGhUKT4DnhyT5eA="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ fonttools ] ++ fonttools.optional-dependencies.ufo @@ -37,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/robotools/defcon"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/deform/default.nix b/python/pkgs/deform/default.nix index 1b18dd6cc..e3290e80b 100644 --- a/python/pkgs/deform/default.nix +++ b/python/pkgs/deform/default.nix @@ -16,13 +16,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deform"; version = "2.0.15"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-HpEpN2UMHbuDAHndnAOZUHYqIwIjpWd0D78bI/EJA2c="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { lib.licenses.cc-by-30 ]; }; -} +}) diff --git a/python/pkgs/defusedcsv/default.nix b/python/pkgs/defusedcsv/default.nix index c377226e8..fb20207d7 100644 --- a/python/pkgs/defusedcsv/default.nix +++ b/python/pkgs/defusedcsv/default.nix @@ -2,23 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, # tests pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "defusedcsv"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "raphaelm"; repo = "defusedcsv"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OEDZbltnh2tAM58Kk852W0so7oOSv7S+S046MjIOMfY="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "defusedcsv.csv" ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/raphaelm/defusedcsv"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/defusedxml/default.nix b/python/pkgs/defusedxml/default.nix index 408d06070..84f23a264 100644 --- a/python/pkgs/defusedxml/default.nix +++ b/python/pkgs/defusedxml/default.nix @@ -6,7 +6,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "defusedxml"; version = "0.8.0rc2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tiran"; repo = "defusedxml"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-X88A5V9uXP3wJQ+olK6pZJT66LP2uCXLK8goa5bPARA="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/tiran/defusedxml"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/dehinter/default.nix b/python/pkgs/dehinter/default.nix index ac0e98690..744d5c439 100644 --- a/python/pkgs/dehinter/default.nix +++ b/python/pkgs/dehinter/default.nix @@ -16,13 +16,13 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "source-foundry"; repo = "dehinter"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-l988SW6OWKXzJK0WGAJZR/QDFvgnSir+5TwMMvFcOxg="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ fonttools ]; + dependencies = [ fonttools ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/python/pkgs/deid/default.nix b/python/pkgs/deid/default.nix index 5576b921d..16f760952 100644 --- a/python/pkgs/deid/default.nix +++ b/python/pkgs/deid/default.nix @@ -34,7 +34,7 @@ let }; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deid"; version = "0.4.6"; pyproject = true; @@ -70,4 +70,4 @@ buildPythonPackage rec { homepage = "https://pydicom.github.io/deid"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dek/default.nix b/python/pkgs/dek/default.nix index f31519f1e..f41aee4f2 100644 --- a/python/pkgs/dek/default.nix +++ b/python/pkgs/dek/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dek"; version = "1.6.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rec"; repo = "dek"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-G0m8p8nvvhQAccvkkD7WwmL3iA/zgS7CsyPwtHdoxJM="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/rec/dek"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/delegator-py/default.nix b/python/pkgs/delegator-py/default.nix index a3f9a95de..9da72e276 100644 --- a/python/pkgs/delegator-py/default.nix +++ b/python/pkgs/delegator-py/default.nix @@ -6,7 +6,7 @@ pexpect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.1.1"; pname = "delegator-py"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amitt001"; repo = "delegator.py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-i9OZkXcDqrKnCFJBBxP8PrHxPGF7DEgZr91p+fuAyZ4="; }; @@ -25,11 +25,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "delegator" ]; # no tests in github or pypi - doCheck = false; meta = { description = "Subprocesses for Humans 2.0"; homepage = "https://github.com/amitt001/delegator.py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/delorean/default.nix b/python/pkgs/delorean/default.nix index 89cd3865d..327fab763 100644 --- a/python/pkgs/delorean/default.nix +++ b/python/pkgs/delorean/default.nix @@ -14,14 +14,14 @@ tzlocal, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "delorean"; version = "1.0.0"; pyproject = true; src = fetchPypi { pname = "Delorean"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-/md4bhIzhSOEi+xViKZYxNQl4S1T61HP74cL7I9XYTQ="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/myusuf3/delorean"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/deltalake/default.nix b/python/pkgs/deltalake/default.nix index 0f2bb037b..67634088d 100644 --- a/python/pkgs/deltalake/default.nix +++ b/python/pkgs/deltalake/default.nix @@ -14,18 +14,18 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deltalake"; version = "1.4.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lX5SYk4dzuNfCSCGjj0Vof6rQPzQ/NRoIjGjPaPUQto="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit (finalAttrs) src; hash = "sha256-z7Qv/YGH2o5rQVeDs1m8fqJd6hgvGvf+TldUvAR7CGY="; }; @@ -64,4 +64,4 @@ buildPythonPackage rec { homepage = "https://github.com/delta-io/delta-rs"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/deluge-client/default.nix b/python/pkgs/deluge-client/default.nix index 43d4a9cf7..a8d398634 100644 --- a/python/pkgs/deluge-client/default.nix +++ b/python/pkgs/deluge-client/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deluge-client"; version = "1.10.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OIGu48Tgyp3YpWtxAEe4N+HQh6g+QhY2oHR3H5Kp8bU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/JohnDoee/deluge-client"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/demjson3/default.nix b/python/pkgs/demjson3/default.nix index ddfa7f5b7..98b7bbab9 100644 --- a/python/pkgs/demjson3/default.nix +++ b/python/pkgs/demjson3/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "3.0.6"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-N8g7DG6wjSXe/IjfCipIddWKeAmpZQvW7uev2AU826w="; diff --git a/python/pkgs/demoji/default.nix b/python/pkgs/demoji/default.nix index 639dd588e..a91c9eaff 100644 --- a/python/pkgs/demoji/default.nix +++ b/python/pkgs/demoji/default.nix @@ -7,7 +7,7 @@ ujson, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "demoji"; version = "1.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bsolomon1124"; repo = "demoji"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ojy4JiM6xvP9J40Z5uFCMUZvZtLZ1le2p/2/NfAUAtk="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/bsolomon1124/demoji"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dependency-groups/default.nix b/python/pkgs/dependency-groups/default.nix index 7fd66fa81..17001123e 100644 --- a/python/pkgs/dependency-groups/default.nix +++ b/python/pkgs/dependency-groups/default.nix @@ -7,7 +7,7 @@ tomli, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dependency-groups"; version = "1.3.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pypa"; repo = "dependency-groups"; - tag = version; + tag = finalAttrs.version; hash = "sha256-qjWvUKUfxYnSUUU3zuS27/a9lxvrHC/qams+XULvxxI="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/dependency-groups"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dependency-injector/default.nix b/python/pkgs/dependency-injector/default.nix index 89d2b58da..f59a8270b 100644 --- a/python/pkgs/dependency-injector/default.nix +++ b/python/pkgs/dependency-injector/default.nix @@ -18,7 +18,6 @@ buildPythonPackage (finalAttrs: { pname = "dependency-injector"; version = "4.49.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "ets-labs"; diff --git a/python/pkgs/deprecated/default.nix b/python/pkgs/deprecated/default.nix index 35dd17861..5a2ec39c0 100644 --- a/python/pkgs/deprecated/default.nix +++ b/python/pkgs/deprecated/default.nix @@ -6,7 +6,7 @@ wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deprecated"; version = "1.3.1"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tantale"; repo = "deprecated"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1mB9aRZOsaW7Mqcu1SWIYTusQ7MlMvUucdTyfu++Nx8="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ wrapt ]; + dependencies = [ wrapt ]; pythonImportsCheck = [ "deprecated" ]; @@ -29,4 +29,4 @@ buildPythonPackage rec { description = "Python @deprecated decorator to deprecate old python classes, functions or methods"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/deprecation-alias/default.nix b/python/pkgs/deprecation-alias/default.nix index 7f4d98069..ada0f8349 100644 --- a/python/pkgs/deprecation-alias/default.nix +++ b/python/pkgs/deprecation-alias/default.nix @@ -7,14 +7,14 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deprecation-alias"; version = "0.4.0"; pyproject = true; src = fetchPypi { pname = "deprecation_alias"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-pY0udEkceDTp0xh4jaYCcvovga64FLQFWkupCgpBdA8="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/domdfcoding/deprecation-alias"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/deprecation/default.nix b/python/pkgs/deprecation/default.nix index 1a1c08eb4..3138aee81 100644 --- a/python/pkgs/deprecation/default.nix +++ b/python/pkgs/deprecation/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deprecation"; version = "2.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1zqqjlgmhgkpzg9ss5ki8wamxl83xn51fs6gn2a8cxsx9vkbvcvj"; }; - propagatedBuildInputs = [ packaging ]; + build-system = [ setuptools ]; + + dependencies = [ packaging ]; meta = { description = "Library to handle automated deprecations"; homepage = "https://deprecation.readthedocs.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/depyf/default.nix b/python/pkgs/depyf/default.nix index 0c59f275a..78ed34125 100644 --- a/python/pkgs/depyf/default.nix +++ b/python/pkgs/depyf/default.nix @@ -16,7 +16,7 @@ pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "depyf"; version = "0.20.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thuml"; repo = "depyf"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GFNlJeD7Nyxr7Ya3aSA6+0AZJSaeDyqXYPEsvhPN1wg="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/thuml/depyf"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/derpconf/default.nix b/python/pkgs/derpconf/default.nix index 7dae1c56b..2f3963c52 100644 --- a/python/pkgs/derpconf/default.nix +++ b/python/pkgs/derpconf/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "derpconf"; version = "0.8.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-66MOqcWIiqJrORJDgAH5iUblHyqJvuf9DIBN56XjKwU="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/globocom/derpconf"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/desktop-entry-lib/default.nix b/python/pkgs/desktop-entry-lib/default.nix index c5fe17e07..b75ceaed7 100644 --- a/python/pkgs/desktop-entry-lib/default.nix +++ b/python/pkgs/desktop-entry-lib/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "desktop-entry-lib"; version = "3.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromCodeberg { owner = "JakobDev"; repo = "desktop-entry-lib"; - rev = version; + tag = finalAttrs.version; hash = "sha256-+c+FuLv88wc4yVw3iyFFtfbocnWzTCIe2DS0SWoj+VI="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://codeberg.org/JakobDev/desktop-entry-lib"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/desktop-notifier/default.nix b/python/pkgs/desktop-notifier/default.nix index e29447635..03b0dab6d 100644 --- a/python/pkgs/desktop-notifier/default.nix +++ b/python/pkgs/desktop-notifier/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "desktop-notifier"; version = "6.2.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SamSchott"; repo = "desktop-notifier"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VVbBKhGCtdsNOfRJPpDk9wwsTtdEwbTSZjheXLydO70="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/samschott/desktop-notifier"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/detect-secrets/default.nix b/python/pkgs/detect-secrets/default.nix index a965135ba..f7aecc515 100644 --- a/python/pkgs/detect-secrets/default.nix +++ b/python/pkgs/detect-secrets/default.nix @@ -15,7 +15,7 @@ withWordList ? true, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "detect-secrets"; version = "1.5.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Yelp"; repo = "detect-secrets"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Jkmx8gZIbyfjoZRbc+Hd4tDoZTZ/dhJwHfTIU9lt5jY="; leaveDotGit = true; }; @@ -34,8 +34,8 @@ buildPythonPackage rec { pyyaml requests ] - ++ lib.optionals withGibberish optional-dependencies.gibberish - ++ lib.optionals withWordList optional-dependencies.word_list; + ++ lib.optionals withGibberish finalAttrs.optional-dependencies.gibberish + ++ lib.optionals withWordList finalAttrs.optional-dependencies.word_list; optional-dependencies = { gibberish = [ @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/Yelp/detect-secrets"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/developer-disk-image/default.nix b/python/pkgs/developer-disk-image/default.nix index 8473db4b4..e950caef3 100644 --- a/python/pkgs/developer-disk-image/default.nix +++ b/python/pkgs/developer-disk-image/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "developer-disk-image"; version = "0.3.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { # GitHub archive is way too large src = fetchPypi { pname = "developer_disk_image"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-H7mEHcxc+B5pe24KnBSQnAWcGJPWdbODmKkcCMt7qLw="; }; @@ -32,7 +32,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "developer_disk_image" ]; # tests connect to github.com - doCheck = false; meta = { description = "Download DeveloperDiskImage ans Personalized images from GitHub"; @@ -40,4 +39,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; mainProgram = "developer_disk_image"; }; -} +}) diff --git a/python/pkgs/devgoldyutils/default.nix b/python/pkgs/devgoldyutils/default.nix index 6f1744643..aca0fcc7f 100644 --- a/python/pkgs/devgoldyutils/default.nix +++ b/python/pkgs/devgoldyutils/default.nix @@ -5,18 +5,16 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "devgoldyutils"; version = "3.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "2kGu9QPP5WqKv2gO9DAkE9SNDerzNaEDRt5DrrYD9nQ="; }; - doCheck = false; - nativeBuildInputs = [ setuptools-scm ]; pythonImportsCheck = [ "devgoldyutils" ]; @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/THEGOLDENPRO/devgoldyutils"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/devtools/default.nix b/python/pkgs/devtools/default.nix index 2f35d6e16..4d82335cc 100644 --- a/python/pkgs/devtools/default.nix +++ b/python/pkgs/devtools/default.nix @@ -9,15 +9,15 @@ pytest-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "devtools"; version = "0.12.2"; pyproject = true; src = fetchFromGitHub { owner = "samuelcolvin"; - repo = "python-${pname}"; - tag = "v${version}"; + repo = "python-${finalAttrs.pname}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1HFbNswdKa/9cQX0Gf6lLW1V5Kt/N4X6/5kQDdzp1Wo="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://python-devtools.helpmanual.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/diceware/default.nix b/python/pkgs/diceware/default.nix index 961848d8b..c5f4d3030 100644 --- a/python/pkgs/diceware/default.nix +++ b/python/pkgs/diceware/default.nix @@ -7,13 +7,13 @@ fetchpatch2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "diceware"; version = "1.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VLaQgJ8MVqswhaGOFaDDgE1KDRJ/OK7wtc9fhZ0PZjk="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/ulif/diceware"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/dicom-numpy/default.nix b/python/pkgs/dicom-numpy/default.nix index 1a77e4569..f89b548ad 100644 --- a/python/pkgs/dicom-numpy/default.nix +++ b/python/pkgs/dicom-numpy/default.nix @@ -8,7 +8,7 @@ pydicom, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dicom-numpy"; version = "0.6.5"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "innolitics"; repo = "dicom-numpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pgmREQlstr0GY2ThIWt4hbcSWmaNWgkr2gO4PSgGHqE="; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ + dependencies = [ numpy pydicom ]; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/innolitics/dicom-numpy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dict2css/default.nix b/python/pkgs/dict2css/default.nix index e64c8de2d..817c3752c 100644 --- a/python/pkgs/dict2css/default.nix +++ b/python/pkgs/dict2css/default.nix @@ -6,13 +6,13 @@ tinycss2, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dict2css"; version = "0.6.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "dict2css"; hash = "sha256-FD5Vy3HJiojHnyxB4IpfpNh1ZZJ1dW95TjHM1pk2zog="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-toolbox/dict2css"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dict2xml/default.nix b/python/pkgs/dict2xml/default.nix index 20a489c23..7bc475460 100644 --- a/python/pkgs/dict2xml/default.nix +++ b/python/pkgs/dict2xml/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dict2xml"; version = "1.7.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZjjamtMrD4voM20W4PNqnDghFF407T70iJgiqbmA+yg="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/delfick/python-dict2xml"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dictdiffer/default.nix b/python/pkgs/dictdiffer/default.nix index 716bf5190..7741b744e 100644 --- a/python/pkgs/dictdiffer/default.nix +++ b/python/pkgs/dictdiffer/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dictdiffer"; version = "0.9.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "inveniosoftware"; repo = "dictdiffer"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lQyPs3lQWtsvNPuvvwJUTDzrFaOX5uwGuRHe3yWUheU="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; postPatch = '' substituteInPlace setup.py \ @@ -32,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/inveniosoftware/dictdiffer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dictionaries/default.nix b/python/pkgs/dictionaries/default.nix index 207224db2..4e789e945 100644 --- a/python/pkgs/dictionaries/default.nix +++ b/python/pkgs/dictionaries/default.nix @@ -1,24 +1,28 @@ { buildPythonPackage, fetchPypi, + # build-system + setuptools, lib, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dictionaries"; version = "0.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "8fa92745eb7c707b8588888875234f2f0a61b67936d8deb91b2b7b4c32366112"; }; + build-system = [ setuptools ]; + buildInputs = [ six ]; meta = { description = "Dict implementations with attribute access"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dicttoxml/default.nix b/python/pkgs/dicttoxml/default.nix index 703a2cccf..21d410636 100644 --- a/python/pkgs/dicttoxml/default.nix +++ b/python/pkgs/dicttoxml/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dicttoxml"; version = "1.7.16"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bzbOZEiB21zYlAvum3yz8/a3sye6imfYPT4sqgU4v50="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "dicttoxml" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/quandyfactory/dicttoxml"; license = lib.licenses.gpl2; }; -} +}) diff --git a/python/pkgs/diff-cover/default.nix b/python/pkgs/diff-cover/default.nix index 00e3c0a43..a50b28075 100644 --- a/python/pkgs/diff-cover/default.nix +++ b/python/pkgs/diff-cover/default.nix @@ -15,13 +15,13 @@ tomli, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "diff_cover"; version = "10.5.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8clBfGIRHkCoHEgsaSxc3RMf+TMXuqmTBEyykZEuu6M="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/Bachmann1234/diff-cover"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/diff-match-patch/default.nix b/python/pkgs/diff-match-patch/default.nix index aed0ab125..0273da3c9 100644 --- a/python/pkgs/diff-match-patch/default.nix +++ b/python/pkgs/diff-match-patch/default.nix @@ -5,14 +5,14 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "diff-match-patch"; version = "20241021"; pyproject = true; src = fetchPypi { pname = "diff_match_patch"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-vq5XqZ+kgIRTKTXuKWi4Zh24YYYuyCxvIfSs3W2DUHM="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { description = "Diff, Match and Patch libraries for Plain Text"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/diffimg/default.nix b/python/pkgs/diffimg/default.nix index 5b2861575..1b0b3d054 100644 --- a/python/pkgs/diffimg/default.nix +++ b/python/pkgs/diffimg/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pillow, unittestCheckHook, pythonAtLeast, @@ -10,7 +12,7 @@ buildPythonPackage { pname = "diffimg"; version = "0.3.0"; # github recognized 0.1.3, there's a v0.1.5 tag and setup.py says 0.3.0 - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "nicolashahn"; @@ -19,6 +21,8 @@ buildPythonPackage { hash = "sha256-H/UQsqyfdnlESBe7yRu6nK/0dakQkAfeFaZNwjCMvdM="; }; + build-system = [ setuptools ]; + # it imports the wrong diff, # fix offered to upstream https://github.com/nicolashahn/diffimg/pull/6 postPatch = '' @@ -30,7 +34,7 @@ buildPythonPackage { --replace-warn "3503192421617232" "3503192421617233" ''; - propagatedBuildInputs = [ pillow ]; + dependencies = [ pillow ]; pythonImportsCheck = [ "diffimg" ]; diff --git a/python/pkgs/diffsync/default.nix b/python/pkgs/diffsync/default.nix index 122847489..f33da3b5b 100644 --- a/python/pkgs/diffsync/default.nix +++ b/python/pkgs/diffsync/default.nix @@ -10,7 +10,7 @@ structlog, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "diffsync"; version = "2.2.3"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "networktocode"; repo = "diffsync"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SFPWz1A0Dpy1dzKaPp2Hx/1Supy0/PFwztm/NK0psHQ="; }; @@ -31,7 +31,7 @@ buildPythonPackage rec { "structlog" ]; - propagatedBuildInputs = [ + dependencies = [ colorama packaging pydantic @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/networktocode/diffsync"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/diffusers/default.nix b/python/pkgs/diffusers/default.nix index 33a59b6e3..4e633b599 100644 --- a/python/pkgs/diffusers/default.nix +++ b/python/pkgs/diffusers/default.nix @@ -24,7 +24,7 @@ protobuf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "diffusers"; version = "0.40.0"; pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "huggingface"; repo = "diffusers"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MwKzy8Zle1+jXu9SSDmU3qL1ScnLnrBZNKJ9gyIrYAo="; }; @@ -68,12 +68,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "diffusers" ]; - doCheck = false; - meta = { description = "State-of-the-art diffusion models for image and audio generation in PyTorch"; mainProgram = "diffusers-cli"; homepage = "https://github.com/huggingface/diffusers"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dinghy/default.nix b/python/pkgs/dinghy/default.nix index 9456b922b..4245646e3 100644 --- a/python/pkgs/dinghy/default.nix +++ b/python/pkgs/dinghy/default.nix @@ -16,7 +16,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dinghy"; version = "1.4.1"; pyproject = true; @@ -24,13 +24,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nedbat"; repo = "dinghy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-51BXQdDxlI6+3ctDSa/6tyRXBb1E9BVej9qy7WtkOGM="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles aiohttp backports-datetime-fromisoformat @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/nedbat/dinghy"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dingz/default.nix b/python/pkgs/dingz/default.nix index f04a625a2..63af2d4cf 100644 --- a/python/pkgs/dingz/default.nix +++ b/python/pkgs/dingz/default.nix @@ -5,28 +5,31 @@ buildPythonPackage, click, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dingz"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-dingz"; - rev = version; + tag = finalAttrs.version; hash = "sha256-bCytQwLWw8D1UkKb/3LQ301eDCkVR4alD6NHjTs6I+4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp async-timeout click ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "dingz" ]; @@ -36,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-ecosystem/python-dingz"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dipy/default.nix b/python/pkgs/dipy/default.nix index cf854c619..bb3fcd241 100644 --- a/python/pkgs/dipy/default.nix +++ b/python/pkgs/dipy/default.nix @@ -13,7 +13,7 @@ trx-python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dipy"; version = "1.12.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dipy"; repo = "dipy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-4DQswr46du49h5v+mvhkjH4s3WFDJ2LwmURsoM9ICz8="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { description = "Diffusion imaging toolkit for Python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/dirty-equals/default.nix b/python/pkgs/dirty-equals/default.nix index 9e04c2618..a3fde4925 100644 --- a/python/pkgs/dirty-equals/default.nix +++ b/python/pkgs/dirty-equals/default.nix @@ -9,7 +9,7 @@ }: let - dirty-equals = buildPythonPackage rec { + dirty-equals = buildPythonPackage (finalAttrs: { pname = "dirty-equals"; version = "0.11.0"; pyproject = true; @@ -17,7 +17,7 @@ let src = fetchFromGitHub { owner = "samuelcolvin"; repo = "dirty-equals"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JFKWrbMdxhvSBbjQ+S9HPW87CK+5ZZiXHg8Wltlv2YY="; }; @@ -25,8 +25,6 @@ let dependencies = [ pytz ]; - doCheck = false; - passthru.tests.pytest = dirty-equals.overrideAttrs { doCheck = true; }; pythonImportsCheck = [ "dirty_equals" ]; @@ -35,6 +33,6 @@ let homepage = "https://github.com/samuelcolvin/dirty-equals"; license = lib.licenses.mit; }; - }; + }); in dirty-equals diff --git a/python/pkgs/dirtyjson/default.nix b/python/pkgs/dirtyjson/default.nix index 7099292b1..719047736 100644 --- a/python/pkgs/dirtyjson/default.nix +++ b/python/pkgs/dirtyjson/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dirtyjson"; version = "1.0.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-kMpKGPP/MM6EnRANz0oAOVPHnTojSO8Fbx2cIiMaJf0="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/discogs-client/default.nix b/python/pkgs/discogs-client/default.nix index cba51f2b5..b2335f564 100644 --- a/python/pkgs/discogs-client/default.nix +++ b/python/pkgs/discogs-client/default.nix @@ -2,25 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, requests, oauthlib, python-dateutil, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "discogs-client"; version = "2.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "joalla"; repo = "discogs_client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UWiop9hg6KSpSq4SnTtvFbRHYTnLe/Ed/o65sf78MYo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests oauthlib python-dateutil @@ -35,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/joalla/discogs_client"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/discord-webhook/default.nix b/python/pkgs/discord-webhook/default.nix index 916d6f087..3f6e6d1f0 100644 --- a/python/pkgs/discord-webhook/default.nix +++ b/python/pkgs/discord-webhook/default.nix @@ -9,7 +9,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "discord-webhook"; version = "1.4.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lovvskillz"; repo = "python-discord-webhook"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7nVvtXo1XjQExZSCF9VaYSCeEByJY2jn5KbVGTi33f0="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/lovvskillz/python-discord-webhook"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/discovery30303/default.nix b/python/pkgs/discovery30303/default.nix index a3d3e7f1f..40174633f 100644 --- a/python/pkgs/discovery30303/default.nix +++ b/python/pkgs/discovery30303/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "discovery30303"; version = "0.3.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = "discovery30303"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QIGLRe+nUV3tUOs+pu6Qk/2Amh9IVcQq89o2JeKiTvM="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/bdraco/discovery30303"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/discum/default.nix b/python/pkgs/discum/default.nix index 2c59fa708..fc4b28cf8 100644 --- a/python/pkgs/discum/default.nix +++ b/python/pkgs/discum/default.nix @@ -15,13 +15,13 @@ pyqrcode, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "discum"; version = "1.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/8TaAmfSPv/7kuymockSvC2uxXgHfuP+FXN8vuA9WHY="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/discum/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/diskcache/default.nix b/python/pkgs/diskcache/default.nix index c46443c1c..6ebf47cdb 100644 --- a/python/pkgs/diskcache/default.nix +++ b/python/pkgs/diskcache/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "diskcache"; version = "5.6.3"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "grantjenks"; repo = "python-diskcache"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1cDpdf+rLaG14TDd1wEHAiYXb69NFTFeOHD1Ib1oOVY="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/grantjenks/python-diskcache"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/disposable-email-domains/default.nix b/python/pkgs/disposable-email-domains/default.nix index 874076a36..0fa012341 100644 --- a/python/pkgs/disposable-email-domains/default.nix +++ b/python/pkgs/disposable-email-domains/default.nix @@ -9,7 +9,6 @@ buildPythonPackage (finalAttrs: { pname = "disposable-email-domains"; version = "0.0.252"; pyproject = true; - __structuredAttrs = true; # No tags on GitHub src = fetchPypi { diff --git a/python/pkgs/dissect-cstruct/default.nix b/python/pkgs/dissect-cstruct/default.nix index 3a1506911..9d6a5e39b 100644 --- a/python/pkgs/dissect-cstruct/default.nix +++ b/python/pkgs/dissect-cstruct/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dissect-cstruct"; version = "4.7"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cstruct"; - tag = version; + tag = finalAttrs.version; hash = "sha256-eEaKGFpArg0p3+/I2dH3mQ+eNIVJ8KsUbRcw4Ecrl7g="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/fox-it/dissect.cstruct"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dissect-util/default.nix b/python/pkgs/dissect-util/default.nix index 7691a8dbe..585094761 100644 --- a/python/pkgs/dissect-util/default.nix +++ b/python/pkgs/dissect-util/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dissect-util"; version = "3.24"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.util"; - tag = version; + tag = finalAttrs.version; hash = "sha256-AbkIVtUbQkkui7H1ZT/xHl1tCfZMvlrbZ2RD3YJAh0E="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "dump-nskeyedarchiver"; }; -} +}) diff --git a/python/pkgs/dissect-vmfs/default.nix b/python/pkgs/dissect-vmfs/default.nix index b3a96e09b..aa5ee367b 100644 --- a/python/pkgs/dissect-vmfs/default.nix +++ b/python/pkgs/dissect-vmfs/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dissect-vmfs"; version = "3.13"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.vmfs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-4c3JVbQidGvXurWaO+/E0OehGgiY5shE5BiIBwMrCWM="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/fox-it/dissect.vmfs"; license = lib.licenses.agpl3Only; }; -} +}) diff --git a/python/pkgs/dissect-xfs/default.nix b/python/pkgs/dissect-xfs/default.nix index 0020f9827..5428eff10 100644 --- a/python/pkgs/dissect-xfs/default.nix +++ b/python/pkgs/dissect-xfs/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dissect-xfs"; version = "3.13"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.xfs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dFM/xYJR3wBvOe/8rLJz4AK2jmp67T5vo/4TCMRSXzw="; }; @@ -36,11 +36,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "dissect.xfs" ]; # Archive files seems to be corrupt - doCheck = false; meta = { description = "Dissect module implementing a parser for the XFS file system"; homepage = "https://github.com/fox-it/dissect.xfs"; license = lib.licenses.agpl3Only; }; -} +}) diff --git a/python/pkgs/dissononce/default.nix b/python/pkgs/dissononce/default.nix index 115b1866e..fb6699668 100644 --- a/python/pkgs/dissononce/default.nix +++ b/python/pkgs/dissononce/default.nix @@ -1,30 +1,34 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lib, pytest, cryptography, transitions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dissononce"; version = "0.34.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "tgalal"; repo = "dissononce"; - rev = version; + tag = finalAttrs.version; sha256 = "0hn64qfr0d5npmza6rjyxwwp12k2z2y1ma40zpl104ghac6g3mbs"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' HOME=$(mktemp -d) py.test tests/ ''; - propagatedBuildInputs = [ + dependencies = [ cryptography transitions ]; @@ -34,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; description = "Python implementation for Noise Protocol Framework"; }; -} +}) diff --git a/python/pkgs/dist-meta/default.nix b/python/pkgs/dist-meta/default.nix index cfdb5cd3a..6b7fa35bc 100644 --- a/python/pkgs/dist-meta/default.nix +++ b/python/pkgs/dist-meta/default.nix @@ -8,14 +8,14 @@ hatch-requirements-txt, packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dist-meta"; version = "0.9.0"; pyproject = true; src = fetchPypi { pname = "dist_meta"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-+hbr1VdHRKCVlqs0IIOhHXIJ2NBc8yiR0cmFvn7Ay9c="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/repo-helper/dist-meta"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/distlib/default.nix b/python/pkgs/distlib/default.nix index 075bd29b2..14479a120 100644 --- a/python/pkgs/distlib/default.nix +++ b/python/pkgs/distlib/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "distlib"; version = "0.4.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8VIJciSgriS+Wg9rrhuTWa+CEzvOY/mKlfhsrhrt6e0="; }; @@ -34,11 +34,10 @@ buildPythonPackage rec { ]; # Tests use pypi.org. - doCheck = false; meta = { description = "Low-level components of distutils2/packaging"; homepage = "https://distlib.readthedocs.io"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/distorm3/default.nix b/python/pkgs/distorm3/default.nix index 1ffd66327..304c7b9ab 100644 --- a/python/pkgs/distorm3/default.nix +++ b/python/pkgs/distorm3/default.nix @@ -10,13 +10,13 @@ jaraco-collections, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "distorm3"; version = "3.5.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dSgii5BdEolyIF6bbLafMo3OD+uqc1W5L64QGoMJ4UQ="; }; @@ -39,8 +39,6 @@ buildPythonPackage rec { export PYTHONPATH="$TMPDIR/distutils-shim:${siteDir setuptools}:${extraPaths}''${PYTHONPATH:+:$PYTHONPATH}" ''; - doCheck = false; - pythonImportsCheck = [ "distorm3" ]; meta = { @@ -48,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/gdabah/distorm"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/distributed/default.nix b/python/pkgs/distributed/default.nix index fe4d28f6e..1376c9327 100644 --- a/python/pkgs/distributed/default.nix +++ b/python/pkgs/distributed/default.nix @@ -28,7 +28,6 @@ buildPythonPackage (finalAttrs: { pname = "distributed"; version = "2026.8.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "dask"; @@ -62,7 +61,6 @@ buildPythonPackage (finalAttrs: { ]; # When tested random tests would fail and not repeatably - doCheck = false; pythonImportsCheck = [ "distributed" ]; diff --git a/python/pkgs/distro/default.nix b/python/pkgs/distro/default.nix index a60dc5443..0e3e94544 100644 --- a/python/pkgs/distro/default.nix +++ b/python/pkgs/distro/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "distro"; version = "1.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-L6d8b9iUDxFu4da5Si+QsTteqNAZuYvIuv3KvN2b2+0="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { mainProgram = "distro"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/distutils-extra/default.nix b/python/pkgs/distutils-extra/default.nix index 6c39ed2f2..54e051fba 100644 --- a/python/pkgs/distutils-extra/default.nix +++ b/python/pkgs/distutils-extra/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchurl, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "distutils-extra"; version = "2.50"; - format = "setuptools"; + pyproject = true; src = fetchurl { - url = "https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/${version}/python-${pname}-${version}.tar.bz2"; + url = "https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/${finalAttrs.version}/python-${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; hash = "sha256-aq5+JjlzD3fS4+CPxZNjyz2QNfqsChC0w6KRVgbTGwI="; }; + build-system = [ setuptools ]; + # Tests are out-dated as the last upstream release is from 2016 - doCheck = false; pythonImportsCheck = [ "DistUtilsExtra" ]; @@ -24,4 +27,4 @@ buildPythonPackage rec { homepage = "https://launchpad.net/python-distutils-extra"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/dj-database-url/default.nix b/python/pkgs/dj-database-url/default.nix index a379f4e85..f077f5f64 100644 --- a/python/pkgs/dj-database-url/default.nix +++ b/python/pkgs/dj-database-url/default.nix @@ -6,7 +6,7 @@ uv-build, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dj-database-url"; version = "3.1.2"; pyproject = true; @@ -14,14 +14,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "dj-database-url"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-d9wkxe7xJSTufc2La4W/etPAaW6YF47y0IqPa5YWknY="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "uv_build>=0.9.17,<0.10.0" uv_build \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ uv-build ]; @@ -29,7 +29,6 @@ buildPythonPackage rec { dependencies = [ django ]; # Tests access a DB via network - doCheck = false; pythonImportsCheck = [ "dj_database_url" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/dj-database-url"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/dj-email-url/default.nix b/python/pkgs/dj-email-url/default.nix index f62cea499..bbd077924 100644 --- a/python/pkgs/dj-email-url/default.nix +++ b/python/pkgs/dj-email-url/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dj-email-url"; version = "1.0.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Vf/jMp5I9U+Kdao27OCPNl4J1h+KIJdz7wmh1HYOaZo="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/migonzalvar/dj-email-url"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/dj-search-url/default.nix b/python/pkgs/dj-search-url/default.nix index b5915b79b..77e8d7859 100644 --- a/python/pkgs/dj-search-url/default.nix +++ b/python/pkgs/dj-search-url/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dj-search-url"; version = "0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Qk0aWFJQCzwRir/dDjCz4AFv5o5+0nuFU6Z6+iDU+0A="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/dstufft/dj-search-url"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/dj-stripe/default.nix b/python/pkgs/dj-stripe/default.nix index 61876e20d..412c59cc5 100644 --- a/python/pkgs/dj-stripe/default.nix +++ b/python/pkgs/dj-stripe/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dj-stripe"; version = "2.11.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dj-stripe"; repo = "dj-stripe"; - tag = version; + tag = finalAttrs.version; hash = "sha256-BTXqt6daGXWghURtzFuOOlNVDfe01ZFOnNoCsTrvsRQ="; }; @@ -117,4 +117,4 @@ buildPythonPackage rec { homepage = "https://github.com/dj-stripe/dj-stripe"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-admin-datta/default.nix b/python/pkgs/django-admin-datta/default.nix index 0569c2808..a055ee079 100644 --- a/python/pkgs/django-admin-datta/default.nix +++ b/python/pkgs/django-admin-datta/default.nix @@ -3,22 +3,25 @@ buildPythonPackage, django, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-admin-datta"; version = "1.0.19"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-65fUrV4FIbuVvNX93rgOCMjz4CoozMHEEVpzJqtbhKY="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; # no tests - doCheck = false; pythonImportsCheck = [ "admin_datta" ]; @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://appseed.us/product/datta-able/django"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-agnocomplete/default.nix b/python/pkgs/django-agnocomplete/default.nix index 641730520..6862396e6 100644 --- a/python/pkgs/django-agnocomplete/default.nix +++ b/python/pkgs/django-agnocomplete/default.nix @@ -13,7 +13,7 @@ mock, pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-agnocomplete"; version = "2.2.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "peopledoc"; repo = "django-agnocomplete"; - rev = version; + tag = finalAttrs.version; hash = "sha256-SDuLJM/ZvROkBOSbaVi6FMDRcR5Um4UrdPSq1ZMrlXM="; }; @@ -75,4 +75,4 @@ buildPythonPackage rec { homepage = "https://github.com/peopledoc/django-agnocomplete"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-allauth/default.nix b/python/pkgs/django-allauth/default.nix index ebc48a4b9..be1442b1b 100644 --- a/python/pkgs/django-allauth/default.nix +++ b/python/pkgs/django-allauth/default.nix @@ -38,7 +38,7 @@ dj-rest-auth, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-allauth"; version = "65.18.0"; pyproject = true; @@ -46,7 +46,7 @@ buildPythonPackage rec { src = fetchFromCodeberg { owner = "allauth"; repo = "django-allauth"; - tag = version; + tag = finalAttrs.version; hash = "sha256-OUU42yld3CTutgu7XOkC/f4U2Yo9HpQV8GCfZsM2P5w="; }; @@ -99,4 +99,4 @@ buildPythonPackage rec { homepage = "https://allauth.org"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-anymail/default.nix b/python/pkgs/django-anymail/default.nix index affce6003..5ca20017b 100644 --- a/python/pkgs/django-anymail/default.nix +++ b/python/pkgs/django-anymail/default.nix @@ -14,7 +14,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-anymail"; version = "15.2"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "anymail"; repo = "django-anymail"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ITCFmw4oZXWgFBMiKUcJPgxEp9t/Jg+sOFTMw/kcDac="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/anymail/django-anymail"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-appconf/default.nix b/python/pkgs/django-appconf/default.nix index ff31e770d..96f307cd5 100644 --- a/python/pkgs/django-appconf/default.nix +++ b/python/pkgs/django-appconf/default.nix @@ -6,14 +6,14 @@ django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-appconf"; version = "1.2.0"; pyproject = true; src = fetchPypi { pname = "django_appconf"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-FaiNYN2ULWBZ9GdBL+RYHbYy7wMBijwYP7QV1vyeXOw="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { description = "Helper class for handling configuration defaults of packaged apps gracefully"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/django-apscheduler/default.nix b/python/pkgs/django-apscheduler/default.nix index 7043a02d4..ae79a831f 100644 --- a/python/pkgs/django-apscheduler/default.nix +++ b/python/pkgs/django-apscheduler/default.nix @@ -13,7 +13,7 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-apscheduler"; version = "0.7.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jcass77"; repo = "django-apscheduler"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2YSVX4FxE1OfJkSYV9IRKd2scV4BrMA/mBzJARQCX38="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/jcass77/django-apscheduler"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-auditlog/default.nix b/python/pkgs/django-auditlog/default.nix index 1a42bac3f..e996b809e 100644 --- a/python/pkgs/django-auditlog/default.nix +++ b/python/pkgs/django-auditlog/default.nix @@ -9,7 +9,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-auditlog"; version = "3.4.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "django-auditlog"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/IOzMGRR8EP/AGP7fcqwP4GeSKXPwE6NF6AZmiF1+lA="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { downloadPage = "https://github.com/jazzband/django-auditlog"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-auth-ldap/default.nix b/python/pkgs/django-auth-ldap/default.nix index 95f0568a7..4cd477fe3 100644 --- a/python/pkgs/django-auth-ldap/default.nix +++ b/python/pkgs/django-auth-ldap/default.nix @@ -9,7 +9,7 @@ python-ldap, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-auth-ldap"; version = "5.3.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-auth-ldap"; repo = "django-auth-ldap"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+ezadod2ZKrsNW7lVO1dVqQWUnzP1Mi9On8/RJ2qNfI="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/python/pkgs/django-autocomplete-light/default.nix b/python/pkgs/django-autocomplete-light/default.nix index d8d2ee517..743815ea4 100644 --- a/python/pkgs/django-autocomplete-light/default.nix +++ b/python/pkgs/django-autocomplete-light/default.nix @@ -32,7 +32,6 @@ buildPythonPackage (finalAttrs: { }; # Too many un-packaged dependencies - doCheck = false; pythonImportsCheck = [ "dal" ]; diff --git a/python/pkgs/django-axes/default.nix b/python/pkgs/django-axes/default.nix index ed2221dec..4f64ec4b6 100644 --- a/python/pkgs/django-axes/default.nix +++ b/python/pkgs/django-axes/default.nix @@ -9,7 +9,7 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-axes"; version = "8.3.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "django-axes"; - tag = version; + tag = finalAttrs.version; hash = "sha256-jH/A3ZuuBI/S9xZ1VmOoB/8NnxSa5NgnSzY9N02GmD0="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-axes"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-bootstrap3/default.nix b/python/pkgs/django-bootstrap3/default.nix index abcfa46ec..1bdf6af05 100644 --- a/python/pkgs/django-bootstrap3/default.nix +++ b/python/pkgs/django-bootstrap3/default.nix @@ -14,7 +14,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-bootstrap3"; version = "26.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap3"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DpdgwG+4We/r3NZ50no/SurEtL1BkB3P0nMv8KRj+GY="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/zostera/django-bootstrap3"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-bootstrap4/default.nix b/python/pkgs/django-bootstrap4/default.nix index e2a351f5c..0628dbfa7 100644 --- a/python/pkgs/django-bootstrap4/default.nix +++ b/python/pkgs/django-bootstrap4/default.nix @@ -17,7 +17,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-bootstrap4"; version = "26.1"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap4"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-g66JJVPB+YQjN5IHSu/jqKVu5gS8Llb+mALJ9f5H2ds="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/zostera/django-bootstrap4"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-bootstrap5/default.nix b/python/pkgs/django-bootstrap5/default.nix index 708b1d1ce..d9b6c4295 100644 --- a/python/pkgs/django-bootstrap5/default.nix +++ b/python/pkgs/django-bootstrap5/default.nix @@ -11,7 +11,7 @@ uv-build, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-bootstrap5"; version = "26.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap5"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kLq1BHN4PKwtAH/TqHn8B697K9Nk5mNMpjUsW5cCrj4="; }; @@ -43,7 +43,7 @@ buildPythonPackage rec { pytest-django pytestCheckHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; preCheck = '' export DJANGO_SETTINGS_MODULE=tests.app.settings @@ -61,4 +61,4 @@ buildPythonPackage rec { homepage = "https://github.com/zostera/django-bootstrap5"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-cache-memoize/default.nix b/python/pkgs/django-cache-memoize/default.nix index 4e271172e..52134df82 100644 --- a/python/pkgs/django-cache-memoize/default.nix +++ b/python/pkgs/django-cache-memoize/default.nix @@ -10,7 +10,7 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-cache-memoize"; version = "0-unstable-2026-03-01"; pyproject = true; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/peterbe/django-cache-memoize"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/django-cache-url/default.nix b/python/pkgs/django-cache-url/default.nix index 336a78a5a..3a10d74ff 100644 --- a/python/pkgs/django-cache-url/default.nix +++ b/python/pkgs/django-cache-url/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-cache-url"; version = "3.4.6"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "epicserve"; repo = "django-cache-url"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nXn/aDTMla4Pi6v93LoElxCpL6AFbbWKTd4TMFaK+Nk="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/epicserve/django-cache-url"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-cacheops/default.nix b/python/pkgs/django-cacheops/default.nix index 60543b68e..f36fc51a1 100644 --- a/python/pkgs/django-cacheops/default.nix +++ b/python/pkgs/django-cacheops/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-cacheops"; version = "7.2"; pyproject = true; src = fetchPypi { pname = "django_cacheops"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-y8EcwDISlaNkTie8smlA8Iy5wucdPuUGy8/wvdoanzM="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Suor/django-cacheops"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-celery-email/default.nix b/python/pkgs/django-celery-email/default.nix index b9f61714f..21e27b7c7 100644 --- a/python/pkgs/django-celery-email/default.nix +++ b/python/pkgs/django-celery-email/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, django, django-appconf, celery, @@ -10,19 +12,21 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-celery-email"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "pmclanahan"; repo = "django-celery-email"; - rev = version; + tag = finalAttrs.version; hash = "sha256-LBavz5Nh2ObmIwLCem8nHvsuKgPwkzbS/OzFPmSje/M="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django django-appconf celery @@ -46,4 +50,4 @@ buildPythonPackage rec { description = "Django email backend that uses a celery task for sending the email"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-celery-results/default.nix b/python/pkgs/django-celery-results/default.nix index 982ec54d8..aae82e25d 100644 --- a/python/pkgs/django-celery-results/default.nix +++ b/python/pkgs/django-celery-results/default.nix @@ -1,38 +1,41 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, celery, django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-celery-results"; version = "2.6.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "django_celery_results"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-mrzYNq5rYQY3eSRNiIeoj+gLv6uhQ98208sHA0ZxJ3w="; }; + build-system = [ setuptools ]; + postPatch = '' # Drop malformatted tests_require specification sed -i '/tests_require=/d' setup.py ''; - propagatedBuildInputs = [ + dependencies = [ celery django ]; # Tests need access to a database. - doCheck = false; meta = { description = "Celery result back end with django"; homepage = "https://github.com/celery/django-celery-results"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-choices-field/default.nix b/python/pkgs/django-choices-field/default.nix index 0830033d2..0030c17ec 100644 --- a/python/pkgs/django-choices-field/default.nix +++ b/python/pkgs/django-choices-field/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-choices-field"; version = "4.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bellini666"; repo = "django-choices-field"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EnJMn6tAjhylY8qsT/T/N9v/w/vD+d93U2RMxwEcc84="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/bellini666/django-choices-field"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-classy-tags/default.nix b/python/pkgs/django-classy-tags/default.nix index d4eacb688..deeb7de4a 100644 --- a/python/pkgs/django-classy-tags/default.nix +++ b/python/pkgs/django-classy-tags/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, django, }: buildPythonPackage (finalAttrs: { pname = "django-classy-tags"; version = "4.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-yNnRqi+m5xxNhm303RHSOmm40lu7dQskkKF7Fhd07lk="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; # pypi version doesn't include runtest.py, needed to run tests - doCheck = false; pythonImportsCheck = [ "classytags" ]; diff --git a/python/pkgs/django-cleanup/default.nix b/python/pkgs/django-cleanup/default.nix index 5dd96b184..8394a5fc3 100644 --- a/python/pkgs/django-cleanup/default.nix +++ b/python/pkgs/django-cleanup/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-cleanup"; version = "9.0.0"; pyproject = true; src = fetchPypi { pname = "django_cleanup"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-u5+1YKr2KVnIHjH6QIhcNrvVhU1aohuQ3yx+S6YzUx4="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/un1t/django-cleanup"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-cms/default.nix b/python/pkgs/django-cms/default.nix index 575d5a984..a44e9b6ec 100644 --- a/python/pkgs/django-cms/default.nix +++ b/python/pkgs/django-cms/default.nix @@ -13,7 +13,7 @@ django-cms, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-cms"; version = "5.1.2"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-cms"; repo = "django-cms"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bwIbCZI1XwN/BQq7WYBJUOsclIaLO4jtVKUpH1iyY/w="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://django-cms.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-colorful/default.nix b/python/pkgs/django-colorful/default.nix index 306bef2c6..1c8432691 100644 --- a/python/pkgs/django-colorful/default.nix +++ b/python/pkgs/django-colorful/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-colorful"; version = "1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/SRvL7KX7QdNxDSZZtM6HILQMIt/sNbvbi52uQzv/7c="; }; @@ -21,7 +21,6 @@ buildPythonPackage rec { buildInputs = [ django ]; # Tests aren't run - doCheck = false; pythonImportsCheck = [ "colorful" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/charettes/django-colorful"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-compression-middleware/default.nix b/python/pkgs/django-compression-middleware/default.nix index f5ec7c64a..1f70b1782 100644 --- a/python/pkgs/django-compression-middleware/default.nix +++ b/python/pkgs/django-compression-middleware/default.nix @@ -1,23 +1,27 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, django, zstandard, brotli, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-compression-middleware"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-DfUPEtd0ZZq8i7yI5MeU8nhajxHzC1uyZ8MUuF2UG3M="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django zstandard brotli @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/friedelwolff/django-compression-middleware"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/django-compressor/default.nix b/python/pkgs/django-compressor/default.nix index e57e00e43..0aa448d4f 100644 --- a/python/pkgs/django-compressor/default.nix +++ b/python/pkgs/django-compressor/default.nix @@ -22,7 +22,7 @@ }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-compressor"; version = "4.6"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-compressor"; repo = "django-compressor"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ymht/nl3UUFXLc54aqDADXArVG6jUNQppBJCNKp2P68="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://django-compressor.readthedocs.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-configurations/default.nix b/python/pkgs/django-configurations/default.nix index 117501997..25839d1cf 100644 --- a/python/pkgs/django-configurations/default.nix +++ b/python/pkgs/django-configurations/default.nix @@ -7,23 +7,27 @@ django, django-cache-url, fetchPypi, + # build-system + setuptools, mock, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-configurations"; version = "2.5.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-blCDdX4rvfm7eFBWdTa5apNRX2sXUD10ko/2KNsuDpQ="; }; + build-system = [ setuptools ]; + buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; nativeCheckInputs = [ mock @@ -41,7 +45,6 @@ buildPythonPackage rec { ''; # django.core.exceptions.ImproperlyConfigured: django-configurations settings importer wasn't correctly installed - doCheck = false; pythonImportsCheck = [ "configurations" ]; @@ -51,4 +54,4 @@ buildPythonPackage rec { homepage = "https://django-configurations.readthedocs.io/"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/django-context-decorator/default.nix b/python/pkgs/django-context-decorator/default.nix index 30259d452..952e772eb 100644 --- a/python/pkgs/django-context-decorator/default.nix +++ b/python/pkgs/django-context-decorator/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-context-decorator"; version = "1.6.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rixx"; repo = "django-context-decorator"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lNmZDsguOu2+gtMVjbwr709sbLCQOQ1sAePN7UJQbcw="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/rixx/django-context-decorator"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/django-contrib-comments/default.nix b/python/pkgs/django-contrib-comments/default.nix index 9c3174e0d..fed77d8a7 100644 --- a/python/pkgs/django-contrib-comments/default.nix +++ b/python/pkgs/django-contrib-comments/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-contrib-comments"; version = "2.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SN4A8VZ34BaiFq7/IF1uAOQ5HJpXAhNsZBGcRytzVto="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; meta = { homepage = "https://github.com/django/django-contrib-comments"; description = "Code formerly known as django.contrib.comments"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/django-cors-headers/default.nix b/python/pkgs/django-cors-headers/default.nix index 431cb1666..3e1b6b9ea 100644 --- a/python/pkgs/django-cors-headers/default.nix +++ b/python/pkgs/django-cors-headers/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-cors-headers"; version = "4.9.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adamchainz"; repo = "django-cors-headers"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YtBMTmUOqozJksUgF4XJO+cQaFVt49qa0YKHlcXM1nU="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/OttoYiu/django-cors-headers"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-countries/default.nix b/python/pkgs/django-countries/default.nix index aa237cc84..37940f8b6 100644 --- a/python/pkgs/django-countries/default.nix +++ b/python/pkgs/django-countries/default.nix @@ -11,7 +11,7 @@ django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-countries"; version = "9.0.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SmileyChris"; repo = "django-countries"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Lq2wXnC/0sT96AA0eW1TsrIm6qencXE4/3bHSni9nlQ="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/SmileyChris/django-countries"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-crispy-forms/default.nix b/python/pkgs/django-crispy-forms/default.nix index 7328cebed..ede45a273 100644 --- a/python/pkgs/django-crispy-forms/default.nix +++ b/python/pkgs/django-crispy-forms/default.nix @@ -19,13 +19,12 @@ buildPythonPackage (finalAttrs: { hash = "sha256-Fi4g1jAMUZP3th22TS/n8nIKz8yKgJDj4oJq0+5+W4I="; }; - propagatedBuildInputs = [ + dependencies = [ django setuptools ]; # FIXME: RuntimeError: Model class source.crispy_forms.tests.forms.CrispyTestModel doesn't declare an explicit app_label and isn't in an application in INSTALLED_APPS. - doCheck = false; pythonImportsCheck = [ "crispy_forms" ]; meta = { diff --git a/python/pkgs/django-crossdomainmedia/default.nix b/python/pkgs/django-crossdomainmedia/default.nix index 597e7c295..3ccf09897 100644 --- a/python/pkgs/django-crossdomainmedia/default.nix +++ b/python/pkgs/django-crossdomainmedia/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, django, pytestCheckHook, pytest-django, @@ -11,7 +13,7 @@ buildPythonPackage { pname = "django-crossdomainmedia"; version = "0.0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "stefanw"; @@ -23,6 +25,8 @@ buildPythonPackage { hash = "sha256-nwFUm+cxokZ38c5D77z15gIO/kg49oRACOl6+eGGEtQ="; }; + build-system = [ setuptools ]; + dependencies = [ django ]; checkPhase = '' diff --git a/python/pkgs/django-csp/default.nix b/python/pkgs/django-csp/default.nix index e60658cb6..a985f9126 100644 --- a/python/pkgs/django-csp/default.nix +++ b/python/pkgs/django-csp/default.nix @@ -14,13 +14,13 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-csp"; version = "4.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "django_csp"; hash = "sha256-snAQu3Ausgo9rTKReN8rYaK4LTOLcPvcE8OjvShxKDM="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/mozilla/django-csp"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-currentuser/default.nix b/python/pkgs/django-currentuser/default.nix index d63f21837..7d0d5c4df 100644 --- a/python/pkgs/django-currentuser/default.nix +++ b/python/pkgs/django-currentuser/default.nix @@ -10,7 +10,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-currentuser"; version = "0.10.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zsoldosp"; repo = "django-currentuser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1fg1KRu685hnAyHCOKKqvwU/K8Sm4D7/TRKLBI2tBu0="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/zsoldosp/django-currentuser"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-debug-toolbar/default.nix b/python/pkgs/django-debug-toolbar/default.nix index 6d8a4747b..98440abb2 100644 --- a/python/pkgs/django-debug-toolbar/default.nix +++ b/python/pkgs/django-debug-toolbar/default.nix @@ -17,7 +17,7 @@ pygments, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-debug-toolbar"; version = "8.0.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "django-debug-toolbar"; - tag = version; + tag = finalAttrs.version; hash = "sha256-OwMul+wGKLU9LwybsCtqV51lp/CQvexP0TWJSg8E3iQ="; }; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-debug-toolbar"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-elasticsearch-dsl/default.nix b/python/pkgs/django-elasticsearch-dsl/default.nix index 16e09db02..28c3e932f 100644 --- a/python/pkgs/django-elasticsearch-dsl/default.nix +++ b/python/pkgs/django-elasticsearch-dsl/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests require running Elasticsearch daemon - doCheck = false; pythonImportsCheck = [ "django_elasticsearch_dsl" ]; diff --git a/python/pkgs/django-encrypted-model-fields/default.nix b/python/pkgs/django-encrypted-model-fields/default.nix index fa6253cfc..06cff1fdd 100644 --- a/python/pkgs/django-encrypted-model-fields/default.nix +++ b/python/pkgs/django-encrypted-model-fields/default.nix @@ -6,19 +6,19 @@ lib, poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-encrypted-model-fields"; version = "0.6.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-i9IcVWXA1k7E29N1rTT+potNotuHHew/px/nteQiHJk="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ cryptography django ]; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/lansharkconsulting/django/django-encrypted-model-fields"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-environ/default.nix b/python/pkgs/django-environ/default.nix index afb84207e..a37b9a19a 100644 --- a/python/pkgs/django-environ/default.nix +++ b/python/pkgs/django-environ/default.nix @@ -5,21 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-environ"; version = "0.14.0"; pyproject = true; src = fetchPypi { pname = "django_environ"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-tsSNk7nS/4o+oUCZ6Qw1qk8QHBtNXyYt/uDSewZ0Ltc="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "environ" ]; meta = { @@ -27,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/joke2k/django-environ/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-error-report-2/default.nix b/python/pkgs/django-error-report-2/default.nix index 16e626ac0..4743af1d2 100644 --- a/python/pkgs/django-error-report-2/default.nix +++ b/python/pkgs/django-error-report-2/default.nix @@ -24,7 +24,6 @@ buildPythonPackage (finalAttrs: { ]; # There are no tests on upstream - doCheck = false; pythonImportsCheck = [ "error_report" ]; diff --git a/python/pkgs/django-extensions/default.nix b/python/pkgs/django-extensions/default.nix index d7dd10a40..7162fbfbf 100644 --- a/python/pkgs/django-extensions/default.nix +++ b/python/pkgs/django-extensions/default.nix @@ -6,14 +6,14 @@ django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-extensions"; version = "4.1"; pyproject = true; src = fetchPypi { pname = "django_extensions"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-e3Ck0o6bhA9EaU4/f+tU9V1JX4s/psXA5eEryyqjzes="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/django-extensions/django-extensions"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-filter/default.nix b/python/pkgs/django-filter/default.nix index 7a097e41c..4eb6d5131 100644 --- a/python/pkgs/django-filter/default.nix +++ b/python/pkgs/django-filter/default.nix @@ -6,14 +6,14 @@ django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-filter"; version = "26.1"; pyproject = true; src = fetchPypi { pname = "django_filter"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ZuoEAxsGjHfIbhrCbO16P48Tznl/V5V1Fwfj3u/FgFQ="; }; @@ -23,11 +23,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "django_filters" ]; - doCheck = false; - meta = { description = "Reusable Django application for allowing users to filter querysets dynamically"; homepage = "https://github.com/carltongibson/django-filter"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-google-analytics-app/default.nix b/python/pkgs/django-google-analytics-app/default.nix index 5811f9a0c..8682b1f49 100644 --- a/python/pkgs/django-google-analytics-app/default.nix +++ b/python/pkgs/django-google-analytics-app/default.nix @@ -12,7 +12,7 @@ structlog, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-google-analytics-app"; version = "6.0.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "praekeltfoundation"; repo = "django-google-analytics"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0KLfGZY8qq5JGb+LJXpQRS76+qXtrf/hv6QLenm+BhQ="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/praekeltfoundation/django-google-analytics/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-graphiql-debug-toolbar/default.nix b/python/pkgs/django-graphiql-debug-toolbar/default.nix index 8ca221929..ce26e168f 100644 --- a/python/pkgs/django-graphiql-debug-toolbar/default.nix +++ b/python/pkgs/django-graphiql-debug-toolbar/default.nix @@ -10,7 +10,7 @@ graphene-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-graphiql-debug-toolbar"; version = "0.2.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "flavors"; repo = "django-graphiql-debug-toolbar"; - rev = version; + tag = finalAttrs.version; sha256 = "0fikr7xl786jqfkjdifymqpqnxy4qj8g3nlkgfm24wwq0za719dw"; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { pythonImportsCheck = [ "graphiql_debug_toolbar" ]; -} +}) diff --git a/python/pkgs/django-gravatar2/default.nix b/python/pkgs/django-gravatar2/default.nix index 6c8cc6247..9c8d7c991 100644 --- a/python/pkgs/django-gravatar2/default.nix +++ b/python/pkgs/django-gravatar2/default.nix @@ -5,21 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-gravatar2"; version = "1.4.5"; pyproject = true; src = fetchPypi { pname = "django_gravatar2"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-LbtWRl45Xdizkg1AF+J6R1aRLMKtmxG6SM8UOHGoA2Q="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "django_gravatar" ]; meta = { @@ -27,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/twaddington/django-gravatar"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-haystack/default.nix b/python/pkgs/django-haystack/default.nix index 6b8e4c5ec..c5b6e0a83 100644 --- a/python/pkgs/django-haystack/default.nix +++ b/python/pkgs/django-haystack/default.nix @@ -12,14 +12,14 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-haystack"; version = "3.4.0"; pyproject = true; src = fetchPypi { pname = "django_haystack"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Eianyc4T4efq2KyD9uh7/vSZbxRu0klx/eeJYRWxxTA="; }; @@ -33,8 +33,6 @@ buildPythonPackage rec { packaging ]; - doCheck = false; - # pythonImportsCheck is not possible because haystack requires Django settings # to be configured before any module can be imported @@ -43,4 +41,4 @@ buildPythonPackage rec { homepage = "http://haystacksearch.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-hcaptcha/default.nix b/python/pkgs/django-hcaptcha/default.nix index 42476cdb9..87cbc64aa 100644 --- a/python/pkgs/django-hcaptcha/default.nix +++ b/python/pkgs/django-hcaptcha/default.nix @@ -2,13 +2,15 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, django, }: buildPythonPackage (finalAttrs: { pname = "django-hcaptcha"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) version; @@ -16,10 +18,11 @@ buildPythonPackage (finalAttrs: { hash = "sha256-slGerwzJeGWscvglMBEixc9h4eSFLWiVmUFgIirLbBo="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; # No tests - doCheck = false; pythonImportsCheck = [ "hcaptcha" ]; diff --git a/python/pkgs/django-hierarkey/default.nix b/python/pkgs/django-hierarkey/default.nix index 48bd681ca..67319ceac 100644 --- a/python/pkgs/django-hierarkey/default.nix +++ b/python/pkgs/django-hierarkey/default.nix @@ -15,7 +15,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-hierarkey"; version = "2.0.1"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "raphaelm"; repo = "django-hierarkey"; - tag = version; + tag = finalAttrs.version; hash = "sha256-zIz7aokOGLGXV/xJnYcz8lBP7b2rxLrfaD3i/DLpFR8="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/raphaelm/django-hierarkey"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/django-hijack/default.nix b/python/pkgs/django-hijack/default.nix index cb0a6e90b..c96fe7a42 100644 --- a/python/pkgs/django-hijack/default.nix +++ b/python/pkgs/django-hijack/default.nix @@ -16,7 +16,7 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-hijack"; version = "3.7.8"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; - tag = version; + tag = finalAttrs.version; hash = "sha256-91ziHv39GmXrbswqOyVHmSv11LqKNT318/8mx5iIdHg="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/django-hijack/django-hijack"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-htmx/default.nix b/python/pkgs/django-htmx/default.nix index a3c19a32d..5409ed1e0 100644 --- a/python/pkgs/django-htmx/default.nix +++ b/python/pkgs/django-htmx/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-htmx"; version = "1.28.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adamchainz"; repo = "django-htmx"; - tag = version; + tag = finalAttrs.version; hash = "sha256-24TVOaV0VKFq506XSJ9q86sYifKOjNHeAjSskyhcst0="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/adamchainz/django-htmx"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-i18nfield/default.nix b/python/pkgs/django-i18nfield/default.nix index 5efc0cc09..6cca9bcff 100644 --- a/python/pkgs/django-i18nfield/default.nix +++ b/python/pkgs/django-i18nfield/default.nix @@ -15,7 +15,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-i18nfield"; version = "1.11.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "raphaelm"; repo = "django-i18nfield"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0r4ICS8E0OFMrR7IoyiFyXBvAkQjSBb0HtEcb31f4Rw="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/raphaelm/django-i18nfield"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/django-import-export/default.nix b/python/pkgs/django-import-export/default.nix index 8a65950ca..2995019e9 100644 --- a/python/pkgs/django-import-export/default.nix +++ b/python/pkgs/django-import-export/default.nix @@ -12,7 +12,7 @@ tablib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-import-export"; version = "4.4.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-import-export"; repo = "django-import-export"; - tag = version; + tag = finalAttrs.version; hash = "sha256-6/I5GI2fcD48IOwtbhgqpNn5RHU7Z4PeqMBZUEtiE9g="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/django-import-export/django-import-export"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/django-ipware/default.nix b/python/pkgs/django-ipware/default.nix index 48dc23cda..0fe772d27 100644 --- a/python/pkgs/django-ipware/default.nix +++ b/python/pkgs/django-ipware/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, django, python-ipware, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-ipware"; version = "7.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2exD0r983yFv7Y1JSghN61dhpUhgpTsudDRqTzhM/0c="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django python-ipware ]; # django.core.exceptions.ImproperlyConfigured: Requested setting IPWARE_TRUSTED_PROXY_LIST, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. - doCheck = false; # pythonImportsCheck fails with: # django.core.exceptions.ImproperlyConfigured: Requested setting IPWARE_META_PRECEDENCE_ORDER, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. @@ -32,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/un33k/django-ipware"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-jinja/default.nix b/python/pkgs/django-jinja/default.nix index 569e49cdf..b60b1e936 100644 --- a/python/pkgs/django-jinja/default.nix +++ b/python/pkgs/django-jinja/default.nix @@ -15,7 +15,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-jinja"; version = "2.11.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "niwinz"; repo = "django-jinja"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0gkv9xinHux8TRiNBLl/JgcimXU3CzysxzGR2jn7OZ4="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { homepage = "https://github.com/niwinz/django-jinja"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-jquery-js/default.nix b/python/pkgs/django-jquery-js/default.nix index 4ee4e2bc8..8c74bddb7 100644 --- a/python/pkgs/django-jquery-js/default.nix +++ b/python/pkgs/django-jquery-js/default.nix @@ -2,30 +2,32 @@ lib, buildPythonPackage, fetchFromBitbucket, + # build-system + setuptools, django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-jquery-js"; version = "3.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromBitbucket { owner = "tim_heap"; repo = "django-jquery"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TzMo31jFhcvlrmq2TJgQyds9n8eATaChnyhnQ7bwdzs="; }; + build-system = [ setuptools ]; + buildInputs = [ django ]; pythonImportsCheck = [ "jquery" ]; - doCheck = false; # no tests - meta = { description = "jQuery, bundled up so apps can depend upon it"; homepage = "https://bitbucket.org/tim_heap/django-jquery"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-js-asset/default.nix b/python/pkgs/django-js-asset/default.nix index b74d7781f..b5fd66625 100644 --- a/python/pkgs/django-js-asset/default.nix +++ b/python/pkgs/django-js-asset/default.nix @@ -7,7 +7,7 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-js-asset"; version = "4.0.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matthiask"; repo = "django-js-asset"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TmoT+WuOw92wWW82CpKLy0Lr+oSKf+c2diG8Gs5rWg4="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/matthiask/django-js-asset"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-json-widget/default.nix b/python/pkgs/django-json-widget/default.nix index 6f45b2253..c8bd5b330 100644 --- a/python/pkgs/django-json-widget/default.nix +++ b/python/pkgs/django-json-widget/default.nix @@ -9,7 +9,7 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-json-widget"; version = "2.1.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jmrivas86"; repo = "django-json-widget"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AABJHWoEIcyJyRHv3sp1d1l6ZByF8Q5h+xEHJe/4uC0="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { # https://github.com/jmrivas86/django-json-widget/issues/93 license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-leaflet/default.nix b/python/pkgs/django-leaflet/default.nix index ee9ed2889..e0ab94214 100644 --- a/python/pkgs/django-leaflet/default.nix +++ b/python/pkgs/django-leaflet/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-leaflet"; version = "0.34.0"; pyproject = true; src = fetchPypi { pname = "django_leaflet"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-gzbnKnu/8LNjBUmC8CrB16O8srL6S8oyYBTd3q63xRU="; }; @@ -24,7 +24,6 @@ buildPythonPackage rec { # The tests seem to be impure. # They are throwing a error about unset configs: # > django.core.exceptions.ImproperlyConfigured: Requested setting LEAFLET_CONFIG, but settings are not configured. - doCheck = false; # This dosn't work either because of the same exception as above # pythonImportsCheck = [ "leaflet" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/makinacorpus/django-leaflet"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/django-localflavor/default.nix b/python/pkgs/django-localflavor/default.nix index 05c14e159..5fe3a84d0 100644 --- a/python/pkgs/django-localflavor/default.nix +++ b/python/pkgs/django-localflavor/default.nix @@ -15,7 +15,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-localflavor"; version = "5.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django"; repo = "django-localflavor"; - tag = version; + tag = finalAttrs.version; hash = "sha256-eYhkWfxoZlnxhCIaqBhoEt0+SbkZKkUNUAy4p3tYf4A="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/django/django-localflavor"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-logentry-admin/default.nix b/python/pkgs/django-logentry-admin/default.nix index 09e74d23e..378c084c7 100644 --- a/python/pkgs/django-logentry-admin/default.nix +++ b/python/pkgs/django-logentry-admin/default.nix @@ -1,24 +1,28 @@ { lib, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, django, pytest, pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-logentry-admin"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "yprez"; repo = "django-logentry-admin"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1bndxgvisw8kk52zfdifvly6dl4833wqilxf77pg473172yaf5gq"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytest pytest-django @@ -28,11 +32,11 @@ buildPythonPackage rec { pytest ''; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; meta = { description = "Show all LogEntry objects in the Django admin site"; homepage = "https://github.com/yprez/django-logentry-admin"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/django-login-required-middleware/default.nix b/python/pkgs/django-login-required-middleware/default.nix index 6279e1c75..514838fcc 100644 --- a/python/pkgs/django-login-required-middleware/default.nix +++ b/python/pkgs/django-login-required-middleware/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-login-required-middleware"; version = "0.9.0"; pyproject = true; @@ -16,15 +16,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CleitonDeLima"; repo = "django-login-required-middleware"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WFQ/JvKh6gkUxPV27QBd2TzwFS8hfQGmcTInTnmh6iA="; }; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; - checkInputs = [ djangorestframework ]; + nativeCheckInputs = [ djangorestframework ]; pythonImportsCheck = [ "login_required" ]; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/CleitonDeLima/django-login-required-middleware"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-markdownx/default.nix b/python/pkgs/django-markdownx/default.nix index 45794061e..94d6d9ae6 100644 --- a/python/pkgs/django-markdownx/default.nix +++ b/python/pkgs/django-markdownx/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-markdownx"; version = "4.0.11"; pyproject = true; @@ -16,20 +16,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "neutronX"; repo = "django-markdownx"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dTNWTXHj5Tk77/XdIgfFGLir0JhlhwcWAIKDax8qM9M="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ django markdown pillow ]; # tests only executable in vagrant - doCheck = false; pythonImportsCheck = [ "markdownx" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/neutronX/django-markdownx/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/django-mfa3/default.nix b/python/pkgs/django-mfa3/default.nix index 23505fb07..faabf47ab 100644 --- a/python/pkgs/django-mfa3/default.nix +++ b/python/pkgs/django-mfa3/default.nix @@ -10,7 +10,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-mfa3"; version = "1.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "xi"; repo = "django-mfa3"; - tag = version; + tag = finalAttrs.version; hash = "sha256-J31NiqOysOS6FFDCaCiPAJUBvD0Xu99sIykLxfk0M3U="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/xi/django-mfa3"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-model-utils/default.nix b/python/pkgs/django-model-utils/default.nix index fb3e49a9e..565e12978 100644 --- a/python/pkgs/django-model-utils/default.nix +++ b/python/pkgs/django-model-utils/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-model-utils"; version = "5.0.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "django-model-utils"; - tag = version; + tag = finalAttrs.version; hash = "sha256-iRtTYXsgD8NYG3k9ZWAr2Nwazo3HUa6RgdbMeDxc7NI="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ django ]; # Test requires postgres database - doCheck = false; pythonImportsCheck = [ "model_utils" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { description = "Django model mixins and utilities"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-modelcluster/default.nix b/python/pkgs/django-modelcluster/default.nix index 2ea8b09eb..14ed47401 100644 --- a/python/pkgs/django-modelcluster/default.nix +++ b/python/pkgs/django-modelcluster/default.nix @@ -17,7 +17,7 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-modelcluster"; version = "6.5"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wagtail"; repo = "django-modelcluster"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jIEiwWuC+sudUHsHuG975nxrlC2yKZN/QjdvMKEeL6s="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/torchbox/django-modelcluster/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/django-modeltranslation/default.nix b/python/pkgs/django-modeltranslation/default.nix index 504672c3a..ef36fd77b 100644 --- a/python/pkgs/django-modeltranslation/default.nix +++ b/python/pkgs/django-modeltranslation/default.nix @@ -12,7 +12,7 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-modeltranslation"; version = "0.20.5"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "deschler"; repo = "django-modeltranslation"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qqBxsaEnTRkGx5WfggfAmxeyTdk8+KtFgoGYH7Ik6m8="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/deschler/django-modeltranslation"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-mptt/default.nix b/python/pkgs/django-mptt/default.nix index 6edf85c18..35dfaefe3 100644 --- a/python/pkgs/django-mptt/default.nix +++ b/python/pkgs/django-mptt/default.nix @@ -10,7 +10,7 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-mptt"; version = "0.18"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-mptt"; repo = "django-mptt"; - rev = version; + tag = finalAttrs.version; hash = "sha256-UJQwjOde0DkG/Pa/pd2htnp4KEn5KwYAo8GP5A7/h+I="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/django-mptt/django-mptt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-multiselectfield/default.nix b/python/pkgs/django-multiselectfield/default.nix index e003c84e9..db853ad2e 100644 --- a/python/pkgs/django-multiselectfield/default.nix +++ b/python/pkgs/django-multiselectfield/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-multiselectfield"; version = "1.0.1"; pyproject = true; src = fetchPypi { pname = "django_multiselectfield"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-P4tP/z4H1Kkci7S4Cbw1yusitBdptgb0ye3FO41ypmc="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { dependencies = [ django ]; # No tests - doCheck = false; pythonImportsCheck = [ "multiselectfield" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/goinnn/django-multiselectfield"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/django-ninja/default.nix b/python/pkgs/django-ninja/default.nix index 9b45ed200..b13bb97a6 100644 --- a/python/pkgs/django-ninja/default.nix +++ b/python/pkgs/django-ninja/default.nix @@ -10,7 +10,7 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-ninja"; version = "1.7.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vitalik"; repo = "django-ninja"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rfusPDZj056NX3lOs+hImuedknGR08Fkv+EuN9sTcIE="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://django-ninja.dev"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-otp/default.nix b/python/pkgs/django-otp/default.nix index 79d27d107..5b769935d 100644 --- a/python/pkgs/django-otp/default.nix +++ b/python/pkgs/django-otp/default.nix @@ -10,7 +10,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-otp"; version = "1.7.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-otp"; repo = "django-otp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Tqi6FHXJToOJsGETgIRl8rOUTfkn3kBkG5/bI8CxT24="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { description = "Pluggable framework for adding two-factor authentication to Django using one-time passwords"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/django-paintstore/default.nix b/python/pkgs/django-paintstore/default.nix index 66b744d42..db56c070c 100644 --- a/python/pkgs/django-paintstore/default.nix +++ b/python/pkgs/django-paintstore/default.nix @@ -2,23 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-paintstore"; version = "0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "12wxgwv1qbkfq7w5i7bm7aidv655c2sxp0ym73qf8606dxbjcwwg"; }; - doCheck = false; + build-system = [ setuptools ]; meta = { description = "Django app that integrates jQuery ColorPicker with the Django admin"; homepage = "https://github.com/gsiegman/django-paintstore"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-parler/default.nix b/python/pkgs/django-parler/default.nix index af28a1aee..657247ac6 100644 --- a/python/pkgs/django-parler/default.nix +++ b/python/pkgs/django-parler/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-parler"; version = "2.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-parler"; repo = "django-parler"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vX8/0J3at97KVjWx4qxYq4wJma/QCUFHERCfXjkBieE="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/django-parler/django-parler"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/django-pattern-library/default.nix b/python/pkgs/django-pattern-library/default.nix index 7e2d6a6b6..ebaefb9e9 100644 --- a/python/pkgs/django-pattern-library/default.nix +++ b/python/pkgs/django-pattern-library/default.nix @@ -18,7 +18,7 @@ mkdocs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-pattern-library"; version = "1.6.0"; pyproject = true; @@ -26,13 +26,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "torchbox"; repo = "django-pattern-library"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WLGoV9xj7MpUq5gzUz225Tz/TTqMyegyuwLNkHVqQFg="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ django pyyaml markdown @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/torchbox/django-pattern-library/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-pgactivity/default.nix b/python/pkgs/django-pgactivity/default.nix index a666c2232..ac7996ac9 100644 --- a/python/pkgs/django-pgactivity/default.nix +++ b/python/pkgs/django-pgactivity/default.nix @@ -7,7 +7,7 @@ psycopg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-pgactivity"; version = "1.8.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AmbitionEng"; repo = "django-pgactivity"; - tag = version; + tag = finalAttrs.version; hash = "sha256-e+PodpFsGxx4SE6zQD2qVDAXx44xeIdsBO7YsdbSjiU="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/AmbitionEng/django-pgactivity"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-pglock/default.nix b/python/pkgs/django-pglock/default.nix index f3bacbbe7..a344919f7 100644 --- a/python/pkgs/django-pglock/default.nix +++ b/python/pkgs/django-pglock/default.nix @@ -7,7 +7,7 @@ django-pgactivity, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-pglock"; version = "1.8.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AmbitionEng"; repo = "django-pglock"; - tag = version; + tag = finalAttrs.version; hash = "sha256-IXP7iZmGx0Odn73Tje/UkIpEkHCLhz42kLJppgy2nuU="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/AmbitionEng/django-pglock"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-pglocks/default.nix b/python/pkgs/django-pglocks/default.nix index 0142c0d5b..8ca0e8533 100644 --- a/python/pkgs/django-pglocks/default.nix +++ b/python/pkgs/django-pglocks/default.nix @@ -2,14 +2,16 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, django, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-pglocks"; version = "1.0.4"; - format = "setuptools"; + pyproject = true; meta = { description = "PostgreSQL locking context managers and functions for Django"; @@ -18,16 +20,17 @@ buildPythonPackage rec { }; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "3c47c66fbfbd268ef46269673a0516a039539b0972b8ed2ec9cfee44c4b65523"; }; + build-system = [ setuptools ]; + buildInputs = [ django ]; - propagatedBuildInputs = [ + dependencies = [ django six ]; # tests need a postgres database - doCheck = false; -} +}) diff --git a/python/pkgs/django-pgtrigger/default.nix b/python/pkgs/django-pgtrigger/default.nix index ea3e09ae9..2c8c6b54b 100644 --- a/python/pkgs/django-pgtrigger/default.nix +++ b/python/pkgs/django-pgtrigger/default.nix @@ -7,7 +7,7 @@ psycopg2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-pgtrigger"; version = "4.17.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AmbitionEng"; repo = "django-pgtrigger"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LBuqaFFHP18LPI26CcYMVO7rJsDrCBtuVKhwoTr6ACA="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/Opus10/django-pgtrigger"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-phonenumber-field/default.nix b/python/pkgs/django-phonenumber-field/default.nix index b40c7440c..a46dafac8 100644 --- a/python/pkgs/django-phonenumber-field/default.nix +++ b/python/pkgs/django-phonenumber-field/default.nix @@ -12,7 +12,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-phonenumber-field"; version = "8.5.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stefanfoulis"; repo = "django-phonenumber-field"; - tag = version; + tag = finalAttrs.version; hash = "sha256-hTrW7QeZPBsln9iHh9sV7JMQxdJ9cFcAq4ETyhxFGv0="; }; @@ -30,7 +30,7 @@ buildPythonPackage rec { # make sense without either of the two optional dependencies. Since, in # Nixpkgs, phonenumberslite depends on phonenumbers, add the latter # unconditionally. - dependencies = [ django ] ++ optional-dependencies.phonenumbers; + dependencies = [ django ] ++ finalAttrs.optional-dependencies.phonenumbers; nativeBuildInputs = [ gettext ]; pythonImportsCheck = [ "phonenumber_field" ]; @@ -53,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/stefanfoulis/django-phonenumber-field/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-picklefield/default.nix b/python/pkgs/django-picklefield/default.nix index 64506f460..804adfdc3 100644 --- a/python/pkgs/django-picklefield/default.nix +++ b/python/pkgs/django-picklefield/default.nix @@ -6,14 +6,14 @@ django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-picklefield"; version = "3.4.0"; pyproject = true; src = fetchPypi { pname = "django_picklefield"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Oh90BTbA5g0NukOqiczb6Gdg1MP47Ed5nq4SK6p0HQo="; }; @@ -23,11 +23,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "picklefield" ]; - doCheck = false; - meta = { description = "Pickled object field for Django"; homepage = "https://github.com/gintas/django-picklefield"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-polymorphic/default.nix b/python/pkgs/django-polymorphic/default.nix index 93662ebed..02a539ea0 100644 --- a/python/pkgs/django-polymorphic/default.nix +++ b/python/pkgs/django-polymorphic/default.nix @@ -11,7 +11,7 @@ pytest-playwright ? null, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-polymorphic"; version = "4.11.7"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-polymorphic"; repo = "django-polymorphic"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Xm+yPpi6UbHON2eSv1e8hiQLWHdMA4zYoDtAnURFMRA="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { description = "Improved Django model inheritance with automatic downcasting"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-postgres-partition/default.nix b/python/pkgs/django-postgres-partition/default.nix index e8c995be7..27706095b 100644 --- a/python/pkgs/django-postgres-partition/default.nix +++ b/python/pkgs/django-postgres-partition/default.nix @@ -9,7 +9,7 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-postgres-partition"; version = "0.1.4"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "burke-software"; repo = "django-postgres-partition"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Wk+m75gO9iClN9/vXGBl27VcmqyE6c1xpQX+X1qcKuU="; }; @@ -32,7 +32,6 @@ buildPythonPackage rec { ]; # tests don't work yet, see https://gitlab.com/burke-software/django-postgres-partition/-/issues/4 - doCheck = false; pythonImportsCheck = [ "psql_partition" ]; @@ -43,4 +42,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/burke-software/django-postgres-partition"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-probes/default.nix b/python/pkgs/django-probes/default.nix index c3aa4db35..f681f637d 100644 --- a/python/pkgs/django-probes/default.nix +++ b/python/pkgs/django-probes/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-probes"; version = "1.8.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "painless-software"; repo = "django-probes"; - rev = version; + tag = finalAttrs.version; hash = "sha256-opto5AAUPhEsWbYh7nItUw7qNoUfOFFZ7tw5agWGBSg="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/painless-software/django-probes"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-pwa/default.nix b/python/pkgs/django-pwa/default.nix index af4b4b622..9f2201ab5 100644 --- a/python/pkgs/django-pwa/default.nix +++ b/python/pkgs/django-pwa/default.nix @@ -8,7 +8,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-pwa"; version = "2.0.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "silviolleite"; repo = "django-pwa"; - tag = version; + tag = finalAttrs.version; hash = "sha256-EAjDK3rkjoPw8jyVVZdhMNHmTqr0/ERiMwGMxmVbsls="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/silviolleite/django-pwa"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-pydantic-field/default.nix b/python/pkgs/django-pydantic-field/default.nix index d8e729ba2..32e413ab3 100644 --- a/python/pkgs/django-pydantic-field/default.nix +++ b/python/pkgs/django-pydantic-field/default.nix @@ -16,7 +16,7 @@ uv-build, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-pydantic-field"; version = "0.5.4"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "surenkov"; repo = "django-pydantic-field"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pnB6kYfN67102Z3R41BHIWnWoJQgd/ixyT+bbtY9PC8="; }; @@ -61,4 +61,4 @@ buildPythonPackage rec { homepage = "https://github.com/surenkov/django-pydantic-field"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-q2/default.nix b/python/pkgs/django-q2/default.nix index c056dca37..16d52c253 100644 --- a/python/pkgs/django-q2/default.nix +++ b/python/pkgs/django-q2/default.nix @@ -9,7 +9,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-q2"; version = "1.10.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-q2"; repo = "django-q2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VwB3pvDAGsMvcKblRnmCYHzvEBCz8E13Qov4LjWEqxc="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/django-q2/django-q2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-ranged-response/default.nix b/python/pkgs/django-ranged-response/default.nix index 854e98468..e2fae2778 100644 --- a/python/pkgs/django-ranged-response/default.nix +++ b/python/pkgs/django-ranged-response/default.nix @@ -1,28 +1,31 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-ranged-response"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "11gr3jpmb5rvg3scv026kjwwkmnxwivgq5ypxadnnc9p58szy7zp"; }; + build-system = [ setuptools ]; + # tests not included in PyPi package, github source is not up to date with 0.2.0 - doCheck = false; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; meta = { description = "Modified FileResponse that returns `Content-Range` headers with the HTTP response, so browsers (read Safari 9+) that request the file, can stream the response properly"; homepage = "https://github.com/wearespindle/django-ranged-fileresponse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-raster/default.nix b/python/pkgs/django-raster/default.nix index 9a5fa3042..ae4ac8380 100644 --- a/python/pkgs/django-raster/default.nix +++ b/python/pkgs/django-raster/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, isPy3k, numpy, django-colorful, @@ -14,22 +16,23 @@ importlib-metadata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.8.1"; - format = "setuptools"; + pyproject = true; pname = "django-raster"; disabled = !isPy3k; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "213758fe96d74be502f69f2620f7666961a85caa0551d14573637315035a9745"; }; + build-system = [ setuptools ]; + # Tests require a postgresql + postgis server - doCheck = false; - propagatedBuildInputs = [ + dependencies = [ numpy django-colorful pillow @@ -46,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/geodesign/django-raster"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-ratelimit/default.nix b/python/pkgs/django-ratelimit/default.nix index 33a57751e..b50913783 100644 --- a/python/pkgs/django-ratelimit/default.nix +++ b/python/pkgs/django-ratelimit/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-ratelimit"; version = "4.1.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jsocol"; repo = "django-ratelimit"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZMtZSKOIIRSqH6eyC7bBeua7YLKyWW6NOXN/MDv9fy4="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/jsocol/django-ratelimit"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/django-redis/default.nix b/python/pkgs/django-redis/default.nix index a084522eb..a9e66f427 100644 --- a/python/pkgs/django-redis/default.nix +++ b/python/pkgs/django-redis/default.nix @@ -4,12 +4,12 @@ buildPythonPackage, setuptools, - # propagated + # dependencies django, redis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-redis"; version = "7.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "django-redis"; - tag = version; + tag = finalAttrs.version; hash = "sha256-4YNhNsa0J1tTtaeJTHnwT8WwYs6QQuxnjVl1mAYNePI="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-redis"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-registration/default.nix b/python/pkgs/django-registration/default.nix index 306b23fb1..ee69907ad 100644 --- a/python/pkgs/django-registration/default.nix +++ b/python/pkgs/django-registration/default.nix @@ -8,7 +8,7 @@ django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-registration"; version = "5.2.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ubernostrum"; repo = "django-registration"; - tag = version; + tag = finalAttrs.version; hash = "sha256-k7r4g+iCdAwAUNQdbtxzS5kqgAavEBAJERSWgXvbXqg="; }; @@ -43,8 +43,8 @@ buildPythonPackage rec { meta = { description = "User registration app for Django"; - homepage = "https://django-registration.readthedocs.io/en/${version}/"; + homepage = "https://django-registration.readthedocs.io/en/${finalAttrs.version}/"; downloadPage = "https://github.com/ubernostrum/django-registration"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-rest-auth/default.nix b/python/pkgs/django-rest-auth/default.nix index 7ea70c157..5a33a6e49 100644 --- a/python/pkgs/django-rest-auth/default.nix +++ b/python/pkgs/django-rest-auth/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, django, django-allauth, djangorestframework, @@ -10,30 +12,31 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-rest-auth"; version = "0.9.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Tivix"; repo = "django-rest-auth"; - rev = version; + tag = finalAttrs.version; hash = "sha256-rCChUHv8sTEFErDCZnPN5b5XVtMJ7JNVZwBYF3d99mY="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace "djangorestframework-jwt" "drf-jwt" ''; - propagatedBuildInputs = [ + dependencies = [ django djangorestframework six ]; # tests are icnompatible with current django version - doCheck = false; pythonImportsCheck = [ "rest_auth" ]; @@ -42,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/Tivix/django-rest-auth"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-rest-polymorphic/default.nix b/python/pkgs/django-rest-polymorphic/default.nix index eee3e4df5..4fd4f785c 100644 --- a/python/pkgs/django-rest-polymorphic/default.nix +++ b/python/pkgs/django-rest-polymorphic/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, django, django-polymorphic, djangorestframework, @@ -13,7 +15,7 @@ buildPythonPackage { pname = "django-rest-polymorphic"; version = "0.1.10"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "apirobot"; @@ -23,7 +25,9 @@ buildPythonPackage { hash = "sha256-k7Cl2QYkaGOZaTo8v5Wg9Wqh8x0WC5i9Sggqj8eeECY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django django-polymorphic djangorestframework diff --git a/python/pkgs/django-reversion/default.nix b/python/pkgs/django-reversion/default.nix index 7e51a1b1a..f9042859c 100644 --- a/python/pkgs/django-reversion/default.nix +++ b/python/pkgs/django-reversion/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-reversion"; version = "6.3.0"; pyproject = true; src = fetchPypi { pname = "django_reversion"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-CqVOszRpT1Iv0jR0OXjGFNRap4XtxwphdyZ82q8G+Wc="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { dependencies = [ django ]; # Tests assume the availability of a mysql/postgresql database - doCheck = false; pythonImportsCheck = [ "reversion" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/etianen/django-reversion"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-rosetta/default.nix b/python/pkgs/django-rosetta/default.nix index 0940596dd..4f42e18bb 100644 --- a/python/pkgs/django-rosetta/default.nix +++ b/python/pkgs/django-rosetta/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-rosetta"; version = "0.10.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mbi"; repo = "django-rosetta"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VnKbtzLY2+3RTk4gNZASuVSDGzfgoyr06RUNB2r0eDw="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # require internet connection - doCheck = false; pythonImportsCheck = [ "rosetta" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/mbi/django-rosetta"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-scheduler/default.nix b/python/pkgs/django-scheduler/default.nix index 84e810aea..298cb2b67 100644 --- a/python/pkgs/django-scheduler/default.nix +++ b/python/pkgs/django-scheduler/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-scheduler"; version = "1.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "llazzaro"; repo = "django-scheduler"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TgIp2oqju3O6zPp3WMEB9HeNgAJILNkWWfbDFmMQ3eA="; }; @@ -66,4 +66,4 @@ buildPythonPackage rec { homepage = "https://github.com/llazzaro/django-scheduler"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-scopes/default.nix b/python/pkgs/django-scopes/default.nix index 712904376..b84623102 100644 --- a/python/pkgs/django-scopes/default.nix +++ b/python/pkgs/django-scopes/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, django, pytestCheckHook, pytest-django, @@ -10,7 +12,7 @@ buildPythonPackage (finalAttrs: { pname = "django-scopes"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "raphaelm"; @@ -19,7 +21,9 @@ buildPythonPackage (finalAttrs: { hash = "sha256-CtToztLVvSb91pMpPNL8RysQJzlRkeXuQbpvbkX3jfM="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; nativeCheckInputs = [ pytest-django diff --git a/python/pkgs/django-sekizai/default.nix b/python/pkgs/django-sekizai/default.nix index 7d1099f26..dbad92f69 100644 --- a/python/pkgs/django-sekizai/default.nix +++ b/python/pkgs/django-sekizai/default.nix @@ -1,22 +1,26 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, django-classy-tags, pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-sekizai"; version = "4.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Kso2y64LXAzv7ZVlQW7EQjNXZ/sxRb/xHlhiL8ZTza0="; }; - propagatedBuildInputs = [ django-classy-tags ]; + build-system = [ setuptools ]; + + dependencies = [ django-classy-tags ]; pythonImportsCheck = [ "sekizai" ]; env.DJANGO_SETTINGS_MODULE = "tests.settings"; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/django-cms/django-sekizai"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-sesame/default.nix b/python/pkgs/django-sesame/default.nix index ebf2669ab..7e52d35c7 100644 --- a/python/pkgs/django-sesame/default.nix +++ b/python/pkgs/django-sesame/default.nix @@ -8,7 +8,7 @@ ua-parser, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-sesame"; version = "3.2.4"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aaugustin"; repo = "django-sesame"; - tag = version; + tag = finalAttrs.version; hash = "sha256-q9LvsPyFEbaE/TEOlQ5WodVvzAiv4x7C4vaiz1RJLu4="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/aaugustin/django-sesame"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-shortuuidfield/default.nix b/python/pkgs/django-shortuuidfield/default.nix index 2f73bc5df..4a65dcd50 100644 --- a/python/pkgs/django-shortuuidfield/default.nix +++ b/python/pkgs/django-shortuuidfield/default.nix @@ -3,28 +3,31 @@ buildPythonPackage, django, fetchPypi, + # build-system + setuptools, shortuuid, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-shortuuidfield"; version = "0.1.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-opLA/lU4q+lHsTHiuRTt2axEr8xqQOrscUSOYjGj7wA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django shortuuid six ]; # no tests - doCheck = false; pythonImportsCheck = [ "shortuuidfield" ]; @@ -33,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/benrobster/django-shortuuidfield"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-silk/default.nix b/python/pkgs/django-silk/default.nix index e3f03577e..cdb7a7f49 100644 --- a/python/pkgs/django-silk/default.nix +++ b/python/pkgs/django-silk/default.nix @@ -4,6 +4,8 @@ buildPythonPackage, django, fetchFromGitHub, + # build-system + setuptools, gprof2dot, jinja2, mock, @@ -18,18 +20,20 @@ sqlparse, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-silk"; version = "5.5.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "django-silk"; - tag = version; + tag = finalAttrs.version; hash = "sha256-1m6HvwN9n35q9p0LUD8ihbbQ5FRRr8KoDvRLed9RIMQ="; }; + build-system = [ setuptools ]; + # "test_time_taken" tests aren't suitable for reproducible execution, but Django's # test runner doesn't have an easy way to ignore tests - so instead prevent it from picking # them up as tests @@ -37,14 +41,14 @@ buildPythonPackage rec { substituteInPlace project/tests/test_silky_profiler.py \ --replace "def test_time_taken" "def _test_time_taken" substituteInPlace setup.py \ - --replace 'use_scm_version=True' 'version="${version}"' + --replace 'use_scm_version=True' 'version="${finalAttrs.version}"' ''; nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ mock ]; - propagatedBuildInputs = [ + dependencies = [ autopep8 django gprof2dot @@ -63,4 +67,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-silk"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-simple-history/default.nix b/python/pkgs/django-simple-history/default.nix index 8f98c7432..3841f40bf 100644 --- a/python/pkgs/django-simple-history/default.nix +++ b/python/pkgs/django-simple-history/default.nix @@ -9,7 +9,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-simple-history"; version = "3.13.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "django-simple-history"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5hYpA2ZRJVCbl47QCZY9TMB6QAFC4k7m/Y81Z2VWsf4="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-simple-history/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-soft-delete/default.nix b/python/pkgs/django-soft-delete/default.nix index 4c7c5693c..d433a0537 100644 --- a/python/pkgs/django-soft-delete/default.nix +++ b/python/pkgs/django-soft-delete/default.nix @@ -6,14 +6,14 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-soft-delete"; version = "1.0.23"; pyproject = true; src = fetchPypi { pname = "django_soft_delete"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-gUZZ8NGdTyr8WLMf9z+I8K9mcVzO87T82PazoBHVmyo="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { dependencies = [ django ]; # No tests - doCheck = false; pythonImportsCheck = [ "django_softdelete" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/san4ezy/django_softdelete"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-split-settings/default.nix b/python/pkgs/django-split-settings/default.nix index 03ccc4b45..34fd2a5b2 100644 --- a/python/pkgs/django-split-settings/default.nix +++ b/python/pkgs/django-split-settings/default.nix @@ -8,7 +8,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-split-settings"; version = "1.3.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wemake-services"; repo = "django-split-settings"; - rev = version; + tag = finalAttrs.version; hash = "sha256-Bk2/DU+K524mCUvteWT0fIQH5ZgeMHiufMTF+dJYVtc="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/wemake-services/django-split-settings"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-sql-utils/default.nix b/python/pkgs/django-sql-utils/default.nix index bb4af8607..b6971bfc2 100644 --- a/python/pkgs/django-sql-utils/default.nix +++ b/python/pkgs/django-sql-utils/default.nix @@ -9,7 +9,7 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-sql-utils"; version = "0.7.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "martsberger"; repo = "django-sql-utils"; - tag = version; + tag = finalAttrs.version; hash = "sha256-OjKPxoWYheu8UQ14KvyiQyHISAQjJep+N4HRc4Msa1w="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/martsberger/django-sql-utils"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-sslserver/default.nix b/python/pkgs/django-sslserver/default.nix index 5eeb07fb7..05972e1ed 100644 --- a/python/pkgs/django-sslserver/default.nix +++ b/python/pkgs/django-sslserver/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { ]; # No tests on upstream - doCheck = false; pythonImportsCheck = [ "sslserver" ]; diff --git a/python/pkgs/django-statici18n/default.nix b/python/pkgs/django-statici18n/default.nix index 301cde9f4..b3d91015a 100644 --- a/python/pkgs/django-statici18n/default.nix +++ b/python/pkgs/django-statici18n/default.nix @@ -15,7 +15,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-statici18n"; version = "2.7.1"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zyegfryed"; repo = "django-statici18n"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-e6sCH/9h+Ki96hfG4ftuLo34HfZbwImThi9YxmZOmRc="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/zyegfryed/django-statici18n"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-storages/default.nix b/python/pkgs/django-storages/default.nix index b7b5906c5..88cf443fe 100644 --- a/python/pkgs/django-storages/default.nix +++ b/python/pkgs/django-storages/default.nix @@ -17,7 +17,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-storages"; version = "1.14.6"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jschneier"; repo = "django-storages"; - tag = version; + tag = finalAttrs.version; hash = "sha256-br7JGPf5EAAl0Qg7b+XaksxNPCTJsSS8HLgvA0wZmeI="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { homepage = "https://django-storages.readthedocs.io"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-stubs-ext/default.nix b/python/pkgs/django-stubs-ext/default.nix index 693b5d38a..8aab6b0e8 100644 --- a/python/pkgs/django-stubs-ext/default.nix +++ b/python/pkgs/django-stubs-ext/default.nix @@ -11,7 +11,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-stubs-ext"; version = "5.2.9"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "typeddjango"; repo = "django-stubs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-42FluS2fmfgj4qk2u+Z/7TGhXY4WKUc0cI00go6rnGc="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/typeddjango/django-stubs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-stubs/default.nix b/python/pkgs/django-stubs/default.nix index a1aa8e7f9..f7b743a5a 100644 --- a/python/pkgs/django-stubs/default.nix +++ b/python/pkgs/django-stubs/default.nix @@ -14,7 +14,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-stubs"; version = "5.2.9"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "typeddjango"; repo = "django-stubs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-42FluS2fmfgj4qk2u+Z/7TGhXY4WKUc0cI00go6rnGc="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://github.com/typeddjango/django-stubs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-tables2/default.nix b/python/pkgs/django-tables2/default.nix index 1bdeeb090..668382b64 100644 --- a/python/pkgs/django-tables2/default.nix +++ b/python/pkgs/django-tables2/default.nix @@ -21,7 +21,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-tables2"; version = "3.0.0"; pyproject = true; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jieter"; repo = "django-tables2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hy1eh+cSYK7TPgenCEo8J7msKgvk7i69PUb6m9NuCIA="; }; @@ -53,11 +53,11 @@ buildPythonPackage rec { pytest-django pytestCheckHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; meta = { description = "Django app for creating HTML tables"; homepage = "https://github.com/jieter/django-tables2"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/django-taggit/default.nix b/python/pkgs/django-taggit/default.nix index aff20d9d6..a03aa639d 100644 --- a/python/pkgs/django-taggit/default.nix +++ b/python/pkgs/django-taggit/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-taggit"; version = "6.1.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "django-taggit"; - tag = version; + tag = finalAttrs.version; hash = "sha256-QLJhO517VONuf+8rrpZ6SXMP/WWymOIKfd4eyviwCsU="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-taggit"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-tastypie/default.nix b/python/pkgs/django-tastypie/default.nix index 802713371..fe8efbf99 100644 --- a/python/pkgs/django-tastypie/default.nix +++ b/python/pkgs/django-tastypie/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-tastypie"; version = "0.15.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-tastypie"; repo = "django-tastypie"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KmBI8kHcmRfbNIfBEz5pHyseWcWnfP3tq6GAPi4tdhE="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # Tests requires a Django instance - doCheck = false; pythonImportsCheck = [ "tastypie" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/django-tastypie/django-tastypie"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/django-tenants/default.nix b/python/pkgs/django-tenants/default.nix index 2ce94fd57..4cad9e43e 100644 --- a/python/pkgs/django-tenants/default.nix +++ b/python/pkgs/django-tenants/default.nix @@ -7,7 +7,7 @@ psycopg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-tenants"; version = "3.14.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-tenants"; repo = "django-tenants"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3A4ClGinyN1t5bt441BVZncpw9Ie7b81M/5Tfsbz4kw="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/django-tenants/django-tenants"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-timezone-field/default.nix b/python/pkgs/django-timezone-field/default.nix index 7cdd55fa9..a12e67756 100644 --- a/python/pkgs/django-timezone-field/default.nix +++ b/python/pkgs/django-timezone-field/default.nix @@ -10,7 +10,7 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-timezone-field"; version = "7.2.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mfogel"; repo = "django-timezone-field"; - tag = version; + tag = finalAttrs.version; hash = "sha256-EGjBzKTYXTShrPIHfBIm1LqzYGuxew7ptvlGppXOYSY="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/mfogel/django-timezone-field"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/django-tinymce/default.nix b/python/pkgs/django-tinymce/default.nix index 3bd3aa263..91b857531 100644 --- a/python/pkgs/django-tinymce/default.nix +++ b/python/pkgs/django-tinymce/default.nix @@ -8,13 +8,13 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-tinymce"; version = "5.0.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "django_tinymce"; hash = "sha256-YldmntWWrM9fqWf/MGEnayxTUrqsG7xlj82CUrEso4o="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { env.DJANGO_SETTINGS_MODULE = "tests.settings"; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-tinymce"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-tree-queries/default.nix b/python/pkgs/django-tree-queries/default.nix index 703c59ae0..9ce5c473a 100644 --- a/python/pkgs/django-tree-queries/default.nix +++ b/python/pkgs/django-tree-queries/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-tree-queries"; version = "0.24"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "feincms"; repo = "django-tree-queries"; - tag = version; + tag = finalAttrs.version; hash = "sha256-VPJU/0tnnLSayJhuOO0YOtqegULF6CB6ve8/1ytFydA="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/feincms/django-tree-queries"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/django-treenode/default.nix b/python/pkgs/django-treenode/default.nix index 6cdd48e0b..6fff40a2e 100644 --- a/python/pkgs/django-treenode/default.nix +++ b/python/pkgs/django-treenode/default.nix @@ -6,7 +6,7 @@ django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-treenode"; version = "0.25.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fabiocaccamo"; repo = "django-treenode"; - tag = version; + tag = finalAttrs.version; hash = "sha256-MsMNKptwxBNHgW+0juIkJCD8qdXvXzorwL/DnL+FqgQ="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/fabiocaccamo/django-treenode"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-two-factor-auth/default.nix b/python/pkgs/django-two-factor-auth/default.nix index 3c60c0535..5779369eb 100644 --- a/python/pkgs/django-two-factor-auth/default.nix +++ b/python/pkgs/django-two-factor-auth/default.nix @@ -14,7 +14,7 @@ webauthn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-two-factor-auth"; version = "1.18.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "django-two-factor-auth"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rhcEVmh5Am1TKO+01rb9VBKJdFVa8uRdTimEKq2pA7w="; }; @@ -58,7 +58,6 @@ buildPythonPackage rec { }; # Tests require internet connection - doCheck = false; pythonImportsCheck = [ "two_factor" ]; @@ -67,4 +66,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-two-factor-auth"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-types/default.nix b/python/pkgs/django-types/default.nix index 4ea42fd3d..65523c0d2 100644 --- a/python/pkgs/django-types/default.nix +++ b/python/pkgs/django-types/default.nix @@ -6,14 +6,14 @@ types-psycopg2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-types"; version = "0.24.0"; pyproject = true; src = fetchPypi { pname = "django_types"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-r5A96Lnuljt1lEWaeiDLjqqrF2risyROyqCJ4MVwsNE="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/sbdchd/django-types"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-vcache/default.nix b/python/pkgs/django-vcache/default.nix index 4ee601f76..5cef18e02 100644 --- a/python/pkgs/django-vcache/default.nix +++ b/python/pkgs/django-vcache/default.nix @@ -43,7 +43,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "django_vcache" ]; # requires valkey sentinel cluster - doCheck = false; meta = { description = "Specialized, lightweight Django cache backend for Valkey"; diff --git a/python/pkgs/django-versatileimagefield/default.nix b/python/pkgs/django-versatileimagefield/default.nix index 6f3acfb19..3604ff885 100644 --- a/python/pkgs/django-versatileimagefield/default.nix +++ b/python/pkgs/django-versatileimagefield/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, django, pillow, python-magic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-versatileimagefield"; version = "3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-M5DiAEgJjol78pmwNgdj0QzQiWZbeu+OupAO7Lrq0Ng="; }; - propagatedBuildInputs = [ + + build-system = [ setuptools ]; + dependencies = [ pillow python-magic ]; @@ -24,7 +28,6 @@ buildPythonPackage rec { nativeCheckInputs = [ django ]; # tests not included with pypi release - doCheck = false; pythonImportsCheck = [ "versatileimagefield" ]; @@ -33,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/respondcreate/django-versatileimagefield/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-vite/default.nix b/python/pkgs/django-vite/default.nix index 037aa0ae5..b83f895c4 100644 --- a/python/pkgs/django-vite/default.nix +++ b/python/pkgs/django-vite/default.nix @@ -1,26 +1,29 @@ { lib, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-vite"; version = "3.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "MrBin99"; repo = "django-vite"; - tag = version; + tag = finalAttrs.version; hash = "sha256-S5DpU0Sw0TOY1SNici6djeTrvg4gehH/a2UCzju1e/s="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; # Package doesn’t have any tests - doCheck = false; pythonImportsCheck = [ "django_vite" ]; @@ -29,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/MrBin99/django-vite"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/django-weasyprint/default.nix b/python/pkgs/django-weasyprint/default.nix index 3efd503a3..dd6e76622 100644 --- a/python/pkgs/django-weasyprint/default.nix +++ b/python/pkgs/django-weasyprint/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-weasyprint"; version = "2.5.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fdemmer"; repo = "django-weasyprint"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EwTEBIqAZGmtSXkSLZgNPCKA98IrymsUEaCHc1uQ2XE="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/fdemmer/django-weasyprint"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/django-webpack-loader/default.nix b/python/pkgs/django-webpack-loader/default.nix index 7d1c383a4..0e7c77b4d 100644 --- a/python/pkgs/django-webpack-loader/default.nix +++ b/python/pkgs/django-webpack-loader/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-webpack-loader"; version = "3.2.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-webpack"; repo = "django-webpack-loader"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yWOzMjXauwOwlEjcZpjl/z6kE5bOYAdb+map1dHupWs="; }; @@ -22,8 +22,6 @@ buildPythonPackage rec { dependencies = [ django ]; - doCheck = false; # tests require fetching node_modules - pythonImportsCheck = [ "webpack_loader" ]; meta = { @@ -31,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/owais/django-webpack-loader"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-webpush/default.nix b/python/pkgs/django-webpush/default.nix index b744617ed..7ba1ba613 100644 --- a/python/pkgs/django-webpush/default.nix +++ b/python/pkgs/django-webpush/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-webpush"; version = "0.3.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "safwanrahman"; repo = "django-webpush"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Mwp53apdPpBcn7VfDbyDlvLAVAG65UUBhT0w9OKjKbU="; }; @@ -31,7 +31,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "webpush" ]; @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/safwanrahman/django-webpush/"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/django-widget-tweaks/default.nix b/python/pkgs/django-widget-tweaks/default.nix index 6a15a6a5d..0fa64e842 100644 --- a/python/pkgs/django-widget-tweaks/default.nix +++ b/python/pkgs/django-widget-tweaks/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-widget-tweaks"; version = "1.5.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "django-widget-tweaks"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ymjBuNGfndUwQdBU2xnc9CA51oOaEPA+RaAspJMKQ04="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-widget-tweaks"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/django-xforwardedfor-middleware/default.nix b/python/pkgs/django-xforwardedfor-middleware/default.nix index a9d518157..80c273d82 100644 --- a/python/pkgs/django-xforwardedfor-middleware/default.nix +++ b/python/pkgs/django-xforwardedfor-middleware/default.nix @@ -24,7 +24,6 @@ buildPythonPackage (finalAttrs: { ]; # No tests on upstream - doCheck = false; pythonImportsCheck = [ "x_forwarded_for" ]; diff --git a/python/pkgs/djangocms-admin-style/default.nix b/python/pkgs/djangocms-admin-style/default.nix index 4cb1d2f7e..cdcd9bbe3 100644 --- a/python/pkgs/djangocms-admin-style/default.nix +++ b/python/pkgs/djangocms-admin-style/default.nix @@ -8,7 +8,7 @@ djangocms-admin-style, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "djangocms-admin-style"; version = "3.3.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-cms"; repo = "djangocms-admin-style"; - tag = version; + tag = finalAttrs.version; hash = "sha256-cDbmC7IJTT3NuVXBnbUVqC7dUfusMdntDGu2tSvxIdQ="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://django-cms.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/djangorestframework-camel-case/default.nix b/python/pkgs/djangorestframework-camel-case/default.nix index 5697e71d6..a7da82011 100644 --- a/python/pkgs/djangorestframework-camel-case/default.nix +++ b/python/pkgs/djangorestframework-camel-case/default.nix @@ -2,24 +2,27 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, djangorestframework, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "djangorestframework-camel-case"; version = "1.4.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-za51hGZIq7ZYXHRwY5odL7Bk3EX46LYqqlC+fxp6YfQ="; }; - propagatedBuildInputs = [ djangorestframework ]; + build-system = [ setuptools ]; + + dependencies = [ djangorestframework ]; # tests are only on GitHub but there are no tags # https://github.com/vbabiy/djangorestframework-camel-case/issues/116 - doCheck = false; pythonImportsCheck = [ "djangorestframework_camel_case" ]; @@ -28,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/vbabiy/djangorestframework-camel-case"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/djangorestframework-csv/default.nix b/python/pkgs/djangorestframework-csv/default.nix index a695a30ad..bed6a4107 100644 --- a/python/pkgs/djangorestframework-csv/default.nix +++ b/python/pkgs/djangorestframework-csv/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, django, djangorestframework, pytest-django, python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "djangorestframework-csv"; version = "3.0.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mjumbewu"; repo = "django-rest-framework-csv"; - tag = version; + tag = finalAttrs.version; hash = "sha256-XtMkSucB7+foRpTaRfGF1Co0n3ONNGyzex6MXR4xM5c="; }; + build-system = [ setuptools ]; + dependencies = [ django djangorestframework @@ -37,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/mjumbewu/django-rest-framework-csv"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/djangorestframework-dataclasses/default.nix b/python/pkgs/djangorestframework-dataclasses/default.nix index 778977c32..7e0fd8512 100644 --- a/python/pkgs/djangorestframework-dataclasses/default.nix +++ b/python/pkgs/djangorestframework-dataclasses/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "djangorestframework-dataclasses"; version = "1.4.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oxan"; repo = "djangorestframework-dataclasses"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nUkR5xTyeBv7ziJ6Mej9TKvMOa5/k+ELBqt4BVam/wk="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/oxan/djangorestframework-dataclasses"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/djangorestframework-recursive/default.nix b/python/pkgs/djangorestframework-recursive/default.nix index 93ae12f4b..4e30328c6 100644 --- a/python/pkgs/djangorestframework-recursive/default.nix +++ b/python/pkgs/djangorestframework-recursive/default.nix @@ -4,27 +4,30 @@ django, djangorestframework, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "djangorestframework-recursive"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "heywbj"; repo = "django-rest-framework-recursive"; - rev = version; + tag = finalAttrs.version; hash = "sha256-Q/6yxpz3c402sMZudAeFIht9+5GmTRlzM51AMAx5muY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django djangorestframework ]; # incompatible with newer django versions - doCheck = false; pythonImportsCheck = [ "rest_framework_recursive" ]; @@ -33,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/heywbj/django-rest-framework-recursive"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/djangorestframework-simplejwt/default.nix b/python/pkgs/djangorestframework-simplejwt/default.nix index 1922148a9..b6cc803d7 100644 --- a/python/pkgs/djangorestframework-simplejwt/default.nix +++ b/python/pkgs/djangorestframework-simplejwt/default.nix @@ -5,25 +5,29 @@ django, djangorestframework, fetchPypi, + # build-system + setuptools, pyjwt, python-jose, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "djangorestframework-simplejwt"; version = "5.5.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "djangorestframework_simplejwt"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-5yxVcvUdeAMCEojiBXr8vQPxf+EdSECW9ApGCrx26H8="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ django djangorestframework pyjwt @@ -35,7 +39,6 @@ buildPythonPackage rec { }; # Test raises django.core.exceptions.ImproperlyConfigured - doCheck = false; pythonImportsCheck = [ "rest_framework_simplejwt" ]; @@ -44,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/davesque/django-rest-framework-simplejwt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/djangorestframework-stubs/default.nix b/python/pkgs/djangorestframework-stubs/default.nix index 512f0fa2c..c71719d02 100644 --- a/python/pkgs/djangorestframework-stubs/default.nix +++ b/python/pkgs/djangorestframework-stubs/default.nix @@ -15,7 +15,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "djangorestframework-stubs"; version = "3.16.8"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "typeddjango"; repo = "djangorestframework-stubs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-I7+XMUB87+bIyQMQZUm5hUTsJ+2wA3F6qyjJQeWeQdo="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/typeddjango/djangorestframework-stubs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/djangosaml2/default.nix b/python/pkgs/djangosaml2/default.nix index 6d99751a1..8dc907768 100644 --- a/python/pkgs/djangosaml2/default.nix +++ b/python/pkgs/djangosaml2/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "djangosaml2"; version = "1.12.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "IdentityPython"; repo = "djangosaml2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ei65WadTOR7eiRFo817HPSiKCSOOunFJRcpIQstPQ+A="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/IdentityPython/djangosaml2"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/djmail/default.nix b/python/pkgs/djmail/default.nix index 27884eac3..72ba9b332 100644 --- a/python/pkgs/djmail/default.nix +++ b/python/pkgs/djmail/default.nix @@ -2,16 +2,18 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, glibcLocales, celery, django, psycopg2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "djmail"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; meta = { description = "Simple, powerfull and nonobstructive django email middleware"; @@ -20,20 +22,21 @@ buildPythonPackage rec { }; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "cf3ce7626305d218a8bf2b6a219266ef8061aceeefc1c70a54170f4105465202"; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ glibcLocales ]; env.LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ + dependencies = [ celery django psycopg2 ]; # django.core.exceptions.ImproperlyConfigured: Requested setting DEFAULT_INDEX_TABLESPACE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. - doCheck = false; -} +}) diff --git a/python/pkgs/dkimpy/default.nix b/python/pkgs/dkimpy/default.nix index fdea4e7dc..46d9a364a 100644 --- a/python/pkgs/dkimpy/default.nix +++ b/python/pkgs/dkimpy/default.nix @@ -9,13 +9,13 @@ authres, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dkimpy"; version = "1.1.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tfYPtHu/XY12LxNLzqDDiOumtJg0KmgqIfFoZUUJS3c="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://launchpad.net/dkimpy"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/dlinfo/default.nix b/python/pkgs/dlinfo/default.nix index 2a3dcaa74..9b73c9bc5 100644 --- a/python/pkgs/dlinfo/default.nix +++ b/python/pkgs/dlinfo/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dlinfo"; version = "2.0.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fphammerle"; repo = "python-dlinfo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-W9WfXU5eIMQQImzRgTJS0KL4IZfRtLrK8TYmdEc0VLI="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.mit; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/python/pkgs/dllogger/default.nix b/python/pkgs/dllogger/default.nix index fa3ca3034..189b8f5f8 100644 --- a/python/pkgs/dllogger/default.nix +++ b/python/pkgs/dllogger/default.nix @@ -6,7 +6,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dllogger"; version = "1.1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NVIDIA"; repo = "dllogger"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kT6FhAl4JZlFPdzKYopAJBurYVMaU5umn/qZADfPjkE="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/NVIDIA/dllogger"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dlms-cosem/default.nix b/python/pkgs/dlms-cosem/default.nix index 48e15c608..b301f5ff0 100644 --- a/python/pkgs/dlms-cosem/default.nix +++ b/python/pkgs/dlms-cosem/default.nix @@ -13,7 +13,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dlms-cosem"; version = "25.1.0"; pyproject = true; @@ -21,13 +21,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pwitab"; repo = "dlms-cosem"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ZsF+GUVG9bZNZE5daROQJIZZgqpjAkB/bFyre2oGu+E="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail 'VERSION = "24.1.0"' 'VERSION = "${version}"' + --replace-fail 'VERSION = "24.1.0"' 'VERSION = "${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/pwitab/dlms-cosem"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dlx/default.nix b/python/pkgs/dlx/default.nix index cb65e3b1a..61fee10fc 100644 --- a/python/pkgs/dlx/default.nix +++ b/python/pkgs/dlx/default.nix @@ -2,13 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, python, }: buildPythonPackage { pname = "dlx"; version = "1.0.4"; - format = "setuptools"; + pyproject = true; # untagged releases src = fetchFromGitHub { @@ -18,6 +20,8 @@ buildPythonPackage { sha256 = "0c6dblbypwmx6yrk9qxp157m3cd7lq3j411ifr3shscv1igxv5hk"; }; + build-system = [ setuptools ]; + # No test suite, so just run an example pythonImportsCheck = [ "dlx" ]; # ./examples/design.py requires pyncomb, not in tree diff --git a/python/pkgs/dm-env/default.nix b/python/pkgs/dm-env/default.nix index a028cfe7f..77c60b9d3 100644 --- a/python/pkgs/dm-env/default.nix +++ b/python/pkgs/dm-env/default.nix @@ -1,6 +1,8 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, dm-tree, numpy, @@ -8,16 +10,18 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dm-env"; version = "1.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-pDbrHGVMOeDJhqUWzuIYvqcUC1EPzv9j+X60/P89k94="; }; + build-system = [ setuptools ]; + buildInputs = [ absl-py dm-tree @@ -33,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/dpkp/kafka-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dmsuite/default.nix b/python/pkgs/dmsuite/default.nix index 0c0e0d3ad..5f92fa2b4 100644 --- a/python/pkgs/dmsuite/default.nix +++ b/python/pkgs/dmsuite/default.nix @@ -10,13 +10,13 @@ scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dmsuite"; version = "0.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IqLsHkGNgPz2yZm0QMyMMo6Mr2RsU2DPGxYpoNwC3fs="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/labrosse/dmsuite"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/dncil/default.nix b/python/pkgs/dncil/default.nix index e8f0ca0b4..9c9054966 100644 --- a/python/pkgs/dncil/default.nix +++ b/python/pkgs/dncil/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dncil"; version = "1.0.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mandiant"; repo = "dncil"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bndkiXkIYTd071J+mgkmJmA+9J5yJ+9/oDfAypN7wYo="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/mandiant/dncil"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dnslib/default.nix b/python/pkgs/dnslib/default.nix index 17cfc2ea0..74188bbe2 100644 --- a/python/pkgs/dnslib/default.nix +++ b/python/pkgs/dnslib/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dnslib"; version = "0.9.26"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vlaFdTQ5Cy+9ApNScAGbrMXmtBHRVss5IaxVp/tR8ag="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "dnslib" ]; meta = { @@ -21,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/paulc/dnslib"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/dnspython/default.nix b/python/pkgs/dnspython/default.nix index 54b5a0f57..24b61ca31 100644 --- a/python/pkgs/dnspython/default.nix +++ b/python/pkgs/dnspython/default.nix @@ -11,13 +11,13 @@ trio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dnspython"; version = "2.8.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GB08aZZFLLEYnEBGxhWZuEpahuCZVi/9530mmE/ybQ8="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://www.dnspython.org"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/doc8/default.nix b/python/pkgs/doc8/default.nix index 69cc316ca..f4f49fba3 100644 --- a/python/pkgs/doc8/default.nix +++ b/python/pkgs/doc8/default.nix @@ -10,16 +10,18 @@ pygments, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "doc8"; version = "2.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-EmetMnWJcfvPmRRCQXo5Nce8nlJVDnNiLg5WulXqHUA="; }; + pythonRelaxDeps = [ "docutils" ]; + build-system = [ setuptools-scm ]; dependencies = [ @@ -37,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/pycqa/doc8"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/docformatter/default.nix b/python/pkgs/docformatter/default.nix index 1d8681f5a..c979a16bd 100644 --- a/python/pkgs/docformatter/default.nix +++ b/python/pkgs/docformatter/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "docformatter"; version = "1.7.8"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; repo = "docformatter"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Z1ZW5ljWRDnS2mlAmbQyAcE97nU+PrpKaP1aox3VQtQ="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/myint/docformatter"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/docker-pycreds/default.nix b/python/pkgs/docker-pycreds/default.nix index e5703bd72..cfd88531f 100644 --- a/python/pkgs/docker-pycreds/default.nix +++ b/python/pkgs/docker-pycreds/default.nix @@ -7,7 +7,7 @@ pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "docker-pycreds"; version = "0.4.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "shin-"; repo = "dockerpy-creds"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yYsMsRW6Bb8vmwT0mPjs0pRqBbznGtHnGb3JNHjLjys="; }; @@ -33,11 +33,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "dockerpycreds" ]; # require docker-credential-helpers binaries - doCheck = false; meta = { description = "Python bindings for the docker credentials store API"; homepage = "https://github.com/shin-/dockerpy-creds"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/docker/default.nix b/python/pkgs/docker/default.nix index 0bc65b3cb..bd784079c 100644 --- a/python/pkgs/docker/default.nix +++ b/python/pkgs/docker/default.nix @@ -17,7 +17,7 @@ websocket-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "docker"; version = "7.2.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "docker"; repo = "docker-py"; - tag = version; + tag = finalAttrs.version; hash = "sha256-4LmmWAmwoFroV4Ez0r1X72jCpBt69upQMrsA4eP5K6o="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/docker/docker-py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dockerfile-parse/default.nix b/python/pkgs/dockerfile-parse/default.nix index bf47f9622..dfbd26cfd 100644 --- a/python/pkgs/dockerfile-parse/default.nix +++ b/python/pkgs/dockerfile-parse/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dockerfile-parse"; version = "2.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-MYTM3FEyIZg+UDrADhqlBKKqj4Tl3mc8RrC27umex7w="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/DBuildService/dockerfile-parse"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/dockerpty/default.nix b/python/pkgs/dockerpty/default.nix index 41d1a08ba..79cf4227f 100644 --- a/python/pkgs/dockerpty/default.nix +++ b/python/pkgs/dockerpty/default.nix @@ -10,13 +10,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dockerpty"; version = "0.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aanWnVc6DaoxvNHAd07u1cFcKV/nGcYaylUO0TkxVs4="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/d11wtq/dockerpty"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/docling-core/default.nix b/python/pkgs/docling-core/default.nix index 220f59e20..94fc7863f 100644 --- a/python/pkgs/docling-core/default.nix +++ b/python/pkgs/docling-core/default.nix @@ -62,8 +62,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "docling_core" ]; - doCheck = false; - meta = { description = "Python library to define and validate data types in Docling"; homepage = "https://github.com/docling-project/docling-core"; diff --git a/python/pkgs/docloud/default.nix b/python/pkgs/docloud/default.nix index a6e9251c9..318c7d8f0 100644 --- a/python/pkgs/docloud/default.nix +++ b/python/pkgs/docloud/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, requests, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "docloud"; version = "1.0.375"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "996d55407498fd01e6c6c480f367048f92255e9ca9db0e9ea19aaef91328a441"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests six ]; # Pypi's tarball doesn't contain tests. Source not available. - doCheck = false; pythonImportsCheck = [ "docloud" ]; meta = { @@ -30,4 +33,4 @@ buildPythonPackage rec { homepage = "https://onboarding-oaas.docloud.ibmcloud.com/software/analytics/docloud/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/docopt-ng/default.nix b/python/pkgs/docopt-ng/default.nix index d56877091..fa7a100d5 100644 --- a/python/pkgs/docopt-ng/default.nix +++ b/python/pkgs/docopt-ng/default.nix @@ -5,14 +5,14 @@ pdm-backend, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "docopt-ng"; version = "0.9.0"; pyproject = true; src = fetchPypi { pname = "docopt_ng"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-kcbaELW7by6eJTRYKfuCeMeK8Bn2/ECIetSbBgSDsdc="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/bazaar-projects/docopt-ng"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/docopt/default.nix b/python/pkgs/docopt/default.nix index 16bf62624..ec82980a8 100644 --- a/python/pkgs/docopt/default.nix +++ b/python/pkgs/docopt/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "docopt"; version = "0.6.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SbOoJSgL1ms6qDWF71nEqMgvLIpSLb51SovI0IyFxJE="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "docopt" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "http://docopt.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/docplex/default.nix b/python/pkgs/docplex/default.nix index 644e3c390..74b02d937 100644 --- a/python/pkgs/docplex/default.nix +++ b/python/pkgs/docplex/default.nix @@ -30,7 +30,6 @@ buildPythonPackage (finalAttrs: { ]; # PypI release does not include tests - doCheck = false; pythonImportsCheck = [ "docplex" ]; diff --git a/python/pkgs/docrep/default.nix b/python/pkgs/docrep/default.nix index 214b1c9f3..487d7261a 100644 --- a/python/pkgs/docrep/default.nix +++ b/python/pkgs/docrep/default.nix @@ -2,33 +2,36 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytest, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "docrep"; version = "0.3.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "ed8a17e201abd829ef8da78a0b6f4d51fb99a4cbd0554adbed3309297f964314"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytest ]; - propagatedBuildInputs = [ six ]; + dependencies = [ six ]; checkPhase = '' py.test ''; # tests not packaged with PyPi download - doCheck = false; meta = { description = "Python package for docstring repetition"; homepage = "https://github.com/Chilipp/docrep"; license = lib.licenses.gpl2; }; -} +}) diff --git a/python/pkgs/docstr-coverage/default.nix b/python/pkgs/docstr-coverage/default.nix index 34125b69e..4b72ffda9 100644 --- a/python/pkgs/docstr-coverage/default.nix +++ b/python/pkgs/docstr-coverage/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, click, pyyaml, tqdm, @@ -14,7 +16,7 @@ in buildPythonPackage { pname = "docstr-coverage"; inherit version; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "HunterMcGushion"; @@ -23,7 +25,9 @@ buildPythonPackage { hash = "sha256-k1ny4fWS+CmgLNWPlYPsscjei2UZ6h8QJrZSay5abck="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ click pyyaml tqdm diff --git a/python/pkgs/docstring-parser/default.nix b/python/pkgs/docstring-parser/default.nix index ae2f748a6..244c616c7 100644 --- a/python/pkgs/docstring-parser/default.nix +++ b/python/pkgs/docstring-parser/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "docstring-parser"; version = "0.17.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rr-"; repo = "docstring_parser"; - tag = version; + tag = finalAttrs.version; hash = "sha256-hR+i1HU/ZpN6I3a8k/Wv2OrXgB4ls/A5OHZRqxEZS78="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/rr-/docstring_parser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/docstring-to-markdown/default.nix b/python/pkgs/docstring-to-markdown/default.nix index e21d0a42b..9f42b1109 100644 --- a/python/pkgs/docstring-to-markdown/default.nix +++ b/python/pkgs/docstring-to-markdown/default.nix @@ -7,13 +7,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "docstring-to-markdown"; version = "0.17"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "docstring_to_markdown"; hash = "sha256-33KhEilMdJJIfJ2iRRyuD67uBuhgCCRcGIxXYclZDKM="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { description = "On the fly conversion of Python docstrings to markdown"; license = lib.licenses.lgpl2Plus; }; -} +}) diff --git a/python/pkgs/docutils-stubs/default.nix b/python/pkgs/docutils-stubs/default.nix index b852be3be..559eff68c 100644 --- a/python/pkgs/docutils-stubs/default.nix +++ b/python/pkgs/docutils-stubs/default.nix @@ -31,7 +31,6 @@ buildPythonPackage (finalAttrs: { ]; # Module doesn't have tests - doCheck = false; meta = { description = "PEP 561 based Type information for docutils"; diff --git a/python/pkgs/docutils/default.nix b/python/pkgs/docutils/default.nix index ce1fbe0f9..b603697ea 100644 --- a/python/pkgs/docutils/default.nix +++ b/python/pkgs/docutils/default.nix @@ -10,48 +10,44 @@ # Note: this package is used to build LLVM’s documentation, which is part of the Darwin stdenv. # It cannot use `fetchgit` because that would pull curl into the bootstrap, which is disallowed. -let - self = buildPythonPackage rec { - pname = "docutils"; - version = "0.23"; - pyproject = true; - - src = fetchurl { - url = "mirror://sourceforge/docutils/docutils-${version}.tar.gz"; - hash = "sha256-dG9QYDIlESgKHlDrdoRu1r8jQphLKsBNxCyqGo14eZ4="; - }; - - build-system = [ flit-core ]; - - # infinite recursion via sphinx and pillow - doCheck = false; - passthru.tests.pytest = self.overridePythonAttrs { doCheck = true; }; - checkPhase = '' - runHook preCheck - ${python.interpreter} test/alltests.py - runHook postCheck - ''; - - # Create symlinks lacking a ".py" suffix, many programs depend on these names - postFixup = '' - for f in $out/bin/*.py; do - ln -s $(basename $f) $out/bin/$(basename $f .py) - done - ''; - - pythonImportsCheck = [ "docutils" ]; - - meta = { - description = "Python Documentation Utilities"; - homepage = "http://docutils.sourceforge.net/"; - license = with lib.licenses; [ - publicDomain - bsd2 - psfl - gpl3Plus - ]; - mainProgram = "docutils"; - }; +buildPythonPackage (finalAttrs: { + pname = "docutils"; + version = "0.23"; + pyproject = true; + + src = fetchurl { + url = "mirror://sourceforge/docutils/docutils-${finalAttrs.version}.tar.gz"; + hash = "sha256-dG9QYDIlESgKHlDrdoRu1r8jQphLKsBNxCyqGo14eZ4="; }; -in -self + + build-system = [ flit-core ]; + + # infinite recursion via sphinx and pillow + passthru.tests.pytest = finalAttrs.finalPackage.overridePythonAttrs { doCheck = true; }; + checkPhase = '' + runHook preCheck + ${python.interpreter} test/alltests.py + runHook postCheck + ''; + + # Create symlinks lacking a ".py" suffix, many programs depend on these names + postFixup = '' + for f in $out/bin/*.py; do + ln -s $(basename $f) $out/bin/$(basename $f .py) + done + ''; + + pythonImportsCheck = [ "docutils" ]; + + meta = { + description = "Python Documentation Utilities"; + homepage = "http://docutils.sourceforge.net/"; + license = with lib.licenses; [ + publicDomain + bsd2 + psfl + gpl3Plus + ]; + mainProgram = "docutils"; + }; +}) diff --git a/python/pkgs/docx2txt/default.nix b/python/pkgs/docx2txt/default.nix index ed76e9056..16ab63236 100644 --- a/python/pkgs/docx2txt/default.nix +++ b/python/pkgs/docx2txt/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "docx2txt"; version = "0.9"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GAE/YimxSQkCixmqe/T489bkYy17CJqyn38KTR9mDig="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "docx2txt" ]; meta = { @@ -21,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/ankushshah89/python-docx2txt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dodgy/default.nix b/python/pkgs/dodgy/default.nix index 404a325be..9843d2ac2 100644 --- a/python/pkgs/dodgy/default.nix +++ b/python/pkgs/dodgy/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dodgy"; version = "0.2.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "prospector-dev"; repo = "dodgy"; - rev = version; + tag = finalAttrs.version; sha256 = "0ywwjpz0p6ls3hp1lndjr9ql6s5lkj7dgpll1h87w04kwan70j0x"; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/prospector-dev/dodgy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dogpile-cache/default.nix b/python/pkgs/dogpile-cache/default.nix index 7324005d5..dbc4b3227 100644 --- a/python/pkgs/dogpile-cache/default.nix +++ b/python/pkgs/dogpile-cache/default.nix @@ -8,14 +8,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dogpile-cache"; version = "1.5.0"; pyproject = true; src = fetchPypi { pname = "dogpile_cache"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-hJxVc8mjjxVc1BcxA8cCtjft4DYcEuhkh2h30M0SXuw="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/sqlalchemy/dogpile.cache"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/dogtag-pki/default.nix b/python/pkgs/dogtag-pki/default.nix index e0f2f9725..8b7591580 100644 --- a/python/pkgs/dogtag-pki/default.nix +++ b/python/pkgs/dogtag-pki/default.nix @@ -1,6 +1,8 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, cryptography, python-ldap, @@ -8,22 +10,24 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dogtag-pki"; version = "11.2.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rQSnQPNYr5SyeNbKoFAbnGb2X/8utrfWLa8gu93hy2w="; }; + build-system = [ setuptools ]; + buildInputs = [ cryptography python-ldap ]; pythonImportsCheck = [ "pki" ]; - propagatedBuildInputs = [ + dependencies = [ requests six ]; @@ -33,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/dogtagpki/pki"; license = lib.licenses.gpl2; }; -} +}) diff --git a/python/pkgs/dokuwiki/default.nix b/python/pkgs/dokuwiki/default.nix index 29751a97b..f271fada3 100644 --- a/python/pkgs/dokuwiki/default.nix +++ b/python/pkgs/dokuwiki/default.nix @@ -1,19 +1,23 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dokuwiki"; version = "1.3.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gtTyO6jmjQT0ZwmxvH+RAe1v5aruNStfP1qz1+AqYXs="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "dokuwiki" ]; meta = { @@ -21,4 +25,4 @@ buildPythonPackage rec { description = "Python module that aims to manage DokuWiki wikis by using the provided XML-RPC API"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dom-toml/default.nix b/python/pkgs/dom-toml/default.nix index 37caa7ef0..c016c5c5e 100644 --- a/python/pkgs/dom-toml/default.nix +++ b/python/pkgs/dom-toml/default.nix @@ -8,7 +8,7 @@ tomli-w, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dom-toml"; version = "2.3.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "domdfcoding"; repo = "dom_toml"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ukRnQecbgZBdTHhyEBIoHUwGTwQVJxo+u7Dqg4Kjvsw="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/domdfcoding/dom_toml"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/domdf-python-tools/default.nix b/python/pkgs/domdf-python-tools/default.nix index c2471b0b0..5e60454d0 100644 --- a/python/pkgs/domdf-python-tools/default.nix +++ b/python/pkgs/domdf-python-tools/default.nix @@ -6,13 +6,13 @@ natsort, typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "domdf-python-tools"; version = "3.10.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "domdf_python_tools"; hash = "sha256-KuMI0vTx6RRfX0ulf4QPv9HCmD7ibkgkNHeJZJ064pg="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/domdfcoding/domdf_python_tools"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/domeneshop/default.nix b/python/pkgs/domeneshop/default.nix index 084c0381f..f7617da20 100644 --- a/python/pkgs/domeneshop/default.nix +++ b/python/pkgs/domeneshop/default.nix @@ -7,13 +7,13 @@ certifi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "domeneshop"; version = "0.4.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-UCxIDnhIAkxZ1oQXYRyAMdGgUsUZ6AlYXwsxL49TFAg="; }; @@ -25,7 +25,6 @@ buildPythonPackage rec { ]; # There are none - doCheck = false; pythonImportsCheck = [ "domeneshop" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://api.domeneshop.no/docs/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dominate/default.nix b/python/pkgs/dominate/default.nix index 1092bb5c7..d7d00b324 100644 --- a/python/pkgs/dominate/default.nix +++ b/python/pkgs/dominate/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dominate"; version = "2.9.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VYKEaH2biq4ZBOPWBRrRMt1KjAz1UbN+pOfkKjHRncQ="; }; @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Library for creating and manipulating HTML documents using an elegant DOM API"; homepage = "https://github.com/Knio/dominate/"; - changelog = "https://github.com/Knio/dominate/releases/tag/${version}"; + changelog = "https://github.com/Knio/dominate/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/donfig/default.nix b/python/pkgs/donfig/default.nix index 80e4db04b..9bde29372 100644 --- a/python/pkgs/donfig/default.nix +++ b/python/pkgs/donfig/default.nix @@ -8,7 +8,7 @@ cloudpickle, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "donfig"; version = "0.8.1.post1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytroll"; repo = "donfig"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hF4hzI1MTLgUexRIqwBEEEMV7Az2oDkp5GQQ5282vwE="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytroll/donfig"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/donut-shellcode/default.nix b/python/pkgs/donut-shellcode/default.nix index 26c6f8513..2ae603a2f 100644 --- a/python/pkgs/donut-shellcode/default.nix +++ b/python/pkgs/donut-shellcode/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "donut-shellcode"; version = "1.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "TheWover"; repo = "donut"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gKa7ngq2+r4EYRdwH9AWnJodJjCdppzKch4Ve/4ZPhk="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/TheWover/donut"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/doorbirdpy/default.nix b/python/pkgs/doorbirdpy/default.nix index 7ec14a7bf..70a44fbaf 100644 --- a/python/pkgs/doorbirdpy/default.nix +++ b/python/pkgs/doorbirdpy/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "doorbirdpy"; version = "3.0.12"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "klikini"; repo = "doorbirdpy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yJPORXU7hQ3TqSFZzyneQT4aAdrXqPmxnOwFQ665Vus="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/klikini/doorbirdpy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dopy/default.nix b/python/pkgs/dopy/default.nix index 05da6726e..8771d793c 100644 --- a/python/pkgs/dopy/default.nix +++ b/python/pkgs/dopy/default.nix @@ -4,12 +4,14 @@ buildPythonPackage, requests, six, + # build-system + setuptools, }: buildPythonPackage { pname = "dopy"; version = "2016-01-04"; - format = "setuptools"; + pyproject = true; src = pkgs.fetchFromGitHub { owner = "Wiredcraft"; @@ -18,13 +20,14 @@ buildPythonPackage { sha256 = "0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests six ]; # contains no tests - doCheck = false; pythonImportsCheck = [ "dopy" ]; meta = { diff --git a/python/pkgs/dotmap/default.nix b/python/pkgs/dotmap/default.nix index 6539867ed..b41b925fb 100644 --- a/python/pkgs/dotmap/default.nix +++ b/python/pkgs/dotmap/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dotmap"; version = "1.3.30"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-WCGnkz8HX7R1Y0F8DpLgt8AxFYtMmmp+VhY0ebZYs2g="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/drgrib/dotmap"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dotty-dict/default.nix b/python/pkgs/dotty-dict/default.nix index 790da817a..b89e2c225 100644 --- a/python/pkgs/dotty-dict/default.nix +++ b/python/pkgs/dotty-dict/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dotty-dict"; version = "1.3.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pawelzny"; repo = "dotty_dict"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kY7o9wgfsV7oc5twOeuhG47C0Js6JzCt02S9Sd8dSGc="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://dotty-dict.readthedocs.io"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/doublemetaphone/default.nix b/python/pkgs/doublemetaphone/default.nix index 6b0369c4f..c30728f12 100644 --- a/python/pkgs/doublemetaphone/default.nix +++ b/python/pkgs/doublemetaphone/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "doublemetaphone"; version = "1.2i"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dedupeio"; repo = "doublemetaphone"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VPJqHxQHLiLSko+aJYTIgISluHPARgQN5pYWYxP9QKQ="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/dedupeio/doublemetaphone"; license = lib.licenses.artistic1; }; -} +}) diff --git a/python/pkgs/doubleratchet/default.nix b/python/pkgs/doubleratchet/default.nix index 49582d071..40f26c5df 100644 --- a/python/pkgs/doubleratchet/default.nix +++ b/python/pkgs/doubleratchet/default.nix @@ -11,7 +11,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "doubleratchet"; version = "1.3.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Syndace"; repo = "python-doubleratchet"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iw0JIegwEiBpA/9blGKb0Oh1K3j74A3ZomtMRKgJL0E="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/Syndace/python-doubleratchet"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dowhen/default.nix b/python/pkgs/dowhen/default.nix index 14e3bfdbe..c0f8349fa 100644 --- a/python/pkgs/dowhen/default.nix +++ b/python/pkgs/dowhen/default.nix @@ -7,7 +7,7 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dowhen"; version = "0.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gaogaotiantian"; repo = "dowhen"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7eoNe9SvE39J4mwIOxvbU1oh/L7tr/QM1uuBDqWtQu0="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/gaogaotiantian/dowhen"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/downloader-cli/default.nix b/python/pkgs/downloader-cli/default.nix index 9ac07a62e..899bfbeb2 100644 --- a/python/pkgs/downloader-cli/default.nix +++ b/python/pkgs/downloader-cli/default.nix @@ -2,25 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "downloader-cli"; version = "0.3.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "deepjyoti30"; repo = "downloader-cli"; - tag = version; + tag = finalAttrs.version; hash = "sha256-E2K3n9qCQofm4gXu1l7/0iMoJsniuzhsBUplr4aZ39s="; }; - propagatedBuildInputs = [ urllib3 ]; + build-system = [ setuptools ]; + + dependencies = [ urllib3 ]; # Disable checks due to networking (Errno 101) - doCheck = false; pythonImportsCheck = [ "downloader_cli" ]; @@ -30,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/deepjyoti30/downloader-cli"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dparse/default.nix b/python/pkgs/dparse/default.nix index 6c5972ca6..b995483ad 100644 --- a/python/pkgs/dparse/default.nix +++ b/python/pkgs/dparse/default.nix @@ -7,7 +7,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dparse"; version = "0.6.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyupio"; repo = "dparse"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LnsmJtWLjV3xoSjacfR9sUwPlOjQTRBWirJVtIJSE8A="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyupio/dparse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dpath/default.nix b/python/pkgs/dpath/default.nix index 0e41fb7a7..4aa2d2847 100644 --- a/python/pkgs/dpath/default.nix +++ b/python/pkgs/dpath/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dpath"; version = "2.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NPfmMNxV6j8hnlVXJvXaS0sl8iADGcjmkCw5Qljdaj4="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/akesterson/dpath-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dpcontracts/default.nix b/python/pkgs/dpcontracts/default.nix index c6aede3f2..91227559d 100644 --- a/python/pkgs/dpcontracts/default.nix +++ b/python/pkgs/dpcontracts/default.nix @@ -11,8 +11,6 @@ buildPythonPackage { version = "0.6.0-unstable-2018-11-20"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "deadpixi"; repo = "contracts"; diff --git a/python/pkgs/dpkt/default.nix b/python/pkgs/dpkt/default.nix index ce5f0e85b..1b9e1113e 100644 --- a/python/pkgs/dpkt/default.nix +++ b/python/pkgs/dpkt/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dpkt"; version = "1.9.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Q/hobkVdpQUoNf0e2iaJ1R3jZwqsl5mxsAz9IDkn7kU="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "dpkt" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/kbandla/dpkt"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/draccus/default.nix b/python/pkgs/draccus/default.nix index a71c75681..678fe4bca 100644 --- a/python/pkgs/draccus/default.nix +++ b/python/pkgs/draccus/default.nix @@ -16,14 +16,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "draccus"; version = "0.11.6"; pyproject = true; # No (recent) tags on GitHub src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0TT1dqH0/r2TxrIA33+S5f6//p79wKXzgb9QwuBWijk="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/dlwh/draccus"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/drafthorse/default.nix b/python/pkgs/drafthorse/default.nix index 37ff1db81..d8733e02e 100644 --- a/python/pkgs/drafthorse/default.nix +++ b/python/pkgs/drafthorse/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "drafthorse"; version = "2025.2.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pretix"; repo = "python-drafthorse"; - rev = version; + tag = finalAttrs.version; hash = "sha256-z8w1n/rjrVpL+3MFoTaKCI7NZpchIg4H80rNlm0sFgQ="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/pretix/python-drafthorse"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/draftjs-exporter/default.nix b/python/pkgs/draftjs-exporter/default.nix index 7763623b8..456e8b712 100644 --- a/python/pkgs/draftjs-exporter/default.nix +++ b/python/pkgs/draftjs-exporter/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "draftjs-exporter"; version = "7.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "draftjs_exporter"; owner = "springload"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-vOSsT7YOMzBFkYre2GYSTlNUNwd70RsO7fJ6FWahNXM="; }; @@ -37,7 +37,8 @@ buildPythonPackage rec { ]; }; - checkInputs = optional-dependencies.lxml ++ optional-dependencies.html5lib; + nativeCheckInputs = + finalAttrs.optional-dependencies.lxml ++ finalAttrs.optional-dependencies.html5lib; checkPhase = '' # 2 tests in this file randomly fail because they depend on the order of @@ -54,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/springload/draftjs_exporter"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dragonmapper/default.nix b/python/pkgs/dragonmapper/default.nix index f5d792cda..5d9b47964 100644 --- a/python/pkgs/dragonmapper/default.nix +++ b/python/pkgs/dragonmapper/default.nix @@ -7,7 +7,7 @@ zhon, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dragonmapper"; version = "0.3.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tsroten"; repo = "dragonmapper"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3SRSu/9cpg2YcEuPFxBXg6KHgRSX5SiMAFbyE40m6ks="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/tsroten/dragonmapper"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/drawille/default.nix b/python/pkgs/drawille/default.nix index 7de77d4a4..565573be8 100644 --- a/python/pkgs/drawille/default.nix +++ b/python/pkgs/drawille/default.nix @@ -2,20 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "drawille"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gVND4RYsWAUtTLZS75cPZ3Ht2QBC1UnsxuRTyXNqoa0="; }; - doCheck = false; # pypi package has no tests, git has no tags + build-system = [ setuptools ]; pythonImportsCheck = [ "drawille" ]; @@ -25,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.agpl3Plus; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/drawilleplot/default.nix b/python/pkgs/drawilleplot/default.nix index ddd57c97d..b7d06b9f0 100644 --- a/python/pkgs/drawilleplot/default.nix +++ b/python/pkgs/drawilleplot/default.nix @@ -2,24 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, drawille, matplotlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "drawilleplot"; version = "0.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZEDroo7KkI2VxdESb2QDX+dPY4UahuuK9L0EddrxJjQ="; }; - doCheck = false; # does not have any tests at all + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ drawille matplotlib ]; @@ -32,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/drf-jwt/default.nix b/python/pkgs/drf-jwt/default.nix index 726499dd7..84bd3913f 100644 --- a/python/pkgs/drf-jwt/default.nix +++ b/python/pkgs/drf-jwt/default.nix @@ -2,30 +2,33 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pyjwt, djangorestframework, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "drf-jwt"; version = "1.19.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Styria-Digital"; repo = "django-rest-framework-jwt"; - rev = version; + tag = finalAttrs.version; hash = "sha256-bbkk78uYTG+JTzY3AyOmEVtVSgout/TETfr5N5fUto4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyjwt djangorestframework ] ++ pyjwt.optional-dependencies.crypto; # requires setting up a django instance - doCheck = false; pythonImportsCheck = [ "rest_framework_jwt" @@ -43,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/Styria-Digital/django-rest-framework-jwt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/drf-nested-routers/default.nix b/python/pkgs/drf-nested-routers/default.nix index e50e7b9fa..8aab76f62 100644 --- a/python/pkgs/drf-nested-routers/default.nix +++ b/python/pkgs/drf-nested-routers/default.nix @@ -9,7 +9,7 @@ ipdb, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "drf-nested-routers"; version = "0.95.3"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alanjds"; repo = "drf-nested-routers"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-09yMZW2dvXHQ8oak5skWQKCzqn9pcsgXpkQAkfR1lyA="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { description = "Provides routers and fields to create nested resources in the Django Rest Framework"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/drf-spectacular-sidecar/default.nix b/python/pkgs/drf-spectacular-sidecar/default.nix index a1c12ee40..5715e608a 100644 --- a/python/pkgs/drf-spectacular-sidecar/default.nix +++ b/python/pkgs/drf-spectacular-sidecar/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "drf-spectacular-sidecar"; version = "2026.7.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular-sidecar"; - tag = version; + tag = finalAttrs.version; hash = "sha256-RNaYPOw+XPUjGgpWcC3TKikNwv8VMX7dF0HR87HnCvQ="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ django ]; # no tests - doCheck = false; pythonImportsCheck = [ "drf_spectacular_sidecar" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/tfranzel/drf-spectacular-sidecar"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/drf-spectacular/default.nix b/python/pkgs/drf-spectacular/default.nix index 2daf39d9c..db7a37152 100644 --- a/python/pkgs/drf-spectacular/default.nix +++ b/python/pkgs/drf-spectacular/default.nix @@ -28,7 +28,7 @@ uritemplate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "drf-spectacular"; version = "0.30.0"; pyproject = true; @@ -36,7 +36,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CuN3ZmFQBLUlRteXVcWF/oE9vvLcaFAoEbkF3hHQLgQ="; }; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/tfranzel/drf-spectacular"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/drf-writable-nested/default.nix b/python/pkgs/drf-writable-nested/default.nix index c2fb8a7f2..aef262a8a 100644 --- a/python/pkgs/drf-writable-nested/default.nix +++ b/python/pkgs/drf-writable-nested/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, django, djangorestframework, }: @@ -9,7 +11,7 @@ buildPythonPackage (finalAttrs: { pname = "drf-writable-nested"; version = "0.7.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "beda-software"; @@ -18,7 +20,9 @@ buildPythonPackage (finalAttrs: { hash = "sha256-VkQ3Di3vXxQAmvuMP8KpGVVdx7LMYcQFEF4ZsuA9KeA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django djangorestframework ]; diff --git a/python/pkgs/drf-yasg/default.nix b/python/pkgs/drf-yasg/default.nix index 80902a0ec..1b0bddc15 100644 --- a/python/pkgs/drf-yasg/default.nix +++ b/python/pkgs/drf-yasg/default.nix @@ -16,13 +16,13 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "drf-yasg"; version = "1.21.15"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "drf_yasg"; hash = "sha256-74aDjE7xDc06wevyvmAcvgKXi5mWccqkNmf3yduWFGg="; }; @@ -48,7 +48,6 @@ buildPythonPackage rec { ]; env.DJANGO_SETTINGS_MODULE = "testproj.settings.local"; # a lot of libraries are missing - doCheck = false; pythonImportsCheck = [ "drf_yasg" ]; @@ -57,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/axnsan12/drf-yasg"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/drivelib/default.nix b/python/pkgs/drivelib/default.nix index 5798dee1d..1f17e47f4 100644 --- a/python/pkgs/drivelib/default.nix +++ b/python/pkgs/drivelib/default.nix @@ -12,13 +12,13 @@ versioneer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "drivelib"; version = "0.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lTyRncKBMoU+ahuekt+LQ/PhNqySf4a4qLSmyo1t468="; }; @@ -42,7 +42,6 @@ buildPythonPackage rec { ]; # Tests depend on a google auth token - doCheck = false; pythonImportsCheck = [ "drivelib" ]; @@ -51,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/Lykos153/python-drivelib"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/drms/default.nix b/python/pkgs/drms/default.nix index e80d93f28..47a705323 100644 --- a/python/pkgs/drms/default.nix +++ b/python/pkgs/drms/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { pname = "drms"; version = "0.9.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "sunpy"; diff --git a/python/pkgs/dronecan/default.nix b/python/pkgs/dronecan/default.nix index 19cd14017..ebaaee40d 100644 --- a/python/pkgs/dronecan/default.nix +++ b/python/pkgs/dronecan/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dronecan"; version = "1.0.27"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-m6xfk/2pKfzbr0fu2GUjJnRcicoZDWzhrGJ6DDs2rBw="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "dronecan" ]; @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://dronecan.github.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dropbox/default.nix b/python/pkgs/dropbox/default.nix index 5bd62da9a..332e923c1 100644 --- a/python/pkgs/dropbox/default.nix +++ b/python/pkgs/dropbox/default.nix @@ -7,13 +7,13 @@ stone, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dropbox"; version = "12.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-FQ6oaYFy5LTbVM0r3hnc6iuEi3dsIfum5RE0iRHwh3A="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { description = "Python library for Dropbox's HTTP-based Core and Datastore APIs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dropmqttapi/default.nix b/python/pkgs/dropmqttapi/default.nix index ac746b0e5..cd2f469bf 100644 --- a/python/pkgs/dropmqttapi/default.nix +++ b/python/pkgs/dropmqttapi/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dropmqttapi"; version = "1.0.3"; pyproject = true; @@ -13,14 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ChandlerSystems"; repo = "dropmqttapi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-njReF9Mu5E9o5WcbK60CCBWaIhZ3tpQHHlY/iEyyHGg="; }; build-system = [ setuptools ]; # Module has no test - doCheck = false; pythonImportsCheck = [ "dropmqttapi" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/ChandlerSystems/dropmqttapi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dsl2html/default.nix b/python/pkgs/dsl2html/default.nix index cc5c960cb..f9c0b2130 100644 --- a/python/pkgs/dsl2html/default.nix +++ b/python/pkgs/dsl2html/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dsl2html"; version = "0.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GIJgkUbnU3eRkBgkguAINgMH1YnDSs5I9gIdQWvmVc0="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/Crissium/python-dsl"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/dt8852/default.nix b/python/pkgs/dt8852/default.nix index 3eb5392ea..28121b483 100644 --- a/python/pkgs/dt8852/default.nix +++ b/python/pkgs/dt8852/default.nix @@ -6,14 +6,14 @@ pyserial, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dt8852"; version = "1.1.0"; pyproject = true; # Not using Codeberg because there's no tagged release there. src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3WiHJQnlP39CGzxu/sZ1jWcP40tyr2G62H4yYuwS0wA="; }; @@ -24,7 +24,6 @@ buildPythonPackage rec { ]; # No tests available on PyPi and Codeberg source. - doCheck = false; pythonImportsCheck = [ "dt8852" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; mainProgram = "dt8852"; }; -} +}) diff --git a/python/pkgs/dtfabric/default.nix b/python/pkgs/dtfabric/default.nix index 09cfb5a3d..d49cd3170 100644 --- a/python/pkgs/dtfabric/default.nix +++ b/python/pkgs/dtfabric/default.nix @@ -6,13 +6,13 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dtfabric"; version = "20260506"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-n/z2OD3vZrEKoYC3eRVIx6XpgKwTbTaKqp2O2cg11fs="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/libyal/dtfabric"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dtlssocket/default.nix b/python/pkgs/dtlssocket/default.nix index fe8cf5af6..2d4fcac1a 100644 --- a/python/pkgs/dtlssocket/default.nix +++ b/python/pkgs/dtlssocket/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dtlssocket"; version = "0.2.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8Gy+Mt+FYtu8y+J0qvJ9J3PoSSqGxBwzSzoKcKUAN88="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://git.fslab.de/jkonra2m/tinydtls-cython"; license = lib.licenses.epl10; }; -} +}) diff --git a/python/pkgs/dtw-python/default.nix b/python/pkgs/dtw-python/default.nix index 25cf1e73b..840f812f6 100644 --- a/python/pkgs/dtw-python/default.nix +++ b/python/pkgs/dtw-python/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dtw-python"; version = "1.7.5"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DynamicTimeWarping"; repo = "dtw-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4OP6Fop04HLHURUagLMW4D93zTv9FwAtZ6xyNFbJILA="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; mainProgram = "dtw"; }; -} +}) diff --git a/python/pkgs/duckdb/default.nix b/python/pkgs/duckdb/default.nix index 930760a2a..2d001652c 100644 --- a/python/pkgs/duckdb/default.nix +++ b/python/pkgs/duckdb/default.nix @@ -22,7 +22,7 @@ let }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "duckdb"; version = duckdbVersion; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "duckdb"; repo = "duckdb-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-B14dXW5pPnToiKbSD9ACzNksIhBG+ui1P9l67Qyke8o="; }; @@ -76,7 +76,7 @@ buildPythonPackage rec { }; cmakeFlags = [ - (lib.cmakeFeature "OVERRIDE_GIT_DESCRIBE" "v${version}-0-g${duckdbRev}") + (lib.cmakeFeature "OVERRIDE_GIT_DESCRIBE" "v${finalAttrs.version}-0-g${duckdbRev}") ]; pythonImportsCheck = [ "duckdb" ]; @@ -86,4 +86,4 @@ buildPythonPackage rec { homepage = "https://duckdb.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/duecredit/default.nix b/python/pkgs/duecredit/default.nix index 3dff786c0..371f2e5b9 100644 --- a/python/pkgs/duecredit/default.nix +++ b/python/pkgs/duecredit/default.nix @@ -9,13 +9,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "duecredit"; version = "0.11.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-e1wa4Qkn+eAs9NVOLHSoqgDNKcONY33v48lI09jp8zo="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/duecredit/duecredit"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/duet/default.nix b/python/pkgs/duet/default.nix index 15b8c1875..c86513e87 100644 --- a/python/pkgs/duet/default.nix +++ b/python/pkgs/duet/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "duet"; version = "0.2.9"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = "duet"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-P7JxUigD7ZyhtocV+YuAVxuUYVa4F7PpXuA1CCmcMvg="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/duet"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dufte/default.nix b/python/pkgs/dufte/default.nix index 4634a4c86..b82877790 100644 --- a/python/pkgs/dufte/default.nix +++ b/python/pkgs/dufte/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dufte"; version = "0.2.29"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nschloe"; repo = "dufte"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256:0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48"; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ matplotlib numpy ]; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/nschloe/dufte"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/dunamai/default.nix b/python/pkgs/dunamai/default.nix index 97deedd39..44ee874ba 100644 --- a/python/pkgs/dunamai/default.nix +++ b/python/pkgs/dunamai/default.nix @@ -10,7 +10,7 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dunamai"; version = "1.26.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mtkennerly"; repo = "dunamai"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pP0KeQ1tThvBomQIlrWNCVzB8ghR9rfaLm5NeBKwiuE="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/mtkennerly/dunamai"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dungeon-eos/default.nix b/python/pkgs/dungeon-eos/default.nix index 7c26d83c8..ed41f2244 100644 --- a/python/pkgs/dungeon-eos/default.nix +++ b/python/pkgs/dungeon-eos/default.nix @@ -2,21 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dungeon-eos"; version = "0.0.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = "dungeon-eos"; - rev = version; + tag = finalAttrs.version; hash = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY="; }; - doCheck = false; # there are no tests + build-system = [ setuptools ]; + pythonImportsCheck = [ "dungeon_eos" ]; meta = { @@ -24,4 +27,4 @@ buildPythonPackage rec { description = "Package that simulates PMD EoS dungeon generation"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/duo-client/default.nix b/python/pkgs/duo-client/default.nix index 970588ac5..3bf3eec77 100644 --- a/python/pkgs/duo-client/default.nix +++ b/python/pkgs/duo-client/default.nix @@ -10,7 +10,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "duo-client"; version = "5.7.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "duosecurity"; repo = "duo_client_python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TJ2ofRmAN6H3uvDSwpxSpll1IEwba8bYsx5nzaVlAlU="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/duosecurity/duo_client_python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/duration-parser/default.nix b/python/pkgs/duration-parser/default.nix index 05d8cc5c2..6735b9485 100644 --- a/python/pkgs/duration-parser/default.nix +++ b/python/pkgs/duration-parser/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "duration-parser"; version = "1.0.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adriansahlman"; repo = "duration-parser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Vn3H2JEMrJ6b/7eNG+h9tG5QzslGvaV3sunM7UO9Bok="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/adriansahlman/duration-parser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/durationpy/default.nix b/python/pkgs/durationpy/default.nix index b595d9f14..743a5aafa 100644 --- a/python/pkgs/durationpy/default.nix +++ b/python/pkgs/durationpy/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "durationpy"; version = "0.10"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "icholy"; repo = "durationpy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tJ3zOCROkwFWzTgIKx+0H7J1rNkwy5XJPh8Zec7jJ5g="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/icholy/durationpy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/durus/default.nix b/python/pkgs/durus/default.nix index 0888c21e9..45b72bd46 100644 --- a/python/pkgs/durus/default.nix +++ b/python/pkgs/durus/default.nix @@ -5,20 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "durus"; version = "4.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aQM0I26juo2WbjrszgJUd5CdayQNCzID0zJ/YkNyYAc="; }; build-system = [ setuptools ]; # Checks disabled due to missing python unittest framework 'sancho' in nixpkgs - doCheck = false; pythonImportsCheck = [ "durus.connection" @@ -33,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/nascheme/durus"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dvc-azure/default.nix b/python/pkgs/dvc-azure/default.nix index adc734079..bd8a042c9 100644 --- a/python/pkgs/dvc-azure/default.nix +++ b/python/pkgs/dvc-azure/default.nix @@ -36,7 +36,6 @@ buildPythonPackage (finalAttrs: { ]; # Network access is needed for tests - doCheck = false; # Circular dependency # pythonImportsCheck = [ diff --git a/python/pkgs/dvc-data/default.nix b/python/pkgs/dvc-data/default.nix index 0d36b4f1c..65e11a700 100644 --- a/python/pkgs/dvc-data/default.nix +++ b/python/pkgs/dvc-data/default.nix @@ -44,7 +44,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests depend on upath which is unmaintained and only available as wheel - doCheck = false; pythonImportsCheck = [ "dvc_data" ]; diff --git a/python/pkgs/dvc-gs/default.nix b/python/pkgs/dvc-gs/default.nix index 585ef1e94..9d225c407 100644 --- a/python/pkgs/dvc-gs/default.nix +++ b/python/pkgs/dvc-gs/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { ]; # Network access is needed for tests - doCheck = false; # Circular dependency # pythonImportsCheck = [ diff --git a/python/pkgs/dvc-http/default.nix b/python/pkgs/dvc-http/default.nix index 458996ffd..5fa390cd0 100644 --- a/python/pkgs/dvc-http/default.nix +++ b/python/pkgs/dvc-http/default.nix @@ -36,7 +36,6 @@ buildPythonPackage (finalAttrs: { # Currently it's not possible to run the tests # ModuleNotFoundError: No module named 'dvc.testing' - doCheck = false; pythonImportsCheck = [ "dvc_http" ]; diff --git a/python/pkgs/dvc-objects/default.nix b/python/pkgs/dvc-objects/default.nix index 446d88718..89bb3f3ee 100644 --- a/python/pkgs/dvc-objects/default.nix +++ b/python/pkgs/dvc-objects/default.nix @@ -10,7 +10,7 @@ shortuuid, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-objects"; version = "5.2.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = "dvc-objects"; - tag = version; + tag = finalAttrs.version; hash = "sha256-COrHD7RtmShdC7YWFc+S3xi/Xxt+Afrj3vaCLfE8t28="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/iterative/dvc-objects"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dvc-s3/default.nix b/python/pkgs/dvc-s3/default.nix index e0915280e..ca48b0bb6 100644 --- a/python/pkgs/dvc-s3/default.nix +++ b/python/pkgs/dvc-s3/default.nix @@ -39,7 +39,6 @@ buildPythonPackage (finalAttrs: { ]; # Network access is needed for tests - doCheck = false; # Circular dependency # pythonImportsCheck = [ diff --git a/python/pkgs/dvc-ssh/default.nix b/python/pkgs/dvc-ssh/default.nix index a2e4ee3d9..b6effa0be 100644 --- a/python/pkgs/dvc-ssh/default.nix +++ b/python/pkgs/dvc-ssh/default.nix @@ -46,7 +46,6 @@ buildPythonPackage (finalAttrs: { ''; # Network access is needed for tests - doCheck = false; # Circular dependency # pythonImportsCheck = [ diff --git a/python/pkgs/dvc-studio-client/default.nix b/python/pkgs/dvc-studio-client/default.nix index b13676640..7871fbc12 100644 --- a/python/pkgs/dvc-studio-client/default.nix +++ b/python/pkgs/dvc-studio-client/default.nix @@ -9,7 +9,7 @@ voluptuous, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-studio-client"; version = "0.23.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = "dvc-studio-client"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Zc6DQ/memnEwxHkSMPi1/fLBgvinqaMpWSOBfAI4sUk="; }; @@ -33,11 +33,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "dvc_studio_client" ]; # Tests try to access network - doCheck = false; meta = { description = "Library to post data from DVC/DVCLive to Iterative Studio"; homepage = "https://github.com/iterative/dvc-studio-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/dwdwfsapi/default.nix b/python/pkgs/dwdwfsapi/default.nix index fae429761..d26bdb5f1 100644 --- a/python/pkgs/dwdwfsapi/default.nix +++ b/python/pkgs/dwdwfsapi/default.nix @@ -7,13 +7,13 @@ ciso8601, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dwdwfsapi"; version = "1.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7dIVD+4MiYtsjAM5j67MlbiUN2Q5DpK6bUU0ZuHN2rk="; }; @@ -25,7 +25,6 @@ buildPythonPackage rec { ]; # All tests require network access - doCheck = false; pythonImportsCheck = [ "dwdwfsapi" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/stephan192/dwdwfsapi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dyn/default.nix b/python/pkgs/dyn/default.nix index 186480260..18eca4252 100644 --- a/python/pkgs/dyn/default.nix +++ b/python/pkgs/dyn/default.nix @@ -5,20 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dyn"; version = "1.8.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-933etYrKRgSqJfOMIuIDL4Uv4/RdSEFMNWFtW5qiPpA="; }; build-system = [ setuptools ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "dyn" ]; @@ -27,4 +26,4 @@ buildPythonPackage rec { homepage = "https://dyn.readthedocs.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/dynaconf/default.nix b/python/pkgs/dynaconf/default.nix index cfbb25858..29e273a99 100644 --- a/python/pkgs/dynaconf/default.nix +++ b/python/pkgs/dynaconf/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dynaconf"; version = "3.3.5"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dynaconf"; repo = "dynaconf"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rIATIZLcvb8UtUFGjOSdNd0Wlb4CceDp9B1OdlnIlYc="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { mainProgram = "dynaconf"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dynalite-devices/default.nix b/python/pkgs/dynalite-devices/default.nix index 8bf22468c..052274515 100644 --- a/python/pkgs/dynalite-devices/default.nix +++ b/python/pkgs/dynalite-devices/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dynalite-devices"; version = "0.47"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ziv1234"; repo = "python-dynalite-devices"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kJo4e5vhgWzijLUhQd9VBVk1URpg9SXhOA60dJYashM="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/ziv1234/python-dynalite-devices"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/dynalite-panel/default.nix b/python/pkgs/dynalite-panel/default.nix index aa293f18b..c22fb4da1 100644 --- a/python/pkgs/dynalite-panel/default.nix +++ b/python/pkgs/dynalite-panel/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dynalite-panel"; version = "0.0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-m7nQzbxRe2qXUWAMeQlDZtc9F01DsbTzF/kI0ci3TFE="; }; @@ -25,11 +25,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "dynalite_panel" ]; # upstream has no tests - doCheck = false; meta = { description = "Dynalite panel for Home Assistant"; homepage = "https://github.com/ziv1234/dynalitepanel"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/e2b-code-interpreter/default.nix b/python/pkgs/e2b-code-interpreter/default.nix index 663644ad8..98c9c32a1 100644 --- a/python/pkgs/e2b-code-interpreter/default.nix +++ b/python/pkgs/e2b-code-interpreter/default.nix @@ -12,7 +12,7 @@ httpx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "e2b-code-interpreter"; inherit (e2b) version; pyproject = true; @@ -20,11 +20,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "e2b-dev"; repo = "code-interpreter"; - tag = "@e2b/code-interpreter-python@${version}"; + tag = "@e2b/code-interpreter-python@${finalAttrs.version}"; hash = "sha256-a2rc7BtV+qwtqlB+JtLCs0BKN15yfwmG3XWWO8we2LA="; }; - sourceRoot = "${src.name}/python"; + sourceRoot = "${finalAttrs.src.name}/python"; build-system = [ poetry-core @@ -40,11 +40,10 @@ buildPythonPackage rec { # Tests require an API key # e2b.exceptions.AuthenticationException: API key is required, please visit the Team tab at https://e2b.dev/dashboard to get your API key. - doCheck = false; meta = { description = "E2B Code Interpreter - Stateful code execution"; homepage = "https://github.com/e2b-dev/code-interpreter/tree/main/python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/e2b/default.nix b/python/pkgs/e2b/default.nix index e93c3deda..b43156435 100644 --- a/python/pkgs/e2b/default.nix +++ b/python/pkgs/e2b/default.nix @@ -16,7 +16,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "e2b"; version = "1.5.1"; pyproject = true; @@ -24,11 +24,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "e2b-dev"; repo = "E2B"; - tag = "@e2b/python-sdk@${version}"; + tag = "@e2b/python-sdk@${finalAttrs.version}"; hash = "sha256-6THRc4rv/mzOWbsN1FpUu56kjvHvVBssK2glNoGdSzI="; }; - sourceRoot = "${src.name}/packages/python-sdk"; + sourceRoot = "${finalAttrs.src.name}/packages/python-sdk"; build-system = [ poetry-core @@ -52,11 +52,10 @@ buildPythonPackage rec { # Tests require an API key # e2b.exceptions.AuthenticationException: API key is required, please visit the Team tab at https://e2b.dev/dashboard to get your API key. - doCheck = false; meta = { description = "E2B SDK that give agents cloud environments"; homepage = "https://github.com/e2b-dev/E2B/blob/main/packages/python-sdk"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/e3-core/default.nix b/python/pkgs/e3-core/default.nix index 3e91ce629..d9498ab71 100644 --- a/python/pkgs/e3-core/default.nix +++ b/python/pkgs/e3-core/default.nix @@ -19,7 +19,7 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "e3-core"; version = "22.10.0"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AdaCore"; repo = "e3-core"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LHWtgIvbS1PaF85aOpdhR0rWQGRUtbY0Qg1SZxQOsSc="; }; @@ -67,4 +67,4 @@ buildPythonPackage rec { # upstream, but not by this package. platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/e3-testsuite/default.nix b/python/pkgs/e3-testsuite/default.nix index 378a7f350..11949fe87 100644 --- a/python/pkgs/e3-testsuite/default.nix +++ b/python/pkgs/e3-testsuite/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "e3-testsuite"; version = "27.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AdaCore"; repo = "e3-testsuite"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qG8SHwogBle3demgFJCqcfCh5ktLvOqh2XSwxPCANFk="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/eagle100/default.nix b/python/pkgs/eagle100/default.nix index 6311b6465..f8fbb8176 100644 --- a/python/pkgs/eagle100/default.nix +++ b/python/pkgs/eagle100/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eagle100"; version = "0.1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eyYY1x8IjIfUx5OiaOomiWunsO1++seFwXlI/iKDDLw="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "eagle100" ]; @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/hastarin/eagle100"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/easy-thumbnails/default.nix b/python/pkgs/easy-thumbnails/default.nix index 0957dc597..5439278f0 100644 --- a/python/pkgs/easy-thumbnails/default.nix +++ b/python/pkgs/easy-thumbnails/default.nix @@ -12,7 +12,7 @@ testfixtures, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "easy-thumbnails"; version = "2.10.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SmileyChris"; repo = "easy-thumbnails"; - tag = version; + tag = finalAttrs.version; hash = "sha256-GPZ99OaQRSogS8gJXz8rVUjUeNkEk019TYx0VWa0Q6I="; }; @@ -39,10 +39,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-django + testfixtures ] - ++ lib.concatAttrValues optional-dependencies; - - checkInputs = [ testfixtures ]; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; disabledTests = [ # AssertionError: 'ERROR' != 'INFO' @@ -60,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/SmileyChris/easy-thumbnails"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/easyprocess/default.nix b/python/pkgs/easyprocess/default.nix index 63efc765c..7bb1fd236 100644 --- a/python/pkgs/easyprocess/default.nix +++ b/python/pkgs/easyprocess/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "EasyProcess"; version = "1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iFiYMCpXqrlIlz6LXTKkIpOSufstmGqx1P/VkOW6kOw="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ponty/EasyProcess"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/easywatch/default.nix b/python/pkgs/easywatch/default.nix index ccfe94e4d..c58357811 100644 --- a/python/pkgs/easywatch/default.nix +++ b/python/pkgs/easywatch/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.5"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; sha256 = "1b40cjigv7s9qj8hxxy6yhwv0320z7qywrigwgkasgh80q0xgphc"; @@ -23,7 +21,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ watchdog ]; # There are no tests - doCheck = false; pythonImportsCheck = [ "easywatch" ]; meta = { diff --git a/python/pkgs/ebaysdk/default.nix b/python/pkgs/ebaysdk/default.nix index 23eee07be..d09f792c1 100644 --- a/python/pkgs/ebaysdk/default.nix +++ b/python/pkgs/ebaysdk/default.nix @@ -2,31 +2,34 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, lxml, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ebaysdk"; version = "2.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Lrh11wa0gfWcqN0wdFON9+UZaBT5zhLQ74RpA0Opx/M="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ lxml requests ]; # requires network - doCheck = false; meta = { description = "eBay SDK for Python"; homepage = "https://github.com/timotheus/ebaysdk-python"; license = lib.licenses.cddl; }; -} +}) diff --git a/python/pkgs/ebooklib/default.nix b/python/pkgs/ebooklib/default.nix index 87617db08..e27759dd2 100644 --- a/python/pkgs/ebooklib/default.nix +++ b/python/pkgs/ebooklib/default.nix @@ -11,13 +11,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ebooklib"; version = "0.20"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NeL519OZB76NOa4t6yYbGYSJRZA649u2V3sYfq1p6YU="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/aerkalov/ebooklib"; license = lib.licenses.agpl3Only; }; -} +}) diff --git a/python/pkgs/ebusdpy/default.nix b/python/pkgs/ebusdpy/default.nix index c43a150da..ed8a636d4 100644 --- a/python/pkgs/ebusdpy/default.nix +++ b/python/pkgs/ebusdpy/default.nix @@ -5,20 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ebusdpy"; version = "0.0.17"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-t6O/fOBrJuDYpCVnkL+hUzyqMoGKFj5UYNoD6ExikNM="; }; build-system = [ setuptools ]; # Package has no tests - doCheck = false; pythonImportsCheck = [ "ebusdpy" ]; @@ -27,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/CrazYoshi/ebusdpy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ec2instanceconnectcli/default.nix b/python/pkgs/ec2instanceconnectcli/default.nix index 183a423ab..a7ba45a09 100644 --- a/python/pkgs/ec2instanceconnectcli/default.nix +++ b/python/pkgs/ec2instanceconnectcli/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, boto3, cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ec2instanceconnectcli"; version = "1.0.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/U59a6od0JI27VHX+Bvue/7tQy+iwU+g8yt9/GgdoH4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ boto3 cryptography ]; # has no tests - doCheck = false; pythonImportsCheck = [ "ec2instanceconnectcli" ]; @@ -31,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/aws/aws-ec2-instance-connect-cli"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ecoaliface/default.nix b/python/pkgs/ecoaliface/default.nix index caaf1a839..3c15188cc 100644 --- a/python/pkgs/ecoaliface/default.nix +++ b/python/pkgs/ecoaliface/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ecoaliface"; version = "0.7.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-Z1O+Lkq1sIpjkz0N4g4FCUzTw51V4fYxlUVg+2sZ/ac="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "ecoaliface" ]; @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/matkor/ecoaliface"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/ecoji/default.nix b/python/pkgs/ecoji/default.nix index f3ed8bc71..bd9975653 100644 --- a/python/pkgs/ecoji/default.nix +++ b/python/pkgs/ecoji/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ecoji"; version = "0.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lmWyVF1z6gtODJiXzGV134rn3DlGqCrJ1i2y8UcTmpw="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/ecoji/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ecos/default.nix b/python/pkgs/ecos/default.nix index a0121207e..f9380c194 100644 --- a/python/pkgs/ecos/default.nix +++ b/python/pkgs/ecos/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ecos"; version = "2.0.14"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "embotech"; repo = "ecos-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nfu1FicWr233r+VHxkQf1vqh2y4DGymJRmik8RJYJkA="; fetchSubmodules = true; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/embotech/ecos-python"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/ecpy/default.nix b/python/pkgs/ecpy/default.nix index cf9de5bf3..cb42bd874 100644 --- a/python/pkgs/ecpy/default.nix +++ b/python/pkgs/ecpy/default.nix @@ -19,7 +19,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # No tests implemented - doCheck = false; pythonImportsCheck = [ "ecpy" ]; diff --git a/python/pkgs/ecs-logging/default.nix b/python/pkgs/ecs-logging/default.nix index 1a6744b7b..d620027a0 100644 --- a/python/pkgs/ecs-logging/default.nix +++ b/python/pkgs/ecs-logging/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ecs-logging"; version = "2.3.0"; pyproject = true; @@ -13,14 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "elastic"; repo = "ecs-logging-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YI3s+KkDPd6PVQlwpau+kgEccquo7FtfNSK278Z8B9M="; }; nativeBuildInputs = [ flit-core ]; # Circular dependency elastic-apm - doCheck = false; pythonImportsCheck = [ "ecs_logging" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/elastic/ecs-logging-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ed25519-blake2b/default.nix b/python/pkgs/ed25519-blake2b/default.nix index 610fdf8fb..f8c4f21c1 100644 --- a/python/pkgs/ed25519-blake2b/default.nix +++ b/python/pkgs/ed25519-blake2b/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ed25519-blake2b"; version = "1.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cx6fk80awaZGSVdfNRmpn/4LseTPe/X18L5ROjnfc2M="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/Matoking/python-ed25519-blake2b"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ed25519/default.nix b/python/pkgs/ed25519/default.nix index f225ba6ea..d3dc6eb1f 100644 --- a/python/pkgs/ed25519/default.nix +++ b/python/pkgs/ed25519/default.nix @@ -6,7 +6,7 @@ versioneer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ed25519"; version = "1.5"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "warner"; repo = "python-ed25519"; - tag = version; + tag = finalAttrs.version; hash = "sha256-AwnhB5UGycQliNndbqd0JlI4vKSehCSy0qHv2EiB+jA="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/warner/python-ed25519"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/edalize/default.nix b/python/pkgs/edalize/default.nix index 5ce33bbcc..22465b56b 100644 --- a/python/pkgs/edalize/default.nix +++ b/python/pkgs/edalize/default.nix @@ -10,7 +10,7 @@ pyparsing, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "edalize"; version = "0.6.7"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "olofk"; repo = "edalize"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-o+cwcW1A+EfIGNu3/Ufnr7D2we4U6i0SLg21CTBYaZ4="; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ jinja2 ]; + dependencies = [ jinja2 ]; optional-dependencies = { reporting = [ @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/olofk/edalize"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/edge-tts/default.nix b/python/pkgs/edge-tts/default.nix index b7d4d4fe2..7fd205dad 100644 --- a/python/pkgs/edge-tts/default.nix +++ b/python/pkgs/edge-tts/default.nix @@ -11,7 +11,7 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "edge-tts"; version = "7.2.8"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rany2"; repo = "edge-tts"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Zjng/7ALTjmDS4ubSFWoBJQ8TNsc2Ijl9V3jSyKifMc="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { ]; mainProgram = "edge-tts"; }; -} +}) diff --git a/python/pkgs/editables/default.nix b/python/pkgs/editables/default.nix index 2a22724a2..f7b408449 100644 --- a/python/pkgs/editables/default.nix +++ b/python/pkgs/editables/default.nix @@ -5,19 +5,18 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "editables"; version = "0.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-EWODSQI4HEYTeHlRxZFIAP3xVa4IhIo3O46lAGeAl3w="; }; build-system = [ flit-core ]; # Tests not included in archive. - doCheck = false; pythonImportsCheck = [ "editables" ]; @@ -26,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/pfmoore/editables"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/editdistance/default.nix b/python/pkgs/editdistance/default.nix index 56e0a1a07..76818ed47 100644 --- a/python/pkgs/editdistance/default.nix +++ b/python/pkgs/editdistance/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "editdistance"; version = "0.8.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0c34Cl1QFLDJEmpppCzlWkV7RX9phv9pypjk/k0tj+0="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/roy-ht/editdistance"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/editor/default.nix b/python/pkgs/editor/default.nix index 2e9b888ea..e40696bad 100644 --- a/python/pkgs/editor/default.nix +++ b/python/pkgs/editor/default.nix @@ -7,13 +7,13 @@ xmod, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "editor"; version = "1.8.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-sH4bvLizPwXC5u08537pdWNUrahAoYqtfAU22Wf+TAs="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/rec/editor"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/editorconfig/default.nix b/python/pkgs/editorconfig/default.nix index 8e8baa46e..64ed1f825 100644 --- a/python/pkgs/editorconfig/default.nix +++ b/python/pkgs/editorconfig/default.nix @@ -6,7 +6,7 @@ cmake, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "editorconfig"; version = "0.17.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-core-py"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3wEW2FMBKBS9mekYgmYG3Ohd3plCtYDFejwG3W6B9IA="; fetchSubmodules = true; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/editorconfig/editorconfig-core-py"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/effect/default.nix b/python/pkgs/effect/default.nix index 47fd36a42..2effd7839 100644 --- a/python/pkgs/effect/default.nix +++ b/python/pkgs/effect/default.nix @@ -3,34 +3,39 @@ attrs, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytestCheckHook, six, testtools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "effect"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ev+2A3B8ZIsHsReB67eTpLmu6KzxrFdkw+0hEq3wyeo="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace effect/test_do.py \ --replace "py.test" "pytest" ''; - propagatedBuildInputs = [ + dependencies = [ attrs six ]; - nativeCheckInputs = [ pytestCheckHook ]; - - checkInputs = [ testtools ]; + nativeCheckInputs = [ + pytestCheckHook + testtools + ]; pythonImportsCheck = [ "effect" ]; @@ -39,4 +44,4 @@ buildPythonPackage rec { homepage = "https://effect.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/einops/default.nix b/python/pkgs/einops/default.nix index a23c273df..858332e67 100644 --- a/python/pkgs/einops/default.nix +++ b/python/pkgs/einops/default.nix @@ -14,7 +14,6 @@ buildPythonPackage (finalAttrs: { pname = "einops"; version = "0.8.2"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "arogozhnikov"; diff --git a/python/pkgs/einx/default.nix b/python/pkgs/einx/default.nix index 5297cadee..9c5deb780 100644 --- a/python/pkgs/einx/default.nix +++ b/python/pkgs/einx/default.nix @@ -9,7 +9,7 @@ frozendict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "einx"; version = "0.4.3"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fferflo"; repo = "einx"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xYnlIN+O2s0tTBpqiGiiA6p6QpF5olPFbYaiLPT8B1s="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/fferflo/einx"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ekey-bionyxpy/default.nix b/python/pkgs/ekey-bionyxpy/default.nix index 3af6ba948..87e17ec34 100644 --- a/python/pkgs/ekey-bionyxpy/default.nix +++ b/python/pkgs/ekey-bionyxpy/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ekey-bionyxpy"; version = "1.0.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "richardpolzer"; repo = "ekey-bionyx-api"; - tag = version; + tag = finalAttrs.version; hash = "sha256-V4xYv+mjU4QO/+hOq3TH8b/X9PVP95i6apYkcqVDIWY="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/richardpolzer/ekey-bionyx-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/elastic-apm/default.nix b/python/pkgs/elastic-apm/default.nix index eb54f1adb..4c801783a 100644 --- a/python/pkgs/elastic-apm/default.nix +++ b/python/pkgs/elastic-apm/default.nix @@ -30,7 +30,7 @@ wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "elastic-apm"; version = "6.25.0"; pyproject = true; @@ -38,7 +38,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "elastic"; repo = "apm-agent-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0RNZqQqXVI7CkzcKE0qA+iOBkjkH0s7Tre/a38LPW7c="; }; @@ -97,4 +97,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "elasticapm-run"; }; -} +}) diff --git a/python/pkgs/elastic-transport/default.nix b/python/pkgs/elastic-transport/default.nix index 12800d96f..ee65d7b2b 100644 --- a/python/pkgs/elastic-transport/default.nix +++ b/python/pkgs/elastic-transport/default.nix @@ -8,7 +8,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "elastic-transport"; version = "9.4.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "elastic"; repo = "elastic-transport-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LoaZRmHgYE6wndBuTwDqXDh/eqqWGCticY2xX9sIKVw="; }; @@ -28,8 +28,6 @@ buildPythonPackage rec { urllib3 ]; - doCheck = false; - pythonImportsCheck = [ "elastic_transport" ]; meta = { @@ -37,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/elastic/elastic-transport-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/elasticsearch-dsl/default.nix b/python/pkgs/elasticsearch-dsl/default.nix index 768ae9c11..83a349ea9 100644 --- a/python/pkgs/elasticsearch-dsl/default.nix +++ b/python/pkgs/elasticsearch-dsl/default.nix @@ -8,14 +8,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "elasticsearch-dsl"; version = "8.18.0"; pyproject = true; src = fetchPypi { pname = "elasticsearch_dsl"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-djRl26nq4Wat0QVn6STGVzCqEigZsIv+mgd+kbE7MNE="; }; @@ -33,7 +33,6 @@ buildPythonPackage rec { # ImportError: No module named test_elasticsearch_dsl # Tests require a local instance of elasticsearch - doCheck = false; meta = { description = "High level Python client for Elasticsearch"; @@ -45,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/elasticsearch/elasticsearch-dsl-py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/elasticsearch/default.nix b/python/pkgs/elasticsearch/default.nix index 2b9002b52..badfc8b18 100644 --- a/python/pkgs/elasticsearch/default.nix +++ b/python/pkgs/elasticsearch/default.nix @@ -13,13 +13,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "elasticsearch"; version = "9.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-w3V2ugTQQgCgUBLbmbyZAkAArhW5691oOWaqig5s0cQ="; }; @@ -41,11 +41,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "elasticsearch" ]; - doCheck = false; - meta = { description = "Official low-level client for Elasticsearch"; homepage = "https://github.com/elasticsearch/elasticsearch-py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/elasticsearch8/default.nix b/python/pkgs/elasticsearch8/default.nix index a52671a06..9e957edc7 100644 --- a/python/pkgs/elasticsearch8/default.nix +++ b/python/pkgs/elasticsearch8/default.nix @@ -11,13 +11,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "elasticsearch8"; version = "8.19.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fv/pWzYCQbbVbvaCGQN6kK0PVnI2FNtUu+V9MwWEAvQ="; }; @@ -37,7 +37,6 @@ buildPythonPackage rec { # Check is disabled because running them destroy the content of the local cluster! # https://github.com/elasticsearch/elasticsearch-py/tree/main/test_elasticsearch - doCheck = false; pythonImportsCheck = [ "elasticsearch8" ]; @@ -46,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/elasticsearch/elasticsearch-py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/electrickiwi-api/default.nix b/python/pkgs/electrickiwi-api/default.nix index b2f8c2ece..6d9a16b6d 100644 --- a/python/pkgs/electrickiwi-api/default.nix +++ b/python/pkgs/electrickiwi-api/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "electrickiwi-api"; version = "0.10.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mikey0000"; repo = "EK-API"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3wT33oEbvfEdsNXqzFLPsn+ZfA/Qr3EwgZPfuZfm7XY="; }; @@ -31,11 +31,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "electrickiwi_api" ]; # Tests require authentication credentials - doCheck = false; meta = { description = "Python library for interfacing with the Electric Kiwi power company API"; homepage = "https://github.com/mikey0000/EK-API"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/electrum-aionostr/default.nix b/python/pkgs/electrum-aionostr/default.nix index fb5edd842..67810504c 100644 --- a/python/pkgs/electrum-aionostr/default.nix +++ b/python/pkgs/electrum-aionostr/default.nix @@ -10,7 +10,7 @@ electrum-ecc, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "electrum-aionostr"; version = "0.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "electrum_aionostr"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-N3T46DEjiCcuEIUahpyfTT1KVNjVZIUcNuLcQCl77IQ="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/spesmilo/electrum-aionostr"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/electrum-ecc/default.nix b/python/pkgs/electrum-ecc/default.nix index 7f0e2c214..620e15ca4 100644 --- a/python/pkgs/electrum-ecc/default.nix +++ b/python/pkgs/electrum-ecc/default.nix @@ -17,7 +17,7 @@ let else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "electrum-ecc"; version = "0.0.7"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "electrum_ecc"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-7UE04dv/D9gwInZMasyXoCzeNRKSfXxB9NSLmgbpH7I="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/spesmilo/electrum-ecc"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/elementpath/default.nix b/python/pkgs/elementpath/default.nix index 074f2d094..fa41c484e 100644 --- a/python/pkgs/elementpath/default.nix +++ b/python/pkgs/elementpath/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "elementpath"; version = "5.1.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PJEqnEExGsUkTAOIZ2cNfAsP7A5ESBNgjluEbbs0KKw="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "XPath 1.0/2.0/3.0/3.1 parsers and selectors for ElementTree and lxml"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/elevate/default.nix b/python/pkgs/elevate/default.nix index 3aeb4b209..ed6cec797 100644 --- a/python/pkgs/elevate/default.nix +++ b/python/pkgs/elevate/default.nix @@ -3,19 +3,23 @@ fetchPypi, buildPythonPackage, fetchpatch, + # build-system + setuptools, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "elevate"; version = "0.1.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "53ad19fa1de301fb1de3f8768fb3a5894215716fd96a475690c4d0ff3b1de209"; }; + build-system = [ setuptools ]; + patches = [ (fetchpatch { # This is for not calling shell wrappers through Python, which fails. @@ -27,7 +31,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; # No tests included - doCheck = false; pythonImportsCheck = [ "elevate" ]; @@ -36,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/barneygale/elevate"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/elevenlabs/default.nix b/python/pkgs/elevenlabs/default.nix index d0741a34a..4d876246e 100644 --- a/python/pkgs/elevenlabs/default.nix +++ b/python/pkgs/elevenlabs/default.nix @@ -42,7 +42,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "elevenlabs" ]; # tests access the API on the internet - doCheck = false; meta = { description = "Official Python API for ElevenLabs Text to Speech"; diff --git a/python/pkgs/eliot/default.nix b/python/pkgs/eliot/default.nix index bc0f04548..e7d76e31d 100644 --- a/python/pkgs/eliot/default.nix +++ b/python/pkgs/eliot/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "eliot"; version = "1.18.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "itamarst"; diff --git a/python/pkgs/elkoep-aio-mqtt/default.nix b/python/pkgs/elkoep-aio-mqtt/default.nix index aab1871c6..8b79f97e5 100644 --- a/python/pkgs/elkoep-aio-mqtt/default.nix +++ b/python/pkgs/elkoep-aio-mqtt/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "elkoep-aio-mqtt"; version = "0.1.0.beta.4"; pyproject = true; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/epdevlab/elkoep-aio-mqtt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/elmax-api/default.nix b/python/pkgs/elmax-api/default.nix index 579100071..8f954df21 100644 --- a/python/pkgs/elmax-api/default.nix +++ b/python/pkgs/elmax-api/default.nix @@ -9,7 +9,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "elmax-api"; version = "0.0.6.4rc0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "albertogeniola"; repo = "elmax-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BYVfP8B+p4J4gW+64xh9bT9sDcu/lk0R+MvLsYLwRfQ="; }; @@ -31,7 +31,6 @@ buildPythonPackage rec { ]; # Test require network access - doCheck = false; pythonImportsCheck = [ "elmax_api" ]; @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/albertogeniola/elmax-api"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/elmax/default.nix b/python/pkgs/elmax/default.nix index bdd011023..0a1b3614e 100644 --- a/python/pkgs/elmax/default.nix +++ b/python/pkgs/elmax/default.nix @@ -10,7 +10,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "elmax"; version = "0.1.5"; pyproject = true; @@ -18,13 +18,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-elmax"; - rev = version; + tag = finalAttrs.version; hash = "sha256-EcYEpYv+EwwEfW8Sy7aQjFAPpmsA6qVbmlwrPdxdnEw="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ httpx yarl ]; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-ecosystem/python-elmax"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/elvia/default.nix b/python/pkgs/elvia/default.nix index 95503ed3b..79e2b64ed 100644 --- a/python/pkgs/elvia/default.nix +++ b/python/pkgs/elvia/default.nix @@ -9,7 +9,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "elvia"; version = "0.1.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "andersem"; repo = "elvia-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oGXs+EwEIykkq8KjK7qNnZfLj4ZoKlgkldUiJlAI1gA="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/andersem/elvia-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/email-validator/default.nix b/python/pkgs/email-validator/default.nix index fab73c0a3..9aeb4ef0c 100644 --- a/python/pkgs/email-validator/default.nix +++ b/python/pkgs/email-validator/default.nix @@ -3,20 +3,24 @@ buildPythonPackage, dnspython, fetchPypi, + # build-system + setuptools, idna, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "email-validator"; version = "2.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "email_validator"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-n8BcN/L2z0Of9BT4/EbZF5KZdKgiRMIOsQIxumDFRCY="; }; + build-system = [ setuptools ]; + dependencies = [ dnspython idna @@ -30,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/JoshData/python-email-validator"; license = lib.licenses.cc0; }; -} +}) diff --git a/python/pkgs/embedding-reader/default.nix b/python/pkgs/embedding-reader/default.nix index 9b819072c..6880d6f4c 100644 --- a/python/pkgs/embedding-reader/default.nix +++ b/python/pkgs/embedding-reader/default.nix @@ -1,6 +1,8 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, fsspec, lib, numpy, @@ -10,18 +12,20 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "embedding-reader"; version = "1.8.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "rom1504"; repo = "embedding-reader"; - tag = version; + tag = finalAttrs.version; hash = "sha256-D7yrvV6hDqzHaIMhCQ16DhY/8FEr3P4gcT5vV371whs="; }; + build-system = [ setuptools ]; + pythonRelaxDeps = [ "pyarrow" ]; dependencies = [ @@ -41,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/rom1504/embedding-reader"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/emcee/default.nix b/python/pkgs/emcee/default.nix index 346bc7a11..f9a1179b4 100644 --- a/python/pkgs/emcee/default.nix +++ b/python/pkgs/emcee/default.nix @@ -2,26 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, numpy, pytestCheckHook, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "emcee"; version = "3.1.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "dfm"; repo = "emcee"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JVZK3kvDwWENho0OxZ9OxATcm3XpGmX+e7alPclRsHY="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -32,4 +36,4 @@ buildPythonPackage rec { homepage = "https://emcee.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/emoji-country-flag/default.nix b/python/pkgs/emoji-country-flag/default.nix index bb34cf74d..1fdb3aeba 100644 --- a/python/pkgs/emoji-country-flag/default.nix +++ b/python/pkgs/emoji-country-flag/default.nix @@ -7,7 +7,7 @@ emoji, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "emoji-country-flag"; version = "2.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cvzi"; repo = "flag"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Te3RJ+rHkr3q93C7hLE5xCZz91QC2IsFR0FluVEJOv4="; }; @@ -23,8 +23,6 @@ buildPythonPackage rec { setuptools ]; - doCheck = true; - nativeCheckInputs = [ pytestCheckHook emoji @@ -37,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/cvzi/flag"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/emoji/default.nix b/python/pkgs/emoji/default.nix index f5a22f894..3af5240c9 100644 --- a/python/pkgs/emoji/default.nix +++ b/python/pkgs/emoji/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "emoji"; version = "2.15.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6uSrfYZFanCgCphRJaAyY6XqxUzVXlHX4YSx7TtnV+Q="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/carpedm20/emoji/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/empty-files/default.nix b/python/pkgs/empty-files/default.nix index 786cf1ece..db22fc9e0 100644 --- a/python/pkgs/empty-files/default.nix +++ b/python/pkgs/empty-files/default.nix @@ -2,25 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "empty-files"; version = "0.0.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "approvals"; repo = "EmptyFiles.Python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-P/woyAN9cYdxryX1iM36C53c9dL6lo4eoTzBWT2cd3A="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # cyclic dependency with approvaltests - doCheck = false; pythonImportsCheck = [ "empty_files" ]; @@ -29,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/approvals/EmptyFiles.Python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/empy/default.nix b/python/pkgs/empy/default.nix index ed0131cf7..b12a0376c 100644 --- a/python/pkgs/empy/default.nix +++ b/python/pkgs/empy/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "empy"; version = "4.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uDHWQvypVQeCC1N3TAUYAxQrhEG4xCv4AAEdoGukJBs="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Templating system for Python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/emulated-roku/default.nix b/python/pkgs/emulated-roku/default.nix index 086c0b99b..d14a0fc05 100644 --- a/python/pkgs/emulated-roku/default.nix +++ b/python/pkgs/emulated-roku/default.nix @@ -6,7 +6,7 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "emulated-roku"; version = "0.5.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mindigmarton"; repo = "emulated_roku"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KwDEajkrEEgobORetM/rROMDLZvw9AJmmr1jmXAJJbk="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; # no tests implemented - doCheck = false; pythonImportsCheck = [ "emulated_roku" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/mindigmarton/emulated_roku"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/enaml/default.nix b/python/pkgs/enaml/default.nix index 7dc1583a6..cc844f882 100644 --- a/python/pkgs/enaml/default.nix +++ b/python/pkgs/enaml/default.nix @@ -14,7 +14,7 @@ sip, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "enaml"; version = "0.19.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nucleic"; repo = "enaml"; - tag = version; + tag = finalAttrs.version; hash = "sha256-gsNJSK9QcavsiRx2n/S2bbf9ZVsqJXxBiUyBWVIZzj8="; }; @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ atom bytecode cppy @@ -64,4 +64,4 @@ buildPythonPackage rec { homepage = "https://github.com/nucleic/enaml"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/encutils/default.nix b/python/pkgs/encutils/default.nix index 730dc0455..b77772f6e 100644 --- a/python/pkgs/encutils/default.nix +++ b/python/pkgs/encutils/default.nix @@ -6,13 +6,13 @@ chardet, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "encutils"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OOylrxjOur2L5DwX8UydP7uoPMX3rI46schuJMSyuRo="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/coherent-oss/encutils"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/energyflip-client/default.nix b/python/pkgs/energyflip-client/default.nix index c302cd23f..f251b8967 100644 --- a/python/pkgs/energyflip-client/default.nix +++ b/python/pkgs/energyflip-client/default.nix @@ -4,24 +4,28 @@ async-timeout, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytest-aiohttp, pytestCheckHook, yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "energyflip-client"; version = "0.2.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "dennisschroer"; repo = "energyflip-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-neuZ6pZWW/Rgexu/iCEymjnxi5l/IuLKPFn6S9U4DgU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp async-timeout yarl @@ -39,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/dennisschroer/energyflip-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/energyid-webhooks/default.nix b/python/pkgs/energyid-webhooks/default.nix index d1ba2403e..28afc1de4 100644 --- a/python/pkgs/energyid-webhooks/default.nix +++ b/python/pkgs/energyid-webhooks/default.nix @@ -9,7 +9,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "energyid-webhooks"; version = "0.0.14"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "EnergieID"; repo = "energyid-webhooks-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-43JfRBtRoERHYkhXjslxjohm8ypzgObRBmzbEwuzu7M="; }; @@ -35,11 +35,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "energyid_webhooks" ]; # upstream has no tests - doCheck = false; meta = { description = "Light weight Python package to interface with EnergyID Webhooks"; homepage = "https://github.com/EnergieID/energyid-webhooks-py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/enlighten/default.nix b/python/pkgs/enlighten/default.nix index 16eaf8ac0..c1b93b777 100644 --- a/python/pkgs/enlighten/default.nix +++ b/python/pkgs/enlighten/default.nix @@ -7,13 +7,13 @@ prefixed, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "enlighten"; version = "1.14.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hcNUEqmk84hrMzfUH4E0Qfq5ow2fW18MAVvQeKRBFHM="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/Rockhopper-Technologies/enlighten"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/enochecker-core/default.nix b/python/pkgs/enochecker-core/default.nix index a3fe3f90f..d21d80be0 100644 --- a/python/pkgs/enochecker-core/default.nix +++ b/python/pkgs/enochecker-core/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "enochecker-core"; version = "0.10.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "enochecker_core"; hash = "sha256-N41p2XRCp55rcPXLpA4rPIARsva/dQzK8qafjzXtavI="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "enochecker_core" ]; # no tests upstream - doCheck = false; meta = { description = "Base library for enochecker libs"; homepage = "https://github.com/enowars/enochecker_core"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/enrich/default.nix b/python/pkgs/enrich/default.nix index 0b96ec25f..7caf9b185 100644 --- a/python/pkgs/enrich/default.nix +++ b/python/pkgs/enrich/default.nix @@ -7,13 +7,13 @@ rich, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "enrich"; version = "1.2.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ciqw0pMd/4lHASYC0SNNKj7gAtmjVbXXC+a/VGYAiJM="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/pycontribs/enrich"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/enterpriseattack/default.nix b/python/pkgs/enterpriseattack/default.nix index 9f0c4352e..d6435b3cd 100644 --- a/python/pkgs/enterpriseattack/default.nix +++ b/python/pkgs/enterpriseattack/default.nix @@ -8,7 +8,7 @@ ujson, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "enterpriseattack"; version = "1.0.4"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "xakepnz"; repo = "enterpriseattack"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OZ/nao2oiXzzWl/zQA5A3GpsRNobnHb4ubAsZvVITj0="; }; @@ -31,7 +31,6 @@ buildPythonPackage rec { ]; # Tests require network access - doCheck = false; pythonImportsCheck = [ "enterpriseattack" ]; @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/xakepnz/enterpriseattack"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/entry-points-txt/default.nix b/python/pkgs/entry-points-txt/default.nix index 50c5bcf31..97f1da57d 100644 --- a/python/pkgs/entry-points-txt/default.nix +++ b/python/pkgs/entry-points-txt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "entry-points-txt"; version = "0.3.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jwodder"; repo = "entry-points-txt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8oGK7aIDgXkCLh/d38hWzfF367KhmggG2s820D2r/EA="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/jwodder/entry-points-txt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/entrypoint2/default.nix b/python/pkgs/entrypoint2/default.nix index dfeba2be7..3b814f521 100644 --- a/python/pkgs/entrypoint2/default.nix +++ b/python/pkgs/entrypoint2/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "entrypoint2"; version = "1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/At/57IazatHpYWrlAfKflxPlstoiFddtrDOuR8OEFo="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ponty/entrypoint2/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/entrypoints/default.nix b/python/pkgs/entrypoints/default.nix index 0266d8db1..111454c19 100644 --- a/python/pkgs/entrypoints/default.nix +++ b/python/pkgs/entrypoints/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "entrypoints"; version = "0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-twbt2qkhihnrzWe1aBjwW7J1ibHKno15e3Sv+tTMrNQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Discover and load entry points from installed packages"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/environ-config/default.nix b/python/pkgs/environ-config/default.nix index 90551a3fa..102e81e38 100644 --- a/python/pkgs/environ-config/default.nix +++ b/python/pkgs/environ-config/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, moto, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "environ-config"; version = "26.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "environ-config"; owner = "hynek"; - tag = version; + tag = finalAttrs.version; hash = "sha256-baj61mS4rSLMngrAdmSwupN/2ewo/GDwbZqFTr8fVuE="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/hynek/environ-config"; license = lib.licenses.apsl20; }; -} +}) diff --git a/python/pkgs/environmental-override/default.nix b/python/pkgs/environmental-override/default.nix index c96be120c..7d2290953 100644 --- a/python/pkgs/environmental-override/default.nix +++ b/python/pkgs/environmental-override/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "environmental-override"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1vhd37i6f8xh6kd61yxc2ynzgcln7v2p7fyzjmhbkdnws6gwfs6s"; }; + build-system = [ setuptools ]; + # No tests have been written for this library. - doCheck = false; pythonImportsCheck = [ "environmental_override" ]; @@ -24,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/coddingtonbear/environmental-override"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/envoy-data-plane/default.nix b/python/pkgs/envoy-data-plane/default.nix index 0fcf63bc5..6096e628d 100644 --- a/python/pkgs/envoy-data-plane/default.nix +++ b/python/pkgs/envoy-data-plane/default.nix @@ -39,7 +39,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "envoy_data_plane" ]; # No tests - doCheck = false; meta = { description = "Python dataclasses for the Envoy Data-Plane-API"; diff --git a/python/pkgs/envoy-utils/default.nix b/python/pkgs/envoy-utils/default.nix index b07ed10c9..3a2a44007 100644 --- a/python/pkgs/envoy-utils/default.nix +++ b/python/pkgs/envoy-utils/default.nix @@ -2,24 +2,27 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, zeroconf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "envoy-utils"; version = "0.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "envoy_utils"; - inherit version; + inherit (finalAttrs) version; sha256 = "13zn0d6k2a4nls9vp8cs0w07bgg4138vz18cadjadhm8p6r3bi0c"; }; - propagatedBuildInputs = [ zeroconf ]; + build-system = [ setuptools ]; + + dependencies = [ zeroconf ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "envoy_utils" ]; @@ -28,4 +31,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/envoy-utils/"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/envs/default.nix b/python/pkgs/envs/default.nix index c87edd717..6d18ec287 100644 --- a/python/pkgs/envs/default.nix +++ b/python/pkgs/envs/default.nix @@ -8,13 +8,13 @@ terminaltables, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "envs"; version = "1.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nYQ1xphdHN1oKZ4ExY4r24rmz2ayWWqAeeb5qT8qA5g="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/capless/envs"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/enzyme/default.nix b/python/pkgs/enzyme/default.nix index 6bf3bb09d..4619dd798 100644 --- a/python/pkgs/enzyme/default.nix +++ b/python/pkgs/enzyme/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "enzyme"; version = "0.5.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fPd5FI2eZusoOGA+rOFAxTw878i4/l1NWgOl+11Xs8E="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/Diaoul/enzyme"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/epc/default.nix b/python/pkgs/epc/default.nix index db2b8f642..f96532a13 100644 --- a/python/pkgs/epc/default.nix +++ b/python/pkgs/epc/default.nix @@ -10,13 +10,13 @@ sexpdata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "epc"; version = "0.0.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-oU0up0gXlVog6wCBLjpGMKEyiX602XZCAkDxFSwNfSU="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/tkf/python-epc"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/ephem/default.nix b/python/pkgs/ephem/default.nix index bb3786040..e3082ed9d 100644 --- a/python/pkgs/ephem/default.nix +++ b/python/pkgs/ephem/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ephem"; version = "4.2.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-kgyzA2nHn94QiMIGDVVepfilD9yAqSZYMv1b8ZXPFH8="; }; + + build-system = [ setuptools ]; # JPLTest uses assets not distributed in package checkPhase = '' pytest --pyargs ephem.tests -k "not JPLTest" @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/brandon-rhodes/pyephem"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ephemeral-port-reserve/default.nix b/python/pkgs/ephemeral-port-reserve/default.nix index 2d2ead15d..bccb51a9a 100644 --- a/python/pkgs/ephemeral-port-reserve/default.nix +++ b/python/pkgs/ephemeral-port-reserve/default.nix @@ -3,6 +3,8 @@ stdenv, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, }: @@ -12,15 +14,17 @@ let in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Yelp"; repo = "ephemeral-port-reserve"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-R6NRpfaT05PO/cTWgCakiGfCuCyucjVOXbAezn5x1cU="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/python/pkgs/epicstore-api/default.nix b/python/pkgs/epicstore-api/default.nix index d7369aff5..398d39064 100644 --- a/python/pkgs/epicstore-api/default.nix +++ b/python/pkgs/epicstore-api/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "epicstore-api"; version = "0.2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SD4RK"; repo = "epicstore_api"; - tag = "v_${version}"; + tag = "v_${finalAttrs.version}"; hash = "sha256-XSynUz8rAl/+jcPMCZoVKlGZLVcTCAr36VEWVhAydoM="; }; @@ -28,11 +28,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # tests directory exists but contains no test cases - doCheck = false; meta = { description = "Epic Games Store Web API Wrapper written in Python"; homepage = "https://github.com/SD4RK/epicstore_api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/epion/default.nix b/python/pkgs/epion/default.nix index 2f197ec8f..cbaecc2ba 100644 --- a/python/pkgs/epion/default.nix +++ b/python/pkgs/epion/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "epion"; version = "0.0.3"; pyproject = true; @@ -16,20 +16,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "devenzo-com"; repo = "epion_python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-9tE/SqR+GHZXeE+bOtXkLu+4jy1vO8WoiLjb6MJazxQ="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ docopt pytz requests ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "epion" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/devenzo-com/epion_python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/equinox/default.nix b/python/pkgs/equinox/default.nix index 42e9ee6da..55c136b5f 100644 --- a/python/pkgs/equinox/default.nix +++ b/python/pkgs/equinox/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "equinox"; version = "0.13.8"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "patrick-kidger"; @@ -37,8 +36,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "equinox" ]; - doCheck = false; - meta = { description = "JAX library based around a simple idea: represent parameterised functions as PyTrees"; homepage = "https://github.com/patrick-kidger/equinox"; diff --git a/python/pkgs/eradicate/default.nix b/python/pkgs/eradicate/default.nix index 53a7d843b..861ece7f4 100644 --- a/python/pkgs/eradicate/default.nix +++ b/python/pkgs/eradicate/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eradicate"; version = "3.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yct++OfoPD+9mAYBDiEImJK7ZJUxxoh1pVXHtcl4+qY="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/myint/eradicate"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/error-helper/default.nix b/python/pkgs/error-helper/default.nix index 796f44ca8..6ab3aeda2 100644 --- a/python/pkgs/error-helper/default.nix +++ b/python/pkgs/error-helper/default.nix @@ -11,7 +11,6 @@ buildPythonPackage (finalAttrs: { pname = "error-helper"; version = "1.5"; pyproject = true; - __structuredAttrs = true; # GitHub source doesn't build correctly (fails imports check) src = fetchPypi { @@ -25,7 +24,6 @@ buildPythonPackage (finalAttrs: { ]; # No tests in the Pypi archive. - doCheck = false; pythonImportsCheck = [ "error_helper" ]; diff --git a/python/pkgs/esphome-dashboard-api/default.nix b/python/pkgs/esphome-dashboard-api/default.nix index aab157065..557680758 100644 --- a/python/pkgs/esphome-dashboard-api/default.nix +++ b/python/pkgs/esphome-dashboard-api/default.nix @@ -7,7 +7,7 @@ orjson, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "esphome-dashboard-api"; version = "1.4.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "esphome"; repo = "dashboard-api"; - tag = version; + tag = finalAttrs.version; hash = "sha256-3VVdWHGpLSgyQkp3b0wVao5lW/3peWES2cE8P5KBM5Q="; }; @@ -26,8 +26,6 @@ buildPythonPackage rec { orjson ]; - doCheck = false; # no tests - pythonImportsCheck = [ "esphome_dashboard_api" ]; meta = { @@ -35,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/esphome/dashboard-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/esphome-glyphsets/default.nix b/python/pkgs/esphome-glyphsets/default.nix index 74a3ca583..3b3857080 100644 --- a/python/pkgs/esphome-glyphsets/default.nix +++ b/python/pkgs/esphome-glyphsets/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "esphome-glyphsets"; version = "0.2.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "esphome"; repo = "esphome-glyphsets"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nM8omtLIWwIY6AGVqVR2/4twmMlOj21+9cSuyXzAAXY="; fetchSubmodules = true; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/esphome/esphome-glyphsets"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/esprima/default.nix b/python/pkgs/esprima/default.nix index abc759cde..26f662cfa 100644 --- a/python/pkgs/esprima/default.nix +++ b/python/pkgs/esprima/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "esprima"; version = "4.0.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Kronuz"; repo = "esprima-python"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "WtkPCReXhxyr6pOzE9gsdIeBlLk+nSnbxkS3OowEaHo="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "esprima" ]; meta = { @@ -24,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/Kronuz/esprima-python"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/essent-dynamic-pricing/default.nix b/python/pkgs/essent-dynamic-pricing/default.nix index 40059f0e3..50df52cf8 100644 --- a/python/pkgs/essent-dynamic-pricing/default.nix +++ b/python/pkgs/essent-dynamic-pricing/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "essent-dynamic-pricing"; version = "0.3.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaapp"; repo = "py-essent-dynamic-pricing"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-98dh9XNXIVDI0w0/RqEGnDbDpQQoaZz/TvMIl6t3c3o="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaapp/py-essent-dynamic-pricing"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/essentials-openapi/default.nix b/python/pkgs/essentials-openapi/default.nix index 398530a50..ef66cf7ea 100644 --- a/python/pkgs/essentials-openapi/default.nix +++ b/python/pkgs/essentials-openapi/default.nix @@ -16,7 +16,7 @@ setuptools, stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "essentials-openapi"; version = "1.4.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Neoteroi"; repo = "essentials-openapi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-m2N6iOWfDBSRU99XqKs0T3a3iJWkPb2DuXW0Wm72r9g="; }; @@ -39,7 +39,7 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyyaml essentials markupsafe @@ -72,4 +72,4 @@ buildPythonPackage rec { description = "Functions to handle OpenAPI Documentation"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/essentials/default.nix b/python/pkgs/essentials/default.nix index 224c4d36d..5945c83b1 100644 --- a/python/pkgs/essentials/default.nix +++ b/python/pkgs/essentials/default.nix @@ -8,7 +8,7 @@ stdenv, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "essentials"; version = "1.1.9"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Neoteroi"; repo = "essentials"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kKAXCtcl6duVpuGDnSqVfJmfltv9ybU8Gmr3y32Dg9I="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { description = "General purpose classes and functions"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/et-xmlfile/default.nix b/python/pkgs/et-xmlfile/default.nix index 1630abdfd..79fae7f34 100644 --- a/python/pkgs/et-xmlfile/default.nix +++ b/python/pkgs/et-xmlfile/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "et-xmlfile"; version = "2.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { domain = "foss.heptapod.net"; owner = "openpyxl"; repo = "et_xmlfile"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JZ1fJ9o4/Z+9uSlaoq+pNpLSwl5Yv6BJCI1G7GOaQ1I="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://foss.heptapod.net/openpyxl/et_xmlfile"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/etcd/default.nix b/python/pkgs/etcd/default.nix index aa5cc7934..401f9d08c 100644 --- a/python/pkgs/etcd/default.nix +++ b/python/pkgs/etcd/default.nix @@ -2,40 +2,43 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, simplejson, pytz, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "etcd"; version = "2.0.8"; - format = "setuptools"; + pyproject = true; # PyPI package is incomplete src = fetchFromGitHub { owner = "dsoprea"; repo = "PythonEtcdClient"; - rev = version; + tag = finalAttrs.version; hash = "sha256-h+jYIRSNdrGkW3tBV1ifIDEXU46EQGyeJoz/Mxym4pI="; }; + build-system = [ setuptools ]; + postPatch = '' sed -i -e '13,14d;37d' setup.py ''; - propagatedBuildInputs = [ + dependencies = [ simplejson pytz requests ]; # No proper tests are available - doCheck = false; meta = { description = "Python etcd client that just works"; homepage = "https://github.com/dsoprea/PythonEtcdClient"; license = lib.licenses.gpl2; }; -} +}) diff --git a/python/pkgs/ete3/default.nix b/python/pkgs/ete3/default.nix index bd61250bb..4e16f38fb 100644 --- a/python/pkgs/ete3/default.nix +++ b/python/pkgs/ete3/default.nix @@ -8,13 +8,13 @@ legacy-cgi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ete3"; version = "3.1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BqO3+o7ZAYewdqjbvlsbYqzulCAdPG6CL1X0SWAe9vI="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "http://etetoolkit.org/"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/eternalegypt/default.nix b/python/pkgs/eternalegypt/default.nix index fb7cf7739..f96c03bc3 100644 --- a/python/pkgs/eternalegypt/default.nix +++ b/python/pkgs/eternalegypt/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eternalegypt"; version = "0.0.18"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amelchio"; repo = "eternalegypt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dS4APZWOI8im1Ls1A5750FedTWBy3UpXvJmYpd1po94="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "eternalegypt" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/amelchio/eternalegypt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/eth-abi/default.nix b/python/pkgs/eth-abi/default.nix index 46347ff9c..3e2f04638 100644 --- a/python/pkgs/eth-abi/default.nix +++ b/python/pkgs/eth-abi/default.nix @@ -9,7 +9,7 @@ parsimonious, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eth-abi"; version = "5.2.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "eth-abi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/tyGm/lH72oZEKfTd25t+k0y3TuAZQg+hUABT4YCP2g="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/eth-abi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/eth-account/default.nix b/python/pkgs/eth-account/default.nix index 66f15388c..1edc55312 100644 --- a/python/pkgs/eth-account/default.nix +++ b/python/pkgs/eth-account/default.nix @@ -17,7 +17,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eth-account"; version = "0.13.7"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "eth-account"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Ipz2zIKCpIzKBtX0UZnvpKZeTUcDPbGTzMgmcJC/4qs="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/eth-account"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/eth-bloom/default.nix b/python/pkgs/eth-bloom/default.nix index 923c9c67e..3eec30f48 100644 --- a/python/pkgs/eth-bloom/default.nix +++ b/python/pkgs/eth-bloom/default.nix @@ -7,7 +7,7 @@ eth-hash, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eth-bloom"; version = "4.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "eth-bloom"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zz0os8+Du5nFSQqOIS42X1h3j4MGgLsRUvvjVTTfKG4="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/eth-bloom"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/eth-hash/default.nix b/python/pkgs/eth-hash/default.nix index 86d169a1d..81198b6ef 100644 --- a/python/pkgs/eth-hash/default.nix +++ b/python/pkgs/eth-hash/default.nix @@ -8,7 +8,7 @@ pycryptodome, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eth-hash"; version = "0.7.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "eth-hash"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-91jWZDqrd7ZZlM0D/3sDokJ26NiAQ3gdeBebTV1Lq8s="; }; @@ -26,8 +26,6 @@ buildPythonPackage rec { pycryptodome = [ pycryptodome ]; }; - __structuredAttrs = true; - pythonImportsCheck = [ "eth_hash" ]; meta = { @@ -35,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/eth-hash"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/eth-keyfile/default.nix b/python/pkgs/eth-keyfile/default.nix index 7d0e8b112..2d2a0ee57 100644 --- a/python/pkgs/eth-keyfile/default.nix +++ b/python/pkgs/eth-keyfile/default.nix @@ -10,7 +10,7 @@ py-ecc, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eth-keyfile"; version = "0.9.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "eth-keyfile"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-DR17EupRDnviN6OXF+B+RlCVdG8cfcvnIgIEKxrXFKs="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/eth-keyfile"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/eth-keys/default.nix b/python/pkgs/eth-keys/default.nix index 40ee8f3d9..85baaf2d4 100644 --- a/python/pkgs/eth-keys/default.nix +++ b/python/pkgs/eth-keys/default.nix @@ -12,7 +12,7 @@ isPyPy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eth-keys"; version = "0.8.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "eth-keys"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mREmzckOddTUB6E/UIMNP+u520hDxAqLNQdbxqoisfI="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/eth-keys"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/eth-rlp/default.nix b/python/pkgs/eth-rlp/default.nix index 5bd5d5ddb..037822174 100644 --- a/python/pkgs/eth-rlp/default.nix +++ b/python/pkgs/eth-rlp/default.nix @@ -9,7 +9,7 @@ rlp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eth-rlp"; version = "3.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "eth-rlp"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0D/1PS4Q4BrypE9QFJBj6jDJNVAVhgqXJeGCk86zYRk="; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ hexbytes eth-utils rlp @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/eth-rlp"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/eth-tester/default.nix b/python/pkgs/eth-tester/default.nix index 20c73393a..202778578 100644 --- a/python/pkgs/eth-tester/default.nix +++ b/python/pkgs/eth-tester/default.nix @@ -12,7 +12,7 @@ semantic-version, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eth-tester"; version = "0.13.0-beta.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "eth-tester"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ssPtsEQAyaJde/empEpGU1bf3s4yxwlEXqpacN5GWDw="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/eth-tester"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/eth-typing/default.nix b/python/pkgs/eth-typing/default.nix index a035fd92d..194a75677 100644 --- a/python/pkgs/eth-typing/default.nix +++ b/python/pkgs/eth-typing/default.nix @@ -9,7 +9,7 @@ pytest-xdist, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eth-typing"; version = "6.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "eth-typing"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bdZrrglsJGNsqD6ShsqPO6ljViZr9Ms9A8Km45pnEYA="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/eth-typing"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ethtool/default.nix b/python/pkgs/ethtool/default.nix index b21e0fdbc..572da1a40 100644 --- a/python/pkgs/ethtool/default.nix +++ b/python/pkgs/ethtool/default.nix @@ -9,7 +9,7 @@ net-tools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ethtool"; version = "0.15"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fedora-python"; repo = "python-ethtool"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0XzGaqpkEv3mpUsbfOtRl8E62iNdS7kRoo4oYrBjMys="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/fedora-python/python-ethtool"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/etils/default.nix b/python/pkgs/etils/default.nix index dede9f1a3..c0e0b23ec 100644 --- a/python/pkgs/etils/default.nix +++ b/python/pkgs/etils/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { pname = "etils"; version = "1.14.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "google"; diff --git a/python/pkgs/etuples/default.nix b/python/pkgs/etuples/default.nix index 4b53b544d..deb4f38c5 100644 --- a/python/pkgs/etuples/default.nix +++ b/python/pkgs/etuples/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "etuples"; version = "0.3.10"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pythological"; repo = "etuples"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-h5MLj1z3qZiUXcNIDtUIbV5zeyTzxerbSezFD5Q27n0="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/pythological/etuples"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/euclid3/default.nix b/python/pkgs/euclid3/default.nix index 9d020b9d0..185961573 100644 --- a/python/pkgs/euclid3/default.nix +++ b/python/pkgs/euclid3/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "euclid3"; version = "0.01"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JbgnpXrb/Zo/qGJeQ6vD6Qf2HeYiND5+U4SC75tG/Qs="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "http://code.google.com/p/pyeuclid/"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/eval-type-backport/default.nix b/python/pkgs/eval-type-backport/default.nix index c8d49955b..54c2ca14e 100644 --- a/python/pkgs/eval-type-backport/default.nix +++ b/python/pkgs/eval-type-backport/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eval-type-backport"; version = "0.4.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alexmojaki"; repo = "eval_type_backport"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ipo0atAAz0LhUwsO5Hm8fAG6lfjoKXZjF0bH7p2u63k="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/alexmojaki/eval_type_backport"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/evaluate/default.nix b/python/pkgs/evaluate/default.nix index 0d2c83139..2f32bd86f 100644 --- a/python/pkgs/evaluate/default.nix +++ b/python/pkgs/evaluate/default.nix @@ -16,7 +16,7 @@ xxhash, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "evaluate"; version = "0.4.6"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "huggingface"; repo = "evaluate"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wK50bPJSwCNFJO0l6+15+GrbaFQNfAr/djn9JTOlwpw="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "evaluate-cli"; }; -} +}) diff --git a/python/pkgs/eve/default.nix b/python/pkgs/eve/default.nix index ee2084afa..0eac4405f 100644 --- a/python/pkgs/eve/default.nix +++ b/python/pkgs/eve/default.nix @@ -10,7 +10,7 @@ simplejson, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eve"; version = "2.3.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyeve"; repo = "eve"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-y0QfxLDoTKNZuAKcPqrLjwkZ0mRseBVq7OyflwUd+Lk="; }; @@ -40,11 +40,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "eve" ]; # Tests call a running mongodb instance - doCheck = false; meta = { description = "Open source Python REST API framework designed for human beings"; homepage = "https://python-eve.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/eventkit/default.nix b/python/pkgs/eventkit/default.nix index 3513bfa65..c180a06fa 100644 --- a/python/pkgs/eventkit/default.nix +++ b/python/pkgs/eventkit/default.nix @@ -2,6 +2,8 @@ buildPythonPackage, lib, fetchPypi, + # build-system + setuptools, numpy, }: let @@ -10,12 +12,14 @@ let hash = "sha256-mUl/bzxjilD/dhby+M2Iexi7/zdl3BvYaBVU2xRnyTM="; in buildPythonPackage { - format = "setuptools"; + pyproject = true; inherit pname version; src = fetchPypi { inherit pname version hash; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; meta = { homepage = "https://github.com/erdewit/eventkit"; diff --git a/python/pkgs/eventlet/default.nix b/python/pkgs/eventlet/default.nix index 2acf396fb..1b569e420 100644 --- a/python/pkgs/eventlet/default.nix +++ b/python/pkgs/eventlet/default.nix @@ -9,13 +9,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "eventlet"; version = "0.41.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-chuGt3/KM6c1WYKSAirG/u+ZdHv0j1Le/a2mtXKs1a8="; }; @@ -32,8 +32,6 @@ buildPythonPackage rec { six ]; - doCheck = false; - pythonImportsCheck = [ "eventlet" ]; meta = { @@ -41,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/eventlet/eventlet/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/events/default.nix b/python/pkgs/events/default.nix index 7e5a23a34..ef60cf44c 100644 --- a/python/pkgs/events/default.nix +++ b/python/pkgs/events/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "events"; version = "0.5"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyeve"; repo = "events"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GGhIKHbJ31IN0Uoe689X9V/MZvtseE47qx2CmM4MYUs="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://events.readthedocs.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/everett/default.nix b/python/pkgs/everett/default.nix index 8258458c2..7c60b69ec 100644 --- a/python/pkgs/everett/default.nix +++ b/python/pkgs/everett/default.nix @@ -10,7 +10,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "everett"; version = "3.5.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "willkg"; repo = "everett"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5cjPV2pt2x8RmaGWTRWeX3Nb1QeDd7245FZ0tEmYCSk="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/willkg/everett"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/evolutionhttp/default.nix b/python/pkgs/evolutionhttp/default.nix index 397155272..a3252bdcf 100644 --- a/python/pkgs/evolutionhttp/default.nix +++ b/python/pkgs/evolutionhttp/default.nix @@ -15,13 +15,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "evolutionhttp"; version = "0.0.19"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VhWYhkrZVUDu1I6ZZTZlTUhNfpma29tEYBLoT7xBd1M="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/danielsmyers/evolutionhttp"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ewmh/default.nix b/python/pkgs/ewmh/default.nix index 733a06248..8b01ee85c 100644 --- a/python/pkgs/ewmh/default.nix +++ b/python/pkgs/ewmh/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, python-xlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ewmh"; version = "0.1.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0g9l14my3v8zlgq1yd8wh5gpara0qcapsfmvg7lq2lapglzhjsy5"; }; - propagatedBuildInputs = [ python-xlib ]; + build-system = [ setuptools ]; + + dependencies = [ python-xlib ]; # No tests included - doCheck = false; meta = { homepage = "https://github.com/parkouss/pyewmh"; description = "Implementation of EWMH (Extended Window Manager Hints), based on Xlib"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/ewmhlib/default.nix b/python/pkgs/ewmhlib/default.nix index 35f22531b..f955267b3 100644 --- a/python/pkgs/ewmhlib/default.nix +++ b/python/pkgs/ewmhlib/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { # requires x session (call to defaultDisplay.screen() on import) pythonImportsCheck = [ ]; - doCheck = false; meta = { homepage = "https://github.com/Kalmat/EWMHlib"; diff --git a/python/pkgs/exa-py/default.nix b/python/pkgs/exa-py/default.nix index 396d5a5a9..9c921d192 100644 --- a/python/pkgs/exa-py/default.nix +++ b/python/pkgs/exa-py/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { pname = "exa-py"; version = "2.20.0"; pyproject = true; - __structuredAttrs = true; # pypi doesn't include tests but there aren't any upstream git tags src = fetchFromGitHub { diff --git a/python/pkgs/exceptiongroup/default.nix b/python/pkgs/exceptiongroup/default.nix index cc054a5f7..7d9194057 100644 --- a/python/pkgs/exceptiongroup/default.nix +++ b/python/pkgs/exceptiongroup/default.nix @@ -9,7 +9,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "exceptiongroup"; version = "1.3.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "agronholm"; repo = "exceptiongroup"; - tag = version; + tag = finalAttrs.version; hash = "sha256-3WInufN+Pp6vB/Gik6e8V1a34Dr/oiH3wDMB+2lHRMM="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/agronholm/exceptiongroup"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/exchangelib/default.nix b/python/pkgs/exchangelib/default.nix index 47b6dc7a6..f4d24c57d 100644 --- a/python/pkgs/exchangelib/default.nix +++ b/python/pkgs/exchangelib/default.nix @@ -18,7 +18,7 @@ tzlocal, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "exchangelib"; version = "5.6.0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ecederstrand"; repo = "exchangelib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tmJq0AZLuOic63ziIr173lbz6sDF/u75Y2ASYnHHDTM="; }; @@ -67,4 +67,4 @@ buildPythonPackage rec { homepage = "https://github.com/ecederstrand/exchangelib"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/exdown/default.nix b/python/pkgs/exdown/default.nix index 4fdc0ac58..7da66422d 100644 --- a/python/pkgs/exdown/default.nix +++ b/python/pkgs/exdown/default.nix @@ -3,23 +3,23 @@ buildPythonPackage, fetchPypi, setuptools, - pytestCheckHook, + pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "exdown"; version = "0.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-+IN+0P4SljUWxF01Ln9PgeFVA/+qGKFVoKMGluAuYDw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + dependencies = [ pytest ]; pythonImportsCheck = [ "exdown" ]; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/nschloe/exdown"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/execnb/default.nix b/python/pkgs/execnb/default.nix index bcfaad91e..c25befab9 100644 --- a/python/pkgs/execnb/default.nix +++ b/python/pkgs/execnb/default.nix @@ -8,13 +8,13 @@ traitlets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "execnb"; version = "0.3.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0Ca35QfhrNEyBdYf9KCl5tBJjOPDla79h8W0oOGHWu0="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # no real tests - doCheck = false; pythonImportsCheck = [ "execnb" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "exec_nb"; }; -} +}) diff --git a/python/pkgs/execnet/default.nix b/python/pkgs/execnet/default.nix index 861e4e066..3cbdb25d0 100644 --- a/python/pkgs/execnet/default.nix +++ b/python/pkgs/execnet/default.nix @@ -7,13 +7,13 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "execnet"; version = "2.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Y9g7/dmiPjW5xqMmFBIyT5ZMLsjc2NPGkW7pNz4L780="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://execnet.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/executing/default.nix b/python/pkgs/executing/default.nix index ce4b2b721..1e3944c0d 100644 --- a/python/pkgs/executing/default.nix +++ b/python/pkgs/executing/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "executing"; version = "2.2.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alexmojaki"; repo = "executing"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UlXuXBW9TmJ0xG/0yMdx8EDQDSzVgtsgFJIj/O7pmio="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/alexmojaki/executing"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/exif/default.nix b/python/pkgs/exif/default.nix index 5890ce086..717ce909d 100644 --- a/python/pkgs/exif/default.nix +++ b/python/pkgs/exif/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitLab, + # build-system + setuptools, plum-py, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "exif"; version = "1.6.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { owner = "TNThieding"; repo = "exif"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uiHL3m0C6+YnAHRLwzMCSzffrQsSyVcuem6FBtTLxek="; }; - propagatedBuildInputs = [ plum-py ]; + build-system = [ setuptools ]; + + dependencies = [ plum-py ]; pythonImportsCheck = [ "exif" ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/TNThieding/exif"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/exifread/default.nix b/python/pkgs/exifread/default.nix index b5a6f48ac..a6d0ac461 100644 --- a/python/pkgs/exifread/default.nix +++ b/python/pkgs/exifread/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "exifread"; version = "3.5.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-n5mPgNMGJ0HJdt/E/QM0JLxAkyk3mU5NIYHrcMS2rt0="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { license = lib.licenses.bsd0; mainProgram = "EXIF.py"; }; -} +}) diff --git a/python/pkgs/exitcode/default.nix b/python/pkgs/exitcode/default.nix index cd3dc135e..55809396e 100644 --- a/python/pkgs/exitcode/default.nix +++ b/python/pkgs/exitcode/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "exitcode"; version = "0.1.0"; pyproject = true; @@ -13,14 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rumpelsepp"; repo = "exitcode"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MZeLwU1gODqH752y/nc9WkUArl48pyq9Vun7tX620No="; }; nativeBuildInputs = [ poetry-core ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "exitcode" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/rumpelsepp/exitcode"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/expandvars/default.nix b/python/pkgs/expandvars/default.nix index 087942dc4..665dfc717 100644 --- a/python/pkgs/expandvars/default.nix +++ b/python/pkgs/expandvars/default.nix @@ -7,13 +7,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "expandvars"; version = "1.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bFgit7dWqZo1a5Fd0SZ/UquKTvqhNZY71/S9XTaPcdc="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/sayanarijit/expandvars"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/expects/default.nix b/python/pkgs/expects/default.nix index f97cc57df..d7d0ee0cf 100644 --- a/python/pkgs/expects/default.nix +++ b/python/pkgs/expects/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "expects"; version = "0.9.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaimegildesagredo"; repo = "expects"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3j9LMt/IakIyFz4I+OoGwZnEg/0KzjyBQJ4miyCsYVY="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://expects.readthedocs.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/expecttest/default.nix b/python/pkgs/expecttest/default.nix index d7345e95d..42ed8f6b2 100644 --- a/python/pkgs/expecttest/default.nix +++ b/python/pkgs/expecttest/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "expecttest"; version = "0.3.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytorch"; repo = "expecttest"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/BMaQD3ZgYiprRYZ/fIlW7mStyFGzsjqup62tegBP7Y="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytorch/expecttest"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/expiringdict/default.nix b/python/pkgs/expiringdict/default.nix index cbbd9906c..9e72d6e5f 100644 --- a/python/pkgs/expiringdict/default.nix +++ b/python/pkgs/expiringdict/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "expiringdict"; version = "1.2.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mailgun"; repo = "expiringdict"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vRhJSHIqc51I+s/wndtfANM44CKW3QS1iajqyoSBf0I="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/mailgun/expiringdict"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/exrex/default.nix b/python/pkgs/exrex/default.nix index a69a2bf6a..4fc5cd768 100644 --- a/python/pkgs/exrex/default.nix +++ b/python/pkgs/exrex/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "exrex"; version = "0.11.0"; pyproject = true; @@ -19,13 +19,11 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "version=about['__version__']," "version='${version}'," + --replace "version=about['__version__']," "version='${finalAttrs.version}'," ''; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "exrex" ]; meta = { @@ -33,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/asciimoo/exrex"; license = lib.licenses.agpl3Plus; }; -} +}) diff --git a/python/pkgs/extension-helpers/default.nix b/python/pkgs/extension-helpers/default.nix index 61b75d3f1..e4919635c 100644 --- a/python/pkgs/extension-helpers/default.nix +++ b/python/pkgs/extension-helpers/default.nix @@ -11,7 +11,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "extension-helpers"; version = "1.4.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astropy"; repo = "extension-helpers"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-coSgaPoz93CqJRb65xYs1sNOwoGhcxWGJF7Jc9N2W1I="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/astropy/extension-helpers"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/extra-streamlit-components/default.nix b/python/pkgs/extra-streamlit-components/default.nix index dc20a2510..59a7e5ab1 100644 --- a/python/pkgs/extra-streamlit-components/default.nix +++ b/python/pkgs/extra-streamlit-components/default.nix @@ -6,14 +6,14 @@ streamlit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "extra-streamlit-components"; version = "0.1.81"; pyproject = true; src = fetchPypi { pname = "extra_streamlit_components"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-65vre6z+iz0jjxiIohx4rGz6VpNBvkhLygjD6gsV8g0="; }; @@ -24,11 +24,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "extra_streamlit_components" ]; # Module has no tests - doCheck = false; meta = { description = "Additional components for streamlit"; homepage = "https://pypi.org/project/extra-streamlit-components/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/extras/default.nix b/python/pkgs/extras/default.nix index c46ffc027..0753f422d 100644 --- a/python/pkgs/extras/default.nix +++ b/python/pkgs/extras/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "extras"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ey423hC5yR1dTMYgFgpHbgRoqI8WyUMYF6ZylhGoG04="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "extras" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/testing-cabal/extras"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/extruct/default.nix b/python/pkgs/extruct/default.nix index fa351095e..78670a131 100644 --- a/python/pkgs/extruct/default.nix +++ b/python/pkgs/extruct/default.nix @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ html-text jstyleson lxml diff --git a/python/pkgs/eyed3/default.nix b/python/pkgs/eyed3/default.nix index a551e02fd..2155dfe54 100644 --- a/python/pkgs/eyed3/default.nix +++ b/python/pkgs/eyed3/default.nix @@ -8,7 +8,7 @@ deprecation, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.9.9"; pname = "eyed3"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nicfit"; repo = "eyeD3"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Brtxi0B52kvSU12va5X+KNtNV9cyK2TUefyZYZI87JQ="; }; @@ -31,7 +31,6 @@ buildPythonPackage rec { # requires special test data: # https://github.com/nicfit/eyeD3/blob/103198e265e3279384f35304e8218be6717c2976/Makefile#L97 - doCheck = false; meta = { description = "Python module and command line program for processing ID3 tags"; @@ -47,4 +46,4 @@ buildPythonPackage rec { and v2.3/v2.4. ''; }; -} +}) diff --git a/python/pkgs/ezdxf/default.nix b/python/pkgs/ezdxf/default.nix index 821c06519..e3178ea0a 100644 --- a/python/pkgs/ezdxf/default.nix +++ b/python/pkgs/ezdxf/default.nix @@ -10,7 +10,7 @@ fonttools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "1.4.3"; pname = "ezdxf"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mozman"; repo = "ezdxf"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-v/xW/Tg3OgzwvSNy3cfkxzf6R33ZvW4VE8k7MB+rM+w="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/ezodf/default.nix b/python/pkgs/ezodf/default.nix index 1c38f12da..fbea763bd 100644 --- a/python/pkgs/ezodf/default.nix +++ b/python/pkgs/ezodf/default.nix @@ -7,7 +7,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ezodf"; version = "0.3.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "T0ha"; repo = "ezodf"; - tag = version; + tag = finalAttrs.version; hash = "sha256-d66CTj9CpCnMICqNdUP07M9elEfoxuPg8x1kxqgXTTE="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/T0ha/ezodf"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/f5-icontrol-rest/default.nix b/python/pkgs/f5-icontrol-rest/default.nix index 31d535f3a..a48bdacc2 100644 --- a/python/pkgs/f5-icontrol-rest/default.nix +++ b/python/pkgs/f5-icontrol-rest/default.nix @@ -2,29 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, requests, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "f5-icontrol-rest"; version = "1.3.16"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "F5Networks"; repo = "f5-icontrol-rest-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-asAFIRoc2zll8a8gMMt4ZRQILhMAes8wf3PGwG5wF9c="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests six ]; # needs to be updated to newer pytest version and requires physical device - doCheck = false; enabledTestPaths = [ "icontrol/test" ]; @@ -35,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/F5Networks/f5-icontrol-rest-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/f5-sdk/default.nix b/python/pkgs/f5-sdk/default.nix index 920d07c66..adc407e0b 100644 --- a/python/pkgs/f5-sdk/default.nix +++ b/python/pkgs/f5-sdk/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, f5-icontrol-rest, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "f5-sdk"; version = "3.0.21"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IokMj9mCMsFMVFYO4CpZUB2i32cOamhS5u2mNkNjljo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ f5-icontrol-rest six ]; # needs to be updated to newer pytest version and requires physical device - doCheck = false; pythonImportsCheck = [ "f5" ]; @@ -31,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/F5Networks/f5-common-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/f90nml/default.nix b/python/pkgs/f90nml/default.nix index ac830b76f..3797286fa 100644 --- a/python/pkgs/f90nml/default.nix +++ b/python/pkgs/f90nml/default.nix @@ -6,7 +6,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "f90nml"; version = "1.5"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "marshallward"; repo = "f90nml"; - rev = "v" + version; + tag = "v" + finalAttrs.version; hash = "sha256-AtFyHCbt74246uFBhDjw144CfxVq8r7fsgDC36plz+I="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://f90nml.readthedocs.io"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/faadelays/default.nix b/python/pkgs/faadelays/default.nix index f699c8751..1e343664e 100644 --- a/python/pkgs/faadelays/default.nix +++ b/python/pkgs/faadelays/default.nix @@ -6,22 +6,21 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "faadelays"; version = "2023.9.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ngMFd+BE3hKeaeGEX4xHpzDIrtGFDsSwxBbrc4ZMFas="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "faadelays" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/ntilley905/faadelays"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fabric/default.nix b/python/pkgs/fabric/default.nix index 607784562..e5a90ab00 100644 --- a/python/pkgs/fabric/default.nix +++ b/python/pkgs/fabric/default.nix @@ -12,7 +12,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fabric"; version = "3.2.3"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fabric"; repo = "fabric"; - tag = version; + tag = finalAttrs.version; hash = "sha256-GbZQ6rFKQyJZXYfe9b4j6yjKgAB0ct8AD1xYG0yGZl8="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; mainProgram = "fab"; }; -} +}) diff --git a/python/pkgs/fabulous/default.nix b/python/pkgs/fabulous/default.nix index fc5e43d71..9a7acb5e1 100644 --- a/python/pkgs/fabulous/default.nix +++ b/python/pkgs/fabulous/default.nix @@ -8,7 +8,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fabulous"; version = "0.4.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jart"; repo = "fabulous"; - rev = version; + tag = finalAttrs.version; hash = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://jart.github.io/fabulous"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/face/default.nix b/python/pkgs/face/default.nix index 7213da1f9..cc92ed5c2 100644 --- a/python/pkgs/face/default.nix +++ b/python/pkgs/face/default.nix @@ -10,13 +10,13 @@ boltons, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "face"; version = "26.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gYPZS8JIuq6oVan4RF+XoiqZiJCOYKvdzMbiUdp3xMY="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { description = "Command-line interface parser and framework"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/facebook-sdk/default.nix b/python/pkgs/facebook-sdk/default.nix index f312fd30f..aa7867c80 100644 --- a/python/pkgs/facebook-sdk/default.nix +++ b/python/pkgs/facebook-sdk/default.nix @@ -10,13 +10,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "facebook-sdk"; version = "3.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yrzS5p6j2fBCkZyZs1PfeqHivobQQBIfbp9eY8HPD40="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/pythonforfacebook/facebook-sdk"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/factory-boy/default.nix b/python/pkgs/factory-boy/default.nix index a1bb95c0e..3b45a244b 100644 --- a/python/pkgs/factory-boy/default.nix +++ b/python/pkgs/factory-boy/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "factory-boy"; version = "3.3.3"; pyproject = true; src = fetchPypi { pname = "factory_boy"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-hmhi0iYSjfrH8rQWAofomdr1TyYSd4Mn3QPQ4ssePQM="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/rbarrois/factory_boy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fake-http-header/default.nix b/python/pkgs/fake-http-header/default.nix index db5e2895a..0ae47dd1f 100644 --- a/python/pkgs/fake-http-header/default.nix +++ b/python/pkgs/fake-http-header/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.3.5-unstable-2025-07-09"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "MichaelTatarski"; repo = "fake-http-header"; diff --git a/python/pkgs/fake-useragent/default.nix b/python/pkgs/fake-useragent/default.nix index 40b3b92c1..c7f3179b1 100644 --- a/python/pkgs/fake-useragent/default.nix +++ b/python/pkgs/fake-useragent/default.nix @@ -6,7 +6,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fake-useragent"; version = "2.2.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fake-useragent"; repo = "fake-useragent"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CaFIXcS5y6m9mAfy4fniuA4VPTl6JfFq1WHnlLFz6fA="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/hellysmile/fake-useragent"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/faker/default.nix b/python/pkgs/faker/default.nix index 8042efa3a..ba0344c5e 100644 --- a/python/pkgs/faker/default.nix +++ b/python/pkgs/faker/default.nix @@ -8,13 +8,13 @@ tzdata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "faker"; version = "40.38.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cuQhCYZk7fOEePQmml1aU5M33l2hiIPOZ8sea7lrCzo="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "http://faker.rtfd.org"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fakeredis/default.nix b/python/pkgs/fakeredis/default.nix index 8820df100..16ff88fff 100644 --- a/python/pkgs/fakeredis/default.nix +++ b/python/pkgs/fakeredis/default.nix @@ -7,13 +7,13 @@ sortedcontainers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fakeredis"; version = "2.37.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-kEWFGwqf5WMSaWqtyCQ1FBqkOhk8q0YtNyyPtYOnwIc="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/cunla/fakeredis-py"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/falcon-cors/default.nix b/python/pkgs/falcon-cors/default.nix index 5d929f7e7..25ce70fde 100644 --- a/python/pkgs/falcon-cors/default.nix +++ b/python/pkgs/falcon-cors/default.nix @@ -9,7 +9,7 @@ buildPythonPackage (finalAttrs: { pname = "falcon-cors"; version = "1.1.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "lwcolton"; @@ -24,7 +24,6 @@ buildPythonPackage (finalAttrs: { # Test fail with falcon >= 4 # https://github.com/lwcolton/falcon-cors/issues/25 - doCheck = false; pythonImportsCheck = [ "falcon_cors" ]; diff --git a/python/pkgs/falcon/default.nix b/python/pkgs/falcon/default.nix index 83f4ab2b3..e4f38ba99 100644 --- a/python/pkgs/falcon/default.nix +++ b/python/pkgs/falcon/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "falcon"; version = "4.3.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "falconry"; repo = "falcon"; - tag = version; + tag = finalAttrs.version; hash = "sha256-f+UoGYyrg8OZow4qONqzXuDVnrZalqUNDyavDoQ7QHE="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://falconframework.org/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/falconpy/default.nix b/python/pkgs/falconpy/default.nix index 9b48913bc..b21ac7364 100644 --- a/python/pkgs/falconpy/default.nix +++ b/python/pkgs/falconpy/default.nix @@ -6,7 +6,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "falconpy"; version = "1.6.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CrowdStrike"; repo = "falconpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tdok06CnjpzGrWOaNA0OrNFxWzlW23y/7Rg/LmZ93+k="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/CrowdStrike/falconpy"; license = lib.licenses.unlicense; }; -} +}) diff --git a/python/pkgs/farama-notifications/default.nix b/python/pkgs/farama-notifications/default.nix index 3b89e7467..7cf0c3a74 100644 --- a/python/pkgs/farama-notifications/default.nix +++ b/python/pkgs/farama-notifications/default.nix @@ -9,7 +9,6 @@ buildPythonPackage (finalAttrs: { pname = "farama-notifications"; version = "0.0.6"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "Farama-Foundation"; diff --git a/python/pkgs/fast-colorthief/default.nix b/python/pkgs/fast-colorthief/default.nix index 82a5be7ca..557b2049b 100644 --- a/python/pkgs/fast-colorthief/default.nix +++ b/python/pkgs/fast-colorthief/default.nix @@ -10,14 +10,14 @@ pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fast-colorthief"; version = "0.0.5"; pyproject = true; # No tags on github src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yUO1vnOt2NPyldPjFMn0jbhVX8zHcKsJ2IFVugYBZa4="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/bedapisl/fast-colorthief"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fast-histogram/default.nix b/python/pkgs/fast-histogram/default.nix index 770931dd0..df45228f8 100644 --- a/python/pkgs/fast-histogram/default.nix +++ b/python/pkgs/fast-histogram/default.nix @@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: { pytestCheckHook ]; - enabledTestPaths = [ "${placeholder "out"}/${python.sitePackages}" ]; + enabledTestPaths = [ "$(out)/${python.sitePackages}" ]; pythonImportsCheck = [ "fast_histogram" ]; diff --git a/python/pkgs/fastapi-cli/default.nix b/python/pkgs/fastapi-cli/default.nix index 39c8346e1..3ee768b2e 100644 --- a/python/pkgs/fastapi-cli/default.nix +++ b/python/pkgs/fastapi-cli/default.nix @@ -11,56 +11,51 @@ rich, }: -let - self = buildPythonPackage rec { - pname = "fastapi-cli"; - version = "0.0.32"; - pyproject = true; +buildPythonPackage (finalAttrs: { + pname = "fastapi-cli"; + version = "0.0.32"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fastapi"; + repo = "fastapi-cli"; + tag = finalAttrs.version; + hash = "sha256-SHhCjpah0VWpPPEu2mjVx0lCjuZM00KQFgEpiRtOH2E="; + }; - src = fetchFromGitHub { - owner = "fastapi"; - repo = "fastapi-cli"; - tag = version; - hash = "sha256-SHhCjpah0VWpPPEu2mjVx0lCjuZM00KQFgEpiRtOH2E="; - }; + build-system = [ pdm-backend ]; - build-system = [ pdm-backend ]; + dependencies = [ + rich-toolkit + typer + uvicorn + ] + ++ uvicorn.optional-dependencies.standard; - dependencies = [ - rich-toolkit - typer + optional-dependencies = { + standard = [ uvicorn + # FIXME package fastapi-cloud-cli ] ++ uvicorn.optional-dependencies.standard; + standard-no-fastapi-cloud-cli = [ + uvicorn + ] + ++ uvicorn.optional-dependencies.standard; + }; - optional-dependencies = { - standard = [ - uvicorn - # FIXME package fastapi-cloud-cli - ] - ++ uvicorn.optional-dependencies.standard; - standard-no-fastapi-cloud-cli = [ - uvicorn - ] - ++ uvicorn.optional-dependencies.standard; - }; - - doCheck = false; - - passthru.tests.pytest = self.overridePythonAttrs { doCheck = true; }; - # coverage - pythonImportsCheck = [ "fastapi_cli" ]; - - meta = { - description = "Run and manage FastAPI apps from the command line with FastAPI CLI"; - homepage = "https://github.com/fastapi/fastapi-cli"; - mainProgram = "fastapi"; - license = lib.licenses.mit; - # This package provides a `fastapi`-executable that is in conflict with the one from - # python3Packages.fastapi. Because this package is primarily used for the purpose of - # implementing the CLI for python3Packages.fastapi, we reduce the executable's priority - priority = 10; - }; + passthru.tests.pytest = finalAttrs.finalPackage.overridePythonAttrs { doCheck = true; }; + # coverage + pythonImportsCheck = [ "fastapi_cli" ]; + + meta = { + description = "Run and manage FastAPI apps from the command line with FastAPI CLI"; + homepage = "https://github.com/fastapi/fastapi-cli"; + mainProgram = "fastapi"; + license = lib.licenses.mit; + # This package provides a `fastapi`-executable that is in conflict with the one from + # python3Packages.fastapi. Because this package is primarily used for the purpose of + # implementing the CLI for python3Packages.fastapi, we reduce the executable's priority + priority = 10; }; -in -self +}) diff --git a/python/pkgs/fastapi-mcp/default.nix b/python/pkgs/fastapi-mcp/default.nix index 8a3a118e9..118587399 100644 --- a/python/pkgs/fastapi-mcp/default.nix +++ b/python/pkgs/fastapi-mcp/default.nix @@ -19,7 +19,7 @@ uvicorn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastapi-mcp"; version = "0.4.0"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tadata-org"; repo = "fastapi_mcp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TCmM5n6BF3CWEuGVSZnUL2rTYitKtn4vSCkiQvKFLKw="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/tadata-org/fastapi_mcp"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fastapi-pagination/default.nix b/python/pkgs/fastapi-pagination/default.nix index 2b745ed6d..b8ed6db91 100644 --- a/python/pkgs/fastapi-pagination/default.nix +++ b/python/pkgs/fastapi-pagination/default.nix @@ -16,7 +16,6 @@ buildPythonPackage (finalAttrs: { pname = "fastapi-pagination"; version = "0.15.16"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "uriyyo"; @@ -38,7 +37,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "fastapi_pagination" ]; # Tests require network access - doCheck = false; meta = { description = "FastAPI pagination"; diff --git a/python/pkgs/fastapi/default.nix b/python/pkgs/fastapi/default.nix index 2d0c7ce0d..fa7cd6266 100644 --- a/python/pkgs/fastapi/default.nix +++ b/python/pkgs/fastapi/default.nix @@ -26,7 +26,7 @@ pydantic-extra-types, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastapi"; version = "0.141.1"; pyproject = true; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5P9aDMS7gLti2CBlrucvjgl4Od1mti9ityPdqxI1RIM="; }; @@ -86,4 +86,4 @@ buildPythonPackage rec { homepage = "https://github.com/fastapi/fastapi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fastavro/default.nix b/python/pkgs/fastavro/default.nix index 0adb25420..7b4fb7681 100644 --- a/python/pkgs/fastavro/default.nix +++ b/python/pkgs/fastavro/default.nix @@ -8,7 +8,7 @@ zstandard, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastavro"; version = "1.12.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fastavro"; repo = "fastavro"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UeOfYM03Htqrh+lpBKWiAPgZTv63jpO/FZZRMSgW5Ug="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/fastavro/fastavro"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fastbencode/default.nix b/python/pkgs/fastbencode/default.nix index 2869c9e58..7be62b299 100644 --- a/python/pkgs/fastbencode/default.nix +++ b/python/pkgs/fastbencode/default.nix @@ -9,13 +9,13 @@ rustc, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastbencode"; version = "0.3.11"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fivkW/6BFnzXmYZpiizycOr2Gt1bG8cRN4wrs/BTltU="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/breezy-team/fastbencode"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/fastcache/default.nix b/python/pkgs/fastcache/default.nix index 2888e03bd..8837e9074 100644 --- a/python/pkgs/fastcache/default.nix +++ b/python/pkgs/fastcache/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastcache"; version = "1.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-beGxbnAzW3veJmcH60AaOq7CIPtmxdE7Aqvw6ri+eCs="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/pbrady/fastcache"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fastcan/default.nix b/python/pkgs/fastcan/default.nix index 9388f263b..c475a1571 100644 --- a/python/pkgs/fastcan/default.nix +++ b/python/pkgs/fastcan/default.nix @@ -19,7 +19,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastcan"; version = "0.6.0"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-learn-contrib"; repo = "fastcan"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SgvzmUY1GvSvbpyhwUpVwS8ZLVvtR2G1YwzS+mPo7ew="; }; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/scikit-learn-contrib/fastcan"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fastcore/default.nix b/python/pkgs/fastcore/default.nix index a7f90fffd..568788f9b 100644 --- a/python/pkgs/fastcore/default.nix +++ b/python/pkgs/fastcore/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ packaging ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "fastcore" ]; diff --git a/python/pkgs/fastdotcom/default.nix b/python/pkgs/fastdotcom/default.nix index 5580e9a4f..bff02a0d9 100644 --- a/python/pkgs/fastdotcom/default.nix +++ b/python/pkgs/fastdotcom/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastdotcom"; version = "0.0.7"; pyproject = true; src = fetchPypi { pname = "fastdotcom"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ozQ0d1CIIsMOdvK9UhRnr2c2fmIzkZcpjZrjZjfnknI="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "fastdotcom" ]; meta = { @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/nkgilley/fast.com"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fastdtw/default.nix b/python/pkgs/fastdtw/default.nix index 98c2b9a43..9259638f9 100644 --- a/python/pkgs/fastdtw/default.nix +++ b/python/pkgs/fastdtw/default.nix @@ -3,6 +3,8 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + # build-system + setuptools, cython, numpy, # Check Inputs @@ -10,18 +12,20 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastdtw"; version = "0.3.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "slaypni"; repo = "fastdtw"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0irc5x4ahfp7f7q4ic97qa898s2awi0vdjznahxrfjirn8b157dw"; }; + build-system = [ setuptools ]; + patches = [ # Removes outdated cythonized C++ file, which doesn't match CPython. Will be auto-used if left. # Remove when PR 40 merged @@ -33,7 +37,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; pythonImportsCheck = [ "fastdtw.fastdtw" ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -57,4 +61,4 @@ buildPythonPackage rec { homepage = "https://github.com/slaypni/fastdtw"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fasteners/default.nix b/python/pkgs/fasteners/default.nix index a417dd0d2..55cb841b8 100644 --- a/python/pkgs/fasteners/default.nix +++ b/python/pkgs/fasteners/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fasteners"; version = "0.20"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "harlowja"; repo = "fasteners"; - tag = version; + tag = finalAttrs.version; hash = "sha256-h8hlx3yl1+EgqCGE02O+wLejwxgJ5ZOs6nPrYUtHwn0="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Module that provides useful locks"; homepage = "https://github.com/harlowja/fasteners"; - changelog = "https://github.com/harlowja/fasteners/releases/tag/${version}"; + changelog = "https://github.com/harlowja/fasteners/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/fastentrypoints/default.nix b/python/pkgs/fastentrypoints/default.nix index 419f0230a..0c809a718 100644 --- a/python/pkgs/fastentrypoints/default.nix +++ b/python/pkgs/fastentrypoints/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastentrypoints"; version = "0.12"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/yhPFGm9ZUAFmYB9LGKE1bJROY5uKIEfX3f9JiKSQQs="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ninjaaron/fast-entry_points"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/fastexcel/default.nix b/python/pkgs/fastexcel/default.nix index 412346303..12fbc8a15 100644 --- a/python/pkgs/fastexcel/default.nix +++ b/python/pkgs/fastexcel/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { pname = "fastexcel"; version = "0.20.2"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "ToucanToco"; diff --git a/python/pkgs/fastgit/default.nix b/python/pkgs/fastgit/default.nix index b9b1630ca..013c76808 100644 --- a/python/pkgs/fastgit/default.nix +++ b/python/pkgs/fastgit/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "fastgit" ]; # Module has no tests - doCheck = false; meta = { description = "Module to use git"; diff --git a/python/pkgs/fastimport/default.nix b/python/pkgs/fastimport/default.nix index 9af8bc205..f1535502d 100644 --- a/python/pkgs/fastimport/default.nix +++ b/python/pkgs/fastimport/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastimport"; version = "0.9.16"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-agpvtWqjYH3nGtTnq9VRr+m9rJS6uNLddNjg+Y9S414="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "fastimport" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { description = "VCS fastimport/fastexport parser"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/fastjsonschema/default.nix b/python/pkgs/fastjsonschema/default.nix index de7e9510b..303d1d4c1 100644 --- a/python/pkgs/fastjsonschema/default.nix +++ b/python/pkgs/fastjsonschema/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastjsonschema"; version = "2.21.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "horejsek"; repo = "python-fastjsonschema"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-EV7/vPYeJSG2uTLpENso9WhcR98/ZTbanKffJfmfZz4="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://horejsek.github.io/python-fastjsonschema/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/fastlite/default.nix b/python/pkgs/fastlite/default.nix index 7f280b606..7753f3d5c 100644 --- a/python/pkgs/fastlite/default.nix +++ b/python/pkgs/fastlite/default.nix @@ -33,7 +33,6 @@ buildPythonPackage (finalAttrs: { ]; # No tests - doCheck = false; pythonImportsCheck = [ "fastlite" diff --git a/python/pkgs/fastmcp-slim/default.nix b/python/pkgs/fastmcp-slim/default.nix index 562d336d5..7403f45de 100644 --- a/python/pkgs/fastmcp-slim/default.nix +++ b/python/pkgs/fastmcp-slim/default.nix @@ -121,7 +121,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "fastmcp" ]; # tests are done in fastmcp package - doCheck = false; meta = { description = "Dependency-slim FastMCP package"; diff --git a/python/pkgs/fastmcp/default.nix b/python/pkgs/fastmcp/default.nix index de11541a8..430dd430a 100644 --- a/python/pkgs/fastmcp/default.nix +++ b/python/pkgs/fastmcp/default.nix @@ -15,7 +15,6 @@ buildPythonPackage (finalAttrs: { pname = "fastmcp"; version = "3.3.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "PrefectHQ"; diff --git a/python/pkgs/fastnumbers/default.nix b/python/pkgs/fastnumbers/default.nix index ffd027187..a1f23fd43 100644 --- a/python/pkgs/fastnumbers/default.nix +++ b/python/pkgs/fastnumbers/default.nix @@ -11,7 +11,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastnumbers"; version = "5.1.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SethMMorton"; repo = "fastnumbers"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7UjUkZPGsrtdQhgisI5IA37WvgGGiEXsey9NhATy064="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/SethMMorton/fastnumbers"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fastparquet/default.nix b/python/pkgs/fastparquet/default.nix index d394c6951..9642cf3c9 100644 --- a/python/pkgs/fastparquet/default.nix +++ b/python/pkgs/fastparquet/default.nix @@ -22,7 +22,7 @@ python-lzo, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastparquet"; version = "2026.5.0"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dask"; repo = "fastparquet"; - tag = version; + tag = finalAttrs.version; hash = "sha256-thvoMXXiGtHGcJ0/IrGujjhVAvSmTMGmrlDHjG8R7PQ="; }; @@ -63,4 +63,4 @@ buildPythonPackage rec { homepage = "https://github.com/dask/fastparquet"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/fastremap/default.nix b/python/pkgs/fastremap/default.nix index b4b41136d..1a76c8ccc 100644 --- a/python/pkgs/fastremap/default.nix +++ b/python/pkgs/fastremap/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastremap"; version = "1.19.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "seung-lab"; repo = "fastremap"; - tag = version; + tag = finalAttrs.version; hash = "sha256-fPDgCpCJrMomxr0dicM9NBqzH4s+/Ux37hTsnsGts2g="; }; @@ -32,7 +32,7 @@ buildPythonPackage rec { numpy ]; - env.PBR_VERSION = version; + env.PBR_VERSION = finalAttrs.version; nativeCheckInputs = [ pytestCheckHook @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/seung-lab/fastremap"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/fastrlock/default.nix b/python/pkgs/fastrlock/default.nix index b0c9bd9e9..b904ce2af 100644 --- a/python/pkgs/fastrlock/default.nix +++ b/python/pkgs/fastrlock/default.nix @@ -3,25 +3,28 @@ buildPythonPackage, cython, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastrlock"; version = "0.8.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "scoder"; repo = "fastrlock"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NB/AR6g1ZP5Atc0zwZNuXLsxg8BM67rWnx3Q6Pb0k5k="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ cython ]; # Todo: Check why the tests have an import error - doCheck = false; nativeCheckInputs = [ pytestCheckHook ]; @@ -32,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/scoder/fastrlock"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fastuuid/default.nix b/python/pkgs/fastuuid/default.nix index 4e3140924..4e10d522f 100644 --- a/python/pkgs/fastuuid/default.nix +++ b/python/pkgs/fastuuid/default.nix @@ -6,7 +6,7 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastuuid"; version = "0.14.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fastuuid"; repo = "fastuuid"; - tag = version; + tag = finalAttrs.version; hash = "sha256-EXyd94NR4P+FLPxDCa3LmwfpIHwGduoaPL0qULqcj00="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/fastuuid/fastuuid"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/faust-cchardet/default.nix b/python/pkgs/faust-cchardet/default.nix index 84ccba380..6ff618971 100644 --- a/python/pkgs/faust-cchardet/default.nix +++ b/python/pkgs/faust-cchardet/default.nix @@ -7,7 +7,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "faust-cchardet"; version = "3.2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "faust-streaming"; repo = "cChardet"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-jXMf553NsgXgjuvEMKEst8s8k6nE5868DvUPV3Udvvk="; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { postFixup = '' # fake cchardet distinfo, so packages that depend on cchardet # accept it as a drop-in replacement - ln -s $out/${python.sitePackages}/{faust_,}cchardet-${version}.dist-info + ln -s $out/${python.sitePackages}/{faust_,}cchardet-${finalAttrs.version}.dist-info ''; pythonImportsCheck = [ "cchardet" ]; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/faust-streaming/cChardet"; license = lib.licenses.mpl11; }; -} +}) diff --git a/python/pkgs/feather-format/default.nix b/python/pkgs/feather-format/default.nix index af87d83dd..ee7feee6d 100644 --- a/python/pkgs/feather-format/default.nix +++ b/python/pkgs/feather-format/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ pyarrow ]; pythonImportsCheck = [ "feather" ]; - doCheck = false; # no tests meta = { description = "Simple wrapper library to the Apache Arrow-based Feather File Format"; diff --git a/python/pkgs/fedora-messaging/default.nix b/python/pkgs/fedora-messaging/default.nix index a6a40e8bb..169749181 100644 --- a/python/pkgs/fedora-messaging/default.nix +++ b/python/pkgs/fedora-messaging/default.nix @@ -25,7 +25,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fedora-messaging"; version = "3.9.1"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fedora-infra"; repo = "fedora-messaging"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-384pvF/MgOReA52bfifa4Fuo79b9zUe+AK7vfIkFSf8="; }; @@ -79,4 +79,4 @@ buildPythonPackage rec { homepage = "https://github.com/fedora-infra/fedora-messaging"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/feedfinder2/default.nix b/python/pkgs/feedfinder2/default.nix index 81141e816..216d61840 100644 --- a/python/pkgs/feedfinder2/default.nix +++ b/python/pkgs/feedfinder2/default.nix @@ -10,13 +10,13 @@ beautifulsoup4, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "feedfinder2"; version = "0.0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NwHuAabIX4uGWgScMLoLRgiFjIA/6OMNHSif2+idDv4="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # no tests - doCheck = false; pythonImportsCheck = [ "feedfinder2" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/dfm/feedfinder2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/feedgen/default.nix b/python/pkgs/feedgen/default.nix index 272571049..d2a9352ba 100644 --- a/python/pkgs/feedgen/default.nix +++ b/python/pkgs/feedgen/default.nix @@ -7,13 +7,13 @@ lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "feedgen"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2b1Rw7XpVqKlKZjDcIxNLHKfL8wxEYjh5dO5cmOTVGo="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/lkiesow/python-feedgen"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/feedgenerator/default.nix b/python/pkgs/feedgenerator/default.nix index 02abe5d52..fbf86c71c 100644 --- a/python/pkgs/feedgenerator/default.nix +++ b/python/pkgs/feedgenerator/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "feedgenerator"; version = "2.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-DqqVXx8Ly1uHrBla90Dwb/n/9KQO0wuKfGu+uyZNTdE="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/getpelican/feedgenerator"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/feedparser/default.nix b/python/pkgs/feedparser/default.nix index 3683e2299..ff2a5de9d 100644 --- a/python/pkgs/feedparser/default.nix +++ b/python/pkgs/feedparser/default.nix @@ -6,13 +6,13 @@ sgmllib3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "feedparser"; version = "6.0.12"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZPds6Qrj6O9dHt4PjTtQzia8znHdiuXoKxzS1KX5Qig="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/kurtmckee/feedparser"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/ffmpeg-progress-yield/default.nix b/python/pkgs/ffmpeg-progress-yield/default.nix index 21f7c7d16..31aa6f26c 100644 --- a/python/pkgs/ffmpeg-progress-yield/default.nix +++ b/python/pkgs/ffmpeg-progress-yield/default.nix @@ -8,7 +8,7 @@ versionCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ffmpeg-progress-yield"; version = "1.1.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "slhck"; repo = "ffmpeg-progress-yield"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OEE23gzPYcjKjrar+aV2zZuZyhrvqkYPhnWC3GzefUI="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/slhck/ffmpeg-progress-yield"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fhir-py/default.nix b/python/pkgs/fhir-py/default.nix index 042c39fd2..2613e936d 100644 --- a/python/pkgs/fhir-py/default.nix +++ b/python/pkgs/fhir-py/default.nix @@ -14,7 +14,7 @@ responses, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fhir-py"; version = "2.3.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "beda-software"; repo = "fhir-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XPkWtzYtMPCcV7FbV89Qv/kfV7qu3ZT3XwcLDoJ392o="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/beda-software/fhir-py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fiblary3-fork/default.nix b/python/pkgs/fiblary3-fork/default.nix index f9bb1782b..ea931e9db 100644 --- a/python/pkgs/fiblary3-fork/default.nix +++ b/python/pkgs/fiblary3-fork/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, fixtures, jsonpatch, netaddr, @@ -14,17 +16,19 @@ testtools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fiblary3-fork"; version = "0.1.12"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "001wqh7gx2dv3sf7a5xsbppz9r88f5qwrp05jzjsjcm6cbcvmsz0"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ jsonpatch netaddr prettytable @@ -47,4 +51,4 @@ buildPythonPackage rec { description = "Fibaro Home Center API Python Library"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/fido2/default.nix b/python/pkgs/fido2/default.nix index b42c65495..9d8c6ade6 100644 --- a/python/pkgs/fido2/default.nix +++ b/python/pkgs/fido2/default.nix @@ -6,13 +6,13 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fido2"; version = "2.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hXh0KKlMP46vcvD/MK+6mDtVmhsbeVyTMYyBtK1AYsQ="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "Provides library functionality for FIDO 2.0, including communication with a device over USB"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/fields/default.nix b/python/pkgs/fields/default.nix index 33f717094..f5a273362 100644 --- a/python/pkgs/fields/default.nix +++ b/python/pkgs/fields/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fields"; version = "5.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-MdSqA9jUTjXfE8Qx3jUTaZfwR6kkpZfYT3vCCeG+Vyc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ionelmc/python-fields"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/file-read-backwards/default.nix b/python/pkgs/file-read-backwards/default.nix index 75b58731a..99b0e9c85 100644 --- a/python/pkgs/file-read-backwards/default.nix +++ b/python/pkgs/file-read-backwards/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "file-read-backwards"; version = "3.2.0"; pyproject = true; src = fetchPypi { pname = "file_read_backwards"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-VHjTBeuuquj+PGWFok38MmIXAiRFCsyTITmPDSbN0Qk="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/RobinNil/file_read_backwards"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/filebrowser-safe/default.nix b/python/pkgs/filebrowser-safe/default.nix index fce8cd4a3..67d2b8e8c 100644 --- a/python/pkgs/filebrowser-safe/default.nix +++ b/python/pkgs/filebrowser-safe/default.nix @@ -2,24 +2,27 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "filebrowser-safe"; version = "1.1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "filebrowser_safe"; - inherit version; + inherit (finalAttrs) version; sha256 = "499c5dbd9e112dfc436cae7713b2fb664a59015021f6c9d131e3b7980aeb5c94"; }; + build-system = [ setuptools ]; + buildInputs = [ django ]; # There is no test embedded - doCheck = false; meta = { description = "Snapshot of django-filebrowser for the Mezzanine CMS"; @@ -33,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/filecheck/default.nix b/python/pkgs/filecheck/default.nix index 308a3186f..cc3ba1c06 100644 --- a/python/pkgs/filecheck/default.nix +++ b/python/pkgs/filecheck/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "filecheck"; version = "1.0.6"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AntonLydike"; repo = "filecheck"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+UbfzCOEwwksgh0olZguD5iucdVPJQZMJnNM0135wuA="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { description = "Python-native clone of LLVMs FileCheck tool"; mainProgram = "filecheck"; }; -} +}) diff --git a/python/pkgs/filedate/default.nix b/python/pkgs/filedate/default.nix index 52edbf7e6..50c4d8488 100644 --- a/python/pkgs/filedate/default.nix +++ b/python/pkgs/filedate/default.nix @@ -6,7 +6,7 @@ python-dateutil, setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "filedate"; version = "3.0"; pyproject = true; @@ -14,11 +14,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kubinka0505"; repo = "filedate"; - rev = version; + tag = finalAttrs.version; hash = "sha256-HvuGP+QlUlfAUfFmaVVvtPHGdrbWVxghQipnqTTvAQc="; }; - sourceRoot = "${src.name}/Files"; + sourceRoot = "${finalAttrs.src.name}/Files"; # The repo stores everything in "src" and uses setup.py to move "src" -> # "filedate" before calling setup() and then tries to rename "filedate" back @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/kubinka0505/filedate"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/filedepot/default.nix b/python/pkgs/filedepot/default.nix index 81b852328..3ff142eda 100644 --- a/python/pkgs/filedepot/default.nix +++ b/python/pkgs/filedepot/default.nix @@ -16,7 +16,7 @@ sqlalchemy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "filedepot"; version = "0.12.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amol-"; repo = "depot"; - tag = version; + tag = finalAttrs.version; hash = "sha256-oDnGA2prxYUkC90ewryeJXTXED59vcZGHU9D0QiopFM="; }; @@ -65,4 +65,4 @@ buildPythonPackage rec { homepage = "https://github.com/amol-/depot"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/files-to-prompt/default.nix b/python/pkgs/files-to-prompt/default.nix index 6c811ca9b..7a84a7fbb 100644 --- a/python/pkgs/files-to-prompt/default.nix +++ b/python/pkgs/files-to-prompt/default.nix @@ -8,7 +8,7 @@ versionCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "files-to-prompt"; version = "0.6"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = "files-to-prompt"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LWp/DNP3bsh7/goQGkpi4x2N11tRuhLVh2J8H6AUH0w="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/simonw/files-to-prompt"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/filetype/default.nix b/python/pkgs/filetype/default.nix index a9b2b86ee..7b517b5b5 100644 --- a/python/pkgs/filetype/default.nix +++ b/python/pkgs/filetype/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "filetype"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZrVs1kdL9B2MVGYDR9N6/MP30ZcGSN42XBAu93VIqts="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/h2non/filetype.py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/finalfusion/default.nix b/python/pkgs/finalfusion/default.nix index 54b2c886c..a5ada36fd 100644 --- a/python/pkgs/finalfusion/default.nix +++ b/python/pkgs/finalfusion/default.nix @@ -1,6 +1,8 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lib, isPy3k, cython, @@ -9,23 +11,25 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "finalfusion"; version = "0.7.1"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchFromGitHub { owner = "finalfusion"; repo = "finalfusion-python"; - rev = version; + tag = finalAttrs.version; sha256 = "0pwzflamxqvpl1wcz0zbhhd6aa4xn18rmza6rggaic3ckidhyrh4"; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ + dependencies = [ numpy toml ]; @@ -54,4 +58,4 @@ buildPythonPackage rec { platforms = lib.platforms.all; license = lib.licenses.blueOak100; }; -} +}) diff --git a/python/pkgs/find-libpython/default.nix b/python/pkgs/find-libpython/default.nix index 532d3caa4..b3090dc23 100644 --- a/python/pkgs/find-libpython/default.nix +++ b/python/pkgs/find-libpython/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "find-libpython"; version = "0.5.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ktbarrett"; repo = "find_libpython"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-g2Gl+usa1mJMvvumynnoy/ckFTSrFA57o339t2j9lWQ="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "find_libpython"; }; -} +}) diff --git a/python/pkgs/findimports/default.nix b/python/pkgs/findimports/default.nix index ed220ab51..8169e7b51 100644 --- a/python/pkgs/findimports/default.nix +++ b/python/pkgs/findimports/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "findimports"; version = "3.0.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mgedmin"; repo = "findimports"; - tag = version; + tag = finalAttrs.version; hash = "sha256-3MYHl35FfStmyhBNvedIHIZQYTyBuRyg5OI3d3Mi57I="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { ]; mainProgram = "findimports"; }; -} +}) diff --git a/python/pkgs/findspark/default.nix b/python/pkgs/findspark/default.nix index 6a2a75b8c..44e91e2ab 100644 --- a/python/pkgs/findspark/default.nix +++ b/python/pkgs/findspark/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "findspark"; version = "2.0.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "minrk"; repo = "findspark"; - tag = version; + tag = finalAttrs.version; hash = "sha256-/+b1Pf+ySwlv6XP1wtHx1tx4WfYdu6GuxJVQkcX3MY8="; }; @@ -24,11 +24,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "findspark" ]; # No tests - doCheck = false; meta = { description = "Find pyspark to make it importable"; homepage = "https://github.com/minrk/findspark"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/fing-agent-api/default.nix b/python/pkgs/fing-agent-api/default.nix index 540b5312c..0b61c91cc 100644 --- a/python/pkgs/fing-agent-api/default.nix +++ b/python/pkgs/fing-agent-api/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ httpx ]; # upstream has no tests - doCheck = false; pythonImportsCheck = [ "fing_agent_api" ]; diff --git a/python/pkgs/fingerprints/default.nix b/python/pkgs/fingerprints/default.nix index 2f2e3b537..cdb8f72c9 100644 --- a/python/pkgs/fingerprints/default.nix +++ b/python/pkgs/fingerprints/default.nix @@ -6,7 +6,7 @@ normality, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fingerprints"; version = "1.3.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alephdata"; repo = "fingerprints"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Q+XCsuGMHPtOqB0SauVuYInR5FGMuG6aNhqiAwTJvSI="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/alephdata/fingerprints"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/finitude/default.nix b/python/pkgs/finitude/default.nix index 0a49a850c..e15f6130d 100644 --- a/python/pkgs/finitude/default.nix +++ b/python/pkgs/finitude/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "finitude"; version = "0.1.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dulitz"; repo = "finitude"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yCI5UCRDhw+dJoTKyjmHbAGBm3by2AyxHKlqCywnLcs="; }; @@ -31,7 +31,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "finitude" ]; @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/dulitz/finitude"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fire/default.nix b/python/pkgs/fire/default.nix index 9cc16b882..43aa86ca8 100644 --- a/python/pkgs/fire/default.nix +++ b/python/pkgs/fire/default.nix @@ -11,7 +11,7 @@ pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fire"; version = "0.7.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = "python-fire"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TZLL7pzX8xPtB/9k3l5395eHrNojmqTH7PfB1kf99Io="; }; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/python-fire"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/firecrawl-py/default.nix b/python/pkgs/firecrawl-py/default.nix index 804604d78..bf002e9b4 100644 --- a/python/pkgs/firecrawl-py/default.nix +++ b/python/pkgs/firecrawl-py/default.nix @@ -39,7 +39,6 @@ buildPythonPackage (finalAttrs: { ]; # No tests - doCheck = false; pythonImportsCheck = [ "firecrawl" ]; diff --git a/python/pkgs/fireflyalgorithm/default.nix b/python/pkgs/fireflyalgorithm/default.nix index db64473ba..1f2d89421 100644 --- a/python/pkgs/fireflyalgorithm/default.nix +++ b/python/pkgs/fireflyalgorithm/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fireflyalgorithm"; version = "0.4.7"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "firefly-cpp"; repo = "FireflyAlgorithm"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Zq1XaiEqfL+SmJu55rzVDXYBF2qyziviqw6qL+dcIb0="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/firefly-cpp/FireflyAlgorithm"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/first/default.nix b/python/pkgs/first/default.nix index f9796ee8f..8923e0cdf 100644 --- a/python/pkgs/first/default.nix +++ b/python/pkgs/first/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "first"; version = "2.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/yhbCMVfjJfOTqcBJ0OvJJXJ8SkXhfFjcivTb2r2078="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/hynek/first/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fiscalyear/default.nix b/python/pkgs/fiscalyear/default.nix index 4c728436b..6c5cd5ce8 100644 --- a/python/pkgs/fiscalyear/default.nix +++ b/python/pkgs/fiscalyear/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fiscalyear"; version = "0.4.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adamjstewart"; repo = "fiscalyear"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2wejJRTmVHWiM8LoodyaOyMbMqCx5It6JHCQUWpGsxs="; }; @@ -22,11 +22,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "fiscalyear" ]; # upstream has no tests - doCheck = false; meta = { description = "Utilities for managing the fiscal calendar"; homepage = "https://github.com/adamjstewart/fiscalyear"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fish-audio-sdk/default.nix b/python/pkgs/fish-audio-sdk/default.nix index 120953481..efa5a43b1 100644 --- a/python/pkgs/fish-audio-sdk/default.nix +++ b/python/pkgs/fish-audio-sdk/default.nix @@ -42,7 +42,6 @@ buildPythonPackage (finalAttrs: { ]; # tests require network access and a valid API key - doCheck = false; pythonImportsCheck = [ "fishaudio" diff --git a/python/pkgs/fissix/default.nix b/python/pkgs/fissix/default.nix index 6b355b020..2b3c6a5aa 100644 --- a/python/pkgs/fissix/default.nix +++ b/python/pkgs/fissix/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "amyreese"; repo = "fissix"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-geGctke+1PWFqJyiH1pQ0zWj9wVIjV/SQ5njOOk9gOw="; }; diff --git a/python/pkgs/fitbit-web-api/default.nix b/python/pkgs/fitbit-web-api/default.nix index 78eb3da50..90d027563 100644 --- a/python/pkgs/fitbit-web-api/default.nix +++ b/python/pkgs/fitbit-web-api/default.nix @@ -13,7 +13,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fitbit-web-api"; version = "2.15.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "allenporter"; repo = "fitbit-web-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1XqUhQQRTlEOIbZGzRx9CvJVAE50Enu+4fQXpOgNPdA="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/allenporter/fitbit-web-api"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/fitbit/default.nix b/python/pkgs/fitbit/default.nix index 2deb326e0..5e0c91788 100644 --- a/python/pkgs/fitbit/default.nix +++ b/python/pkgs/fitbit/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, freezegun, mock, pytestCheckHook, @@ -10,24 +12,26 @@ requests-oauthlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fitbit"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "orcasgit"; repo = "python-fitbit"; - rev = version; + tag = finalAttrs.version; hash = "sha256-1u3h47lRBrJ7EUWBl5+RLGW4KHHqXqqrXbboZdy7VPA="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace fitbit_tests/test_api.py \ --replace-fail assertRaisesRegexp assertRaisesRegex ''; - propagatedBuildInputs = [ + dependencies = [ python-dateutil requests-oauthlib ]; @@ -46,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/orcasgit/python-fitbit"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/fitdecode/default.nix b/python/pkgs/fitdecode/default.nix index fa6f1095f..15dc126bb 100644 --- a/python/pkgs/fitdecode/default.nix +++ b/python/pkgs/fitdecode/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fitdecode"; version = "0.11.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "polyvertex"; repo = "fitdecode"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3NoJHPql5mVQ+h2InM8tp7LIuR2znJyaawISarr688Q="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.mit; homepage = "https://github.com/polyvertex/fitdecode"; }; -} +}) diff --git a/python/pkgs/fitfile/default.nix b/python/pkgs/fitfile/default.nix index f21d6804c..98a49a10a 100644 --- a/python/pkgs/fitfile/default.nix +++ b/python/pkgs/fitfile/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fitfile"; version = "1.0.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tcgoetz"; repo = "fit"; - tag = version; + tag = finalAttrs.version; hash = "sha256-NIshX/IkPmqviYRPT4wRF7evZwn9e7BdCI5x+2Pz7II="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Only; homepage = "https://github.com/tcgoetz/fit"; }; -} +}) diff --git a/python/pkgs/fitparse/default.nix b/python/pkgs/fitparse/default.nix index 867a3f0e1..dad32cdc4 100644 --- a/python/pkgs/fitparse/default.nix +++ b/python/pkgs/fitparse/default.nix @@ -5,7 +5,7 @@ lib, setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fitparse"; version = "1.2.0"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dtcooper"; repo = "python-fitparse"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aO4djG9omc0jogalLitvT5i58cYKXqtvJ5WGBiCv448="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://pythonhosted.org/fitparse/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fivem-api/default.nix b/python/pkgs/fivem-api/default.nix index fdef8ee1f..5a993cb8a 100644 --- a/python/pkgs/fivem-api/default.nix +++ b/python/pkgs/fivem-api/default.nix @@ -3,25 +3,28 @@ aiohttp, buildPythonPackage, fetchPypi, + # build-system + setuptools, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fivem-api"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6llrMGWbDRmysEw+B6B115hLS5xlktQEXiSHzPLbV5s="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "fivem" ]; @@ -30,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/Sander0542/fivem-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fixerio/default.nix b/python/pkgs/fixerio/default.nix index 7be68a354..0e889094a 100644 --- a/python/pkgs/fixerio/default.nix +++ b/python/pkgs/fixerio/default.nix @@ -2,25 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, requests, pytestCheckHook, httpretty, responses, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fixerio"; version = "1.0.0-alpha"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "amatellanes"; repo = "fixerio"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "009h1mys175xdyznn5bl980vly40544s4ph1zcgqwg2i2ic93gvb"; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ httpretty @@ -49,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/amatellanes/fixerio"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fixtures/default.nix b/python/pkgs/fixtures/default.nix index adb031965..80c0f42c9 100644 --- a/python/pkgs/fixtures/default.nix +++ b/python/pkgs/fixtures/default.nix @@ -8,13 +8,13 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fixtures"; version = "4.3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-t9tkAUcyUT8j0SsMSa5Se6DAwfJmfsl9kTbWcVfrzl0="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/testing-cabal/fixtures"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/flake8-blind-except/default.nix b/python/pkgs/flake8-blind-except/default.nix index 4bf84d8c2..2b37a2680 100644 --- a/python/pkgs/flake8-blind-except/default.nix +++ b/python/pkgs/flake8-blind-except/default.nix @@ -6,13 +6,13 @@ pycodestyle, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flake8-blind-except"; version = "0.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8lpXWp3LPus8dgv5wi22C4taIxICJO0fqppD913X3RY="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/elijahandrews/flake8-blind-except"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flake8-bugbear/default.nix b/python/pkgs/flake8-bugbear/default.nix index e2632ab66..8b9507582 100644 --- a/python/pkgs/flake8-bugbear/default.nix +++ b/python/pkgs/flake8-bugbear/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flake8-bugbear"; version = "25.11.29"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; repo = "flake8-bugbear"; - tag = version; + tag = finalAttrs.version; hash = "sha256-aIcLCUUiXVzt9aDllXmm0TqIDxwTa3zcs6Yc2H5LnWY="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { ''; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flake8-class-newline/default.nix b/python/pkgs/flake8-class-newline/default.nix index fad3df78e..351a9463f 100644 --- a/python/pkgs/flake8-class-newline/default.nix +++ b/python/pkgs/flake8-class-newline/default.nix @@ -6,13 +6,13 @@ flake8, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flake8-class-newline"; version = "1.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-UUxJI8iOuLPdUttLVbjTSDUg24nbgK9rqBKkrxVCH/E="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/alexandervaneck/flake8-class-newline"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flake8-debugger/default.nix b/python/pkgs/flake8-debugger/default.nix index 5d0544796..83726ee8f 100644 --- a/python/pkgs/flake8-debugger/default.nix +++ b/python/pkgs/flake8-debugger/default.nix @@ -7,13 +7,13 @@ pycodestyle, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flake8-debugger"; version = "4.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-UrACVglB422b+Ab8olI9x/uFYKKV1fGm4VrC3tenOEA="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/jbkahn/flake8-debugger"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flake8-deprecated/default.nix b/python/pkgs/flake8-deprecated/default.nix index 73c8b58ce..161f19ac5 100644 --- a/python/pkgs/flake8-deprecated/default.nix +++ b/python/pkgs/flake8-deprecated/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flake8-deprecated"; version = "2.3.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gforcada"; repo = "flake8-deprecated"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KF0hWhMZEWuSPUyfStayNa5Nfss9NpTvMXPeemWbQXU="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/gforcada/flake8-deprecated"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/flake8-docstrings/default.nix b/python/pkgs/flake8-docstrings/default.nix index b9bc6216e..24b1499b0 100644 --- a/python/pkgs/flake8-docstrings/default.nix +++ b/python/pkgs/flake8-docstrings/default.nix @@ -11,14 +11,14 @@ pydocstyle, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flake8-docstrings"; version = "1.7.0"; pyproject = true; src = fetchPypi { pname = "flake8_docstrings"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-TIzHSNwW5oaXKGmeXQ1oXamhCw6nGOCQsboIjmepQa8="; }; @@ -29,8 +29,6 @@ buildPythonPackage rec { pydocstyle ]; - doCheck = false; - pythonImportsCheck = [ "flake8_docstrings" ]; meta = { @@ -38,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/pycqa/flake8-docstrings"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flake8-import-order/default.nix b/python/pkgs/flake8-import-order/default.nix index 21f78efa3..0ea1736b5 100644 --- a/python/pkgs/flake8-import-order/default.nix +++ b/python/pkgs/flake8-import-order/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flake8-import-order"; version = "0.19.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; repo = "flake8-import-order"; - tag = version; + tag = finalAttrs.version; hash = "sha256-mXw3+pQMr2Ut1prj9sCZc4jyErDOyWJgq6OBPU1nZxs="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/PyCQA/flake8-import-order"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/flake8-length/default.nix b/python/pkgs/flake8-length/default.nix index 703d20ad3..a0322c489 100644 --- a/python/pkgs/flake8-length/default.nix +++ b/python/pkgs/flake8-length/default.nix @@ -7,19 +7,19 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flake8-length"; version = "0.3.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Dr1hTCU2G1STczXJsUPMGFYs1NpIAk1I95vxXsRTtRA="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ flake8 ]; + dependencies = [ flake8 ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/orsinium-labs/flake8-length"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flake8-polyfill/default.nix b/python/pkgs/flake8-polyfill/default.nix index 7d4c10cf5..644325c6b 100644 --- a/python/pkgs/flake8-polyfill/default.nix +++ b/python/pkgs/flake8-polyfill/default.nix @@ -10,13 +10,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flake8-polyfill"; version = "1.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4"; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { description = "Polyfill package for Flake8 plugins"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flake8-quotes/default.nix b/python/pkgs/flake8-quotes/default.nix index 048e14b30..de8705187 100644 --- a/python/pkgs/flake8-quotes/default.nix +++ b/python/pkgs/flake8-quotes/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flake8-quotes"; version = "3.4.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zheller"; repo = "flake8-quotes"; - tag = version; + tag = finalAttrs.version; hash = "sha256-A8PBdYQzOBpMYBQGchZouuZiZqmwhhjp2PJblnNZOFU="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/zheller/flake8-quotes/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flake8/default.nix b/python/pkgs/flake8/default.nix index 9f22735ba..76594bd52 100644 --- a/python/pkgs/flake8/default.nix +++ b/python/pkgs/flake8/default.nix @@ -9,7 +9,7 @@ pyflakes, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flake8"; version = "7.3.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; repo = "flake8"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dZFIGyjqkd+MRz9NoOEcMuR9ZshFb/h+zO2OJZsQajc="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "flake8"; }; -} +}) diff --git a/python/pkgs/flaky/default.nix b/python/pkgs/flaky/default.nix index 49e0794fa..75089416f 100644 --- a/python/pkgs/flaky/default.nix +++ b/python/pkgs/flaky/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flaky"; version = "3.8.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RyBKgeyQXz1az71h2uq8raj51AMWFtm8sGGEYXKWmfU="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "flaky" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { description = "Plugin for nose or py.test that automatically reruns flaky tests"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/flammkuchen/default.nix b/python/pkgs/flammkuchen/default.nix index d4344c5d4..7f4b8cb50 100644 --- a/python/pkgs/flammkuchen/default.nix +++ b/python/pkgs/flammkuchen/default.nix @@ -11,13 +11,13 @@ tables, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flammkuchen"; version = "1.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-z68HBsU9J6oe8+YL4OOQiMYQRs3TZUDM+e2ssqo6BFI="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { description = "Flexible HDF5 saving/loading library forked from deepdish (University of Chicago) and maintained by the Portugues lab"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flasgger/default.nix b/python/pkgs/flasgger/default.nix index 25c1eec30..c34f891be 100644 --- a/python/pkgs/flasgger/default.nix +++ b/python/pkgs/flasgger/default.nix @@ -12,13 +12,13 @@ werkzeug, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flasgger"; version = "0.9.7.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ygmOEL+7EvBHrMYpnMcKM4UZQ6dG5VDYbmXmDU3yRfs="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/flasgger/flasgger"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flashtext/default.nix b/python/pkgs/flashtext/default.nix index d450e8abb..403e67d71 100644 --- a/python/pkgs/flashtext/default.nix +++ b/python/pkgs/flashtext/default.nix @@ -2,24 +2,27 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flashtext"; version = "2.7"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1kq5idfp9skqkjdcld40igxn2yqjly8jpmxawkp0skwxw29jpgm1"; }; + build-system = [ setuptools ]; + # json files that tests look for don't exist in the pypi dist - doCheck = false; meta = { homepage = "https://github.com/vi3k6i5/flashtext"; description = "Python package to replace keywords in sentences or extract keywords from sentences"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-admin/default.nix b/python/pkgs/flask-admin/default.nix index ed7a84fed..fa0e310f1 100644 --- a/python/pkgs/flask-admin/default.nix +++ b/python/pkgs/flask-admin/default.nix @@ -49,7 +49,7 @@ psycopg2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-admin"; version = "2.2.0"; pyproject = true; @@ -57,7 +57,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "flask-admin"; repo = "flask-admin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lRLyGvCat6nBixFKkrn4NxeVF52Hl32admAL37mf9wc="; }; @@ -80,7 +80,7 @@ buildPythonPackage rec { flask-sqlalchemy-lite ]; sqlalchemy-with-utils = - optional-dependencies.sqlalchemy + finalAttrs.optional-dependencies.sqlalchemy ++ [ arrow colour @@ -88,7 +88,7 @@ buildPythonPackage rec { sqlalchemy-utils ] ++ lib.optional (sqlalchemy-citext != null) sqlalchemy-citext; - geoalchemy = optional-dependencies.sqlalchemy ++ [ + geoalchemy = finalAttrs.optional-dependencies.sqlalchemy ++ [ geoalchemy2 shapely ]; @@ -105,18 +105,18 @@ buildPythonPackage rec { rediscli = [ redis ]; translation = [ flask-babel ]; all = lib.flatten [ - optional-dependencies.sqlalchemy - optional-dependencies.sqlalchemy-with-utils - optional-dependencies.geoalchemy - optional-dependencies.pymongo - optional-dependencies.mongoengine - optional-dependencies.peewee - optional-dependencies.s3 - optional-dependencies.azure-blob-storage - optional-dependencies.images - optional-dependencies.export - optional-dependencies.rediscli - optional-dependencies.translation + finalAttrs.optional-dependencies.sqlalchemy + finalAttrs.optional-dependencies.sqlalchemy-with-utils + finalAttrs.optional-dependencies.geoalchemy + finalAttrs.optional-dependencies.pymongo + finalAttrs.optional-dependencies.mongoengine + finalAttrs.optional-dependencies.peewee + finalAttrs.optional-dependencies.s3 + finalAttrs.optional-dependencies.azure-blob-storage + finalAttrs.optional-dependencies.images + finalAttrs.optional-dependencies.export + finalAttrs.optional-dependencies.rediscli + finalAttrs.optional-dependencies.translation ]; }; pythonImportsCheck = [ "flask_admin" ]; @@ -126,4 +126,4 @@ buildPythonPackage rec { homepage = "https://github.com/flask-admin/flask-admin/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-allowed-hosts/default.nix b/python/pkgs/flask-allowed-hosts/default.nix index bd0336ec5..0a031e713 100644 --- a/python/pkgs/flask-allowed-hosts/default.nix +++ b/python/pkgs/flask-allowed-hosts/default.nix @@ -6,13 +6,13 @@ flask, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-allowed-hosts"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "flask_allowed_hosts"; hash = "sha256-LL0Vm33R0BYo8IKyjAzpvO7ls4EfcPx3cx3OU6OsE6s="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/riad-azz/flask-allowedhosts"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-api/default.nix b/python/pkgs/flask-api/default.nix index 125ff3a4d..cdd3c4a63 100644 --- a/python/pkgs/flask-api/default.nix +++ b/python/pkgs/flask-api/default.nix @@ -15,7 +15,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-api"; version = "3.1"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "flask-api"; repo = "flask-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nHgeI5FLKkDp4uWO+0eaT4YSOMkeQ0wE3ffyJF+WzTM="; }; @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ flask ]; + dependencies = [ flask ]; nativeCheckInputs = [ markdown @@ -49,4 +49,4 @@ buildPythonPackage rec { description = "Browsable web APIs for Flask"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/flask-appbuilder/default.nix b/python/pkgs/flask-appbuilder/default.nix index b5ed61005..11dc55924 100644 --- a/python/pkgs/flask-appbuilder/default.nix +++ b/python/pkgs/flask-appbuilder/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, apispec, colorama, click, @@ -24,18 +26,20 @@ sqlalchemy-utils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-appbuilder"; version = "5.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "Flask-AppBuilder"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-9Xe5gqGuQLwhMjjO25PDnGfPIZmqHgBuCH6hs1B9VFA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ apispec colorama click @@ -74,4 +78,4 @@ buildPythonPackage rec { homepage = "https://github.com/dpgaspar/flask-appbuilder/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-apscheduler/default.nix b/python/pkgs/flask-apscheduler/default.nix index cadfdce1c..e38043e40 100644 --- a/python/pkgs/flask-apscheduler/default.nix +++ b/python/pkgs/flask-apscheduler/default.nix @@ -10,16 +10,15 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-apscheduler"; version = "1.13.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "viniciuschiele"; repo = "flask-apscheduler"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0gZueUuBBpKGWE6OCJiJL/EEIMqCVc3hgLKwIWFuSZI="; }; @@ -43,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/viniciuschiele/flask-apscheduler"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/flask-assets/default.nix b/python/pkgs/flask-assets/default.nix index b8a7b6e7f..4e1c8c4fe 100644 --- a/python/pkgs/flask-assets/default.nix +++ b/python/pkgs/flask-assets/default.nix @@ -8,7 +8,7 @@ webassets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-assets"; version = "2.1.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miracle2k"; repo = "flask-assets"; - tag = version; + tag = finalAttrs.version; hash = "sha256-R6cFTT+r/i5j5/QQ+cCFmeuO7SNTiV1F+e0JTxwIUGY="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { description = "Asset management for Flask, to compress and merge CSS and Javascript files"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/flask-babel/default.nix b/python/pkgs/flask-babel/default.nix index 252ad8fb6..af7402f0e 100644 --- a/python/pkgs/flask-babel/default.nix +++ b/python/pkgs/flask-babel/default.nix @@ -9,14 +9,14 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-babel"; version = "4.0.0"; pyproject = true; src = fetchPypi { pname = "flask_babel"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-2+q0Ano/SodnihFoZJbpjhSS63k8vdd6tQ9OmiYCpZM="; }; @@ -31,11 +31,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "flask_babel" ]; - doCheck = false; - meta = { homepage = "https://github.com/python-babel/flask-babel"; description = "Adds i18n/l10n support to Flask applications"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/flask-bcrypt/default.nix b/python/pkgs/flask-bcrypt/default.nix index a02e00084..8afa0d401 100644 --- a/python/pkgs/flask-bcrypt/default.nix +++ b/python/pkgs/flask-bcrypt/default.nix @@ -2,23 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, flask, bcrypt, unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-bcrypt"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "maxcountryman"; repo = "flask-bcrypt"; - rev = version; + tag = finalAttrs.version; hash = "sha256-WlIholi/nzq6Ikc0LS6FhG0Q5Kz0kvvAlA2YJ7EksZ4="; }; + build-system = [ setuptools ]; + postPatch = '' # Backport fix for test_long_password from upstream PR: https://github.com/maxcountryman/flask-bcrypt/pull/96 substituteInPlace test_bcrypt.py \ @@ -26,7 +30,7 @@ buildPythonPackage rec { "self.assertTrue(self.bcrypt.check_password_hash(pw_hash, 'A' * 72))" ''; - propagatedBuildInputs = [ + dependencies = [ flask bcrypt ]; @@ -40,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/maxcountryman/flask-bcrypt"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-bootstrap/default.nix b/python/pkgs/flask-bootstrap/default.nix index 45a44d028..4c1285e7f 100644 --- a/python/pkgs/flask-bootstrap/default.nix +++ b/python/pkgs/flask-bootstrap/default.nix @@ -10,7 +10,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-bootstrap"; version = "3.3.7.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mbr"; repo = "flask-bootstrap"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TsRSNhrI1jZU/beX3G7LM64IrFagD6AYiluoGzy12jE="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { description = "Ready-to-use Twitter-bootstrap for use in Flask"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/flask-caching/default.nix b/python/pkgs/flask-caching/default.nix index 02c75acef..0d5eea026 100644 --- a/python/pkgs/flask-caching/default.nix +++ b/python/pkgs/flask-caching/default.nix @@ -7,14 +7,14 @@ flask, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-caching"; version = "2.5.1"; pyproject = true; src = fetchPypi { pname = "flask_caching"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-91tFH94/qsDieNpyJjgYE03sqMS6a7B7mzsjiZE2ja4="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/pallets-eco/flask-caching"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-compress/default.nix b/python/pkgs/flask-compress/default.nix index 7033397cf..2d34084dc 100644 --- a/python/pkgs/flask-compress/default.nix +++ b/python/pkgs/flask-compress/default.nix @@ -13,14 +13,14 @@ flask, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-compress"; version = "1.24"; pyproject = true; src = fetchPypi { pname = "flask_compress"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-FAl87+Weyz5GbVKmrrYvNPElqffa3x8zpT5DDOSlDzE="; }; @@ -40,8 +40,6 @@ buildPythonPackage rec { --replace-fail "setuptools_scm[toml]<8" "setuptools_scm" ''; - doCheck = false; - pythonImportsCheck = [ "flask_compress" ]; meta = { @@ -49,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/colour-science/flask-compress"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-cors/default.nix b/python/pkgs/flask-cors/default.nix index b82ca1639..f49c4fde6 100644 --- a/python/pkgs/flask-cors/default.nix +++ b/python/pkgs/flask-cors/default.nix @@ -12,7 +12,7 @@ werkzeug, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-cors"; version = "6.0.5"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "corydolphin"; repo = "flask-cors"; - tag = version; + tag = finalAttrs.version; hash = "sha256-fngKJm7/7BMcWPPFncTCWw2sL1UJ0t4ICpXr95yNpbg="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/corydolphin/flask-cors"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-dance/default.nix b/python/pkgs/flask-dance/default.nix index 320a13a7a..8afeba82c 100644 --- a/python/pkgs/flask-dance/default.nix +++ b/python/pkgs/flask-dance/default.nix @@ -21,7 +21,7 @@ werkzeug, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-dance"; version = "7.1.0"; pyproject = true; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "singingwolfboy"; repo = "flask-dance"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rKHC0G5S7l52QSrbbweMii68AZuBAgf6tYsJdPKIeUk="; }; @@ -59,7 +59,7 @@ buildPythonPackage rec { pytestCheckHook responses ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; pythonImportsCheck = [ "flask_dance" ]; @@ -68,4 +68,4 @@ buildPythonPackage rec { homepage = "https://github.com/singingwolfboy/flask-dance"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-elastic/default.nix b/python/pkgs/flask-elastic/default.nix index eae690fb0..7eb7685e9 100644 --- a/python/pkgs/flask-elastic/default.nix +++ b/python/pkgs/flask-elastic/default.nix @@ -2,30 +2,33 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, flask, elasticsearch, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-elastic"; version = "0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "Flask-Elastic"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-XwGm/FQbXSV2qbAlHyAbT4DLcQnIseDm1Qqdb5zjE0M="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ flask elasticsearch ]; - doCheck = false; # no tests meta = { description = "Integrates official client for Elasticsearch into Flask"; license = lib.licenses.bsd3; homepage = "https://github.com/marceltschoppch/flask-elastic"; }; -} +}) diff --git a/python/pkgs/flask-expects-json/default.nix b/python/pkgs/flask-expects-json/default.nix index a6d44438e..bb575c465 100644 --- a/python/pkgs/flask-expects-json/default.nix +++ b/python/pkgs/flask-expects-json/default.nix @@ -13,12 +13,10 @@ buildPythonPackage (finalAttrs: { version = "1.7.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "Fischerfredl"; repo = "flask-expects-json"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-CUxuwqjjAb9Fy6xWtX1WtSANYaYr5//vY8k89KghYoQ="; }; diff --git a/python/pkgs/flask-gravatar/default.nix b/python/pkgs/flask-gravatar/default.nix index 8fda96799..b9686c95e 100644 --- a/python/pkgs/flask-gravatar/default.nix +++ b/python/pkgs/flask-gravatar/default.nix @@ -16,14 +16,14 @@ pygments, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-gravatar"; version = "0.5.0"; pyproject = true; src = fetchPypi { pname = "Flask-Gravatar"; - inherit version; + inherit (finalAttrs) version; sha256 = "YGZfMcLGEokdto/4Aek+06CIHGyOw0arxk0qmSP1YuE="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { description = "Small and simple integration of gravatar into flask"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-httpauth/default.nix b/python/pkgs/flask-httpauth/default.nix index e5dbe5ec9..336b9e28e 100644 --- a/python/pkgs/flask-httpauth/default.nix +++ b/python/pkgs/flask-httpauth/default.nix @@ -6,14 +6,14 @@ flask, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-httpauth"; version = "4.8.1"; pyproject = true; src = fetchPypi { pname = "flask_httpauth"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-iEmbIvE1OJN0PDzWjyylYcStnvdc1rzH9iEWHNDoB0Q="; }; @@ -21,8 +21,6 @@ buildPythonPackage rec { dependencies = [ flask ]; - doCheck = false; - pythonImportsCheck = [ "flask_httpauth" ]; meta = { @@ -30,4 +28,4 @@ buildPythonPackage rec { description = "Extension that provides HTTP authentication for Flask routes"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-jwt-extended/default.nix b/python/pkgs/flask-jwt-extended/default.nix index 3c6a7c4bb..cab44fd55 100644 --- a/python/pkgs/flask-jwt-extended/default.nix +++ b/python/pkgs/flask-jwt-extended/default.nix @@ -13,14 +13,14 @@ werkzeug, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-jwt-extended"; version = "4.7.4"; pyproject = true; src = fetchPypi { pname = "flask_jwt_extended"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-eP0PRgMX+s86AISmRX/68vHdqe771Xb5TOo1sOrdVTE="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://flask-jwt-extended.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-limiter/default.nix b/python/pkgs/flask-limiter/default.nix index 8187e360a..7170f0b7a 100644 --- a/python/pkgs/flask-limiter/default.nix +++ b/python/pkgs/flask-limiter/default.nix @@ -18,7 +18,7 @@ rich, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-limiter"; version = "4.1.1"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alisaifee"; repo = "flask-limiter"; - tag = version; + tag = finalAttrs.version; hash = "sha256-lrq4WCc2gxm039nXW6tiDt7laJFEICO0x9jw71UUwaI="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://flask-limiter.readthedocs.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-login/default.nix b/python/pkgs/flask-login/default.nix index e8369baf8..a7da097f0 100644 --- a/python/pkgs/flask-login/default.nix +++ b/python/pkgs/flask-login/default.nix @@ -7,14 +7,14 @@ werkzeug, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-login"; version = "0.6.3"; pyproject = true; src = fetchPypi { pname = "Flask-Login"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-XiPRSmB+8SgGxplZC4nQ8ODWe67sWZ11lHv5wUczAzM="; }; @@ -25,8 +25,6 @@ buildPythonPackage rec { werkzeug ]; - doCheck = false; - pythonImportsCheck = [ "flask_login" ]; meta = { @@ -34,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/maxcountryman/flask-login"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-mail/default.nix b/python/pkgs/flask-mail/default.nix index c562058a5..4f8812fbf 100644 --- a/python/pkgs/flask-mail/default.nix +++ b/python/pkgs/flask-mail/default.nix @@ -11,14 +11,14 @@ flask, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-mail"; version = "0.10.0"; pyproject = true; src = fetchPypi { pname = "flask_mail"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-RAg+ewK7zOeSIJwGJS+Fad1aMlp6qnav5zMEIr2XiB0="; }; @@ -29,8 +29,6 @@ buildPythonPackage rec { flask ]; - doCheck = false; - pythonImportsCheck = [ "flask_mail" ]; meta = { @@ -38,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/pallets-eco/flask-mail"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-mailman/default.nix b/python/pkgs/flask-mailman/default.nix index 074e84ff0..e0e4c13b5 100644 --- a/python/pkgs/flask-mailman/default.nix +++ b/python/pkgs/flask-mailman/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-mailman"; version = "1.1.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "waynerv"; repo = "flask-mailman"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0kD3rxFDJ7FcmBLVju75z1nf6U/7XfjiLD/oM/VP4jQ="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { description = "Flask extension providing simple email sending capabilities"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-marshmallow/default.nix b/python/pkgs/flask-marshmallow/default.nix index 9ab729bef..287f21a3d 100644 --- a/python/pkgs/flask-marshmallow/default.nix +++ b/python/pkgs/flask-marshmallow/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-marshmallow"; version = "1.5.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "marshmallow-code"; repo = "flask-marshmallow"; - tag = version; + tag = finalAttrs.version; hash = "sha256-IzeVVkyf4BRxtUVQIfzAvyjaKG+BLwhruXZHFJ6iGmw="; }; @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.sqlalchemy; + nativeCheckInputs = [ pytestCheckHook ] ++ finalAttrs.optional-dependencies.sqlalchemy; pythonImportsCheck = [ "flask_marshmallow" ]; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/marshmallow-code/flask-marshmallow"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-migrate/default.nix b/python/pkgs/flask-migrate/default.nix index 3387577ae..eba04ffdb 100644 --- a/python/pkgs/flask-migrate/default.nix +++ b/python/pkgs/flask-migrate/default.nix @@ -12,14 +12,14 @@ flask-sqlalchemy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-migrate"; version = "4.1.0"; pyproject = true; src = fetchPypi { pname = "flask_migrate"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-GjNrBussOs4AX18t7YZB1TTBh5jWQGH2/xH3nhQ0Em0="; }; @@ -31,8 +31,6 @@ buildPythonPackage rec { flask-sqlalchemy ]; - doCheck = false; - pythonImportsCheck = [ "flask_migrate" ]; meta = { @@ -40,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/miguelgrinberg/Flask-Migrate"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-mongoengine/default.nix b/python/pkgs/flask-mongoengine/default.nix index d124d0e67..f16890433 100644 --- a/python/pkgs/flask-mongoengine/default.nix +++ b/python/pkgs/flask-mongoengine/default.nix @@ -12,7 +12,7 @@ wtforms, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-mongoengine"; version = "1.0.0"; pyproject = true; @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ email-validator flask flask-wtf @@ -51,7 +51,6 @@ buildPythonPackage rec { }; # Tests require working mongodb connection - doCheck = false; pythonImportsCheck = [ "flask_mongoengine" ]; @@ -60,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/mongoengine/flask-mongoengine"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-mysqldb/default.nix b/python/pkgs/flask-mysqldb/default.nix index f6b95eca6..69ee34031 100644 --- a/python/pkgs/flask-mysqldb/default.nix +++ b/python/pkgs/flask-mysqldb/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-mysqldb"; version = "2.0.0"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alexferl"; repo = "flask-mysqldb"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RHAB9WGRzojH6eAOG61QguwF+4LssO9EcFjbWxoOtF4="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ flask mysqlclient ]; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/alexferl/flask-mysqldb"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-openid/default.nix b/python/pkgs/flask-openid/default.nix index fb7affcd2..50b35ec20 100644 --- a/python/pkgs/flask-openid/default.nix +++ b/python/pkgs/flask-openid/default.nix @@ -7,14 +7,14 @@ python3-openid, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-openid"; version = "1.3.1"; pyproject = true; src = fetchPypi { pname = "flask_openid"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-J2KLwKN+ZTCUiCMZPgaNeQNa2Ulth7dAQEQ+xITHZXo="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://pythonhosted.org/Flask-OpenID/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-paranoid/default.nix b/python/pkgs/flask-paranoid/default.nix index f15ba5cba..a2262d381 100644 --- a/python/pkgs/flask-paranoid/default.nix +++ b/python/pkgs/flask-paranoid/default.nix @@ -2,28 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, flask, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-paranoid"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "flask-paranoid"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tikD8efc3Q3xIQnaC3SSBaCRQxMI1HzXxeupvYeNnE4="; }; + build-system = [ setuptools ]; + postPatch = '' # tests have a typo in one of the assertions substituteInPlace tests/test_paranoid.py --replace "01-Jan-1970" "01 Jan 1970" ''; - propagatedBuildInputs = [ flask ]; + dependencies = [ flask ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -34,4 +38,4 @@ buildPythonPackage rec { description = "Simple user session protection"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-principal/default.nix b/python/pkgs/flask-principal/default.nix index 7977b61c1..6e498849b 100644 --- a/python/pkgs/flask-principal/default.nix +++ b/python/pkgs/flask-principal/default.nix @@ -11,14 +11,14 @@ blinker, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-principal"; version = "0.4.0"; pyproject = true; src = fetchPypi { pname = "Flask-Principal"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-9dYTS1yuv9u4bzLVbRjuRLCAh2onJpVgqW6jX3XJlFM="; }; @@ -29,8 +29,6 @@ buildPythonPackage rec { blinker ]; - doCheck = false; - pythonImportsCheck = [ "flask_principal" ]; meta = { @@ -38,4 +36,4 @@ buildPythonPackage rec { homepage = "http://packages.python.org/Flask-Principal/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-pymongo/default.nix b/python/pkgs/flask-pymongo/default.nix index 35267dbbc..a0e5eeddc 100644 --- a/python/pkgs/flask-pymongo/default.nix +++ b/python/pkgs/flask-pymongo/default.nix @@ -8,14 +8,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-pymongo"; version = "3.0.1"; pyproject = true; src = fetchPypi { pname = "flask_pymongo"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-0iW1HCHOyi5nDmzKebXFhK0XuWJStI6E47Qj3bczBMw="; }; @@ -31,11 +31,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # requires running MongoDB - doCheck = false; meta = { homepage = "https://github.com/dcrosta/flask-pymongo"; description = "PyMongo support for Flask applications"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/flask-restful/default.nix b/python/pkgs/flask-restful/default.nix index 759d0ce2e..5137f3c61 100644 --- a/python/pkgs/flask-restful/default.nix +++ b/python/pkgs/flask-restful/default.nix @@ -13,14 +13,14 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-restful"; version = "0.3.10"; pyproject = true; src = fetchPypi { pname = "Flask-RESTful"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-/kry7wAn34+bT3l6uiDFVmgBtq3plaxjtYir8aWc7Dc="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://flask-restful.readthedocs.io"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-reverse-proxy-fix/default.nix b/python/pkgs/flask-reverse-proxy-fix/default.nix index eccecead6..aab014234 100644 --- a/python/pkgs/flask-reverse-proxy-fix/default.nix +++ b/python/pkgs/flask-reverse-proxy-fix/default.nix @@ -2,33 +2,37 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, flask, werkzeug, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-reverse-proxy-fix"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; # master fixes flask import syntax and has no major changes # new release requested: https://github.com/sublee/flask-silk/pull/6 src = fetchFromGitHub { owner = "antarctica"; repo = "flask-reverse-proxy-fix"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZRZI1psr1dnY2FbuLZXOQvLMJd4TF7BfBNZnW9kxeck="; }; + build-system = [ setuptools ]; + postPatch = '' sed -i 's@werkzeug.contrib.fixers@werkzeug.middleware.proxy_fix@g' flask_reverse_proxy_fix/middleware/__init__.py ''; # This is needed so that setup.py does not add "devNone" to the version, # after which setuptools throws an error for an invalid version. - env.CI_COMMIT_TAG = "v${version}"; + env.CI_COMMIT_TAG = "v${finalAttrs.version}"; - propagatedBuildInputs = [ + dependencies = [ flask werkzeug ]; @@ -42,4 +46,4 @@ buildPythonPackage rec { url = "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"; }; }; -} +}) diff --git a/python/pkgs/flask-script/default.nix b/python/pkgs/flask-script/default.nix index 4b9bc9be1..91ede1cdc 100644 --- a/python/pkgs/flask-script/default.nix +++ b/python/pkgs/flask-script/default.nix @@ -10,14 +10,14 @@ flask, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-script"; version = "2.0.6"; pyproject = true; src = fetchPypi { pname = "Flask-Script"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ZCWWPZEFTPzBhYBxQccxSpxa1GMlkRvSTctIm9AWHGU="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { description = "Scripting support for Flask"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-seasurf/default.nix b/python/pkgs/flask-seasurf/default.nix index 66832095c..df748112b 100644 --- a/python/pkgs/flask-seasurf/default.nix +++ b/python/pkgs/flask-seasurf/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-seasurf"; version = "2.0.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "maxcountryman"; repo = "flask-seasurf"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ajQiDizNaF0em9CVeaHEuJEeSaYraJh9YgvhvBPTIsk="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/maxcountryman/flask-seasurf"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-security/default.nix b/python/pkgs/flask-security/default.nix index 7cd7e06d7..2f98a9229 100644 --- a/python/pkgs/flask-security/default.nix +++ b/python/pkgs/flask-security/default.nix @@ -30,7 +30,7 @@ wtforms, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-security"; version = "5.8.2"; pyproject = true; @@ -38,7 +38,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pallets-eco"; repo = "flask-security"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WRhQqSSlPKqY/NxqPCG3izYy782vCq6JGRzReL8Qwqw="; }; @@ -85,4 +85,4 @@ buildPythonPackage rec { description = "Quickly add security features to your Flask application"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-session-captcha/default.nix b/python/pkgs/flask-session-captcha/default.nix index 1f5771752..afb2b7439 100644 --- a/python/pkgs/flask-session-captcha/default.nix +++ b/python/pkgs/flask-session-captcha/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-session-captcha"; version = "1.5.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Tethik"; repo = "flask-session-captcha"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2JPJx8yQIl0bbcbshONJtja7BnSiieHzHi64A6jLpc0="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/Tethik/flask-session-captcha"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-session/default.nix b/python/pkgs/flask-session/default.nix index dd071ccf4..8b05cbf79 100644 --- a/python/pkgs/flask-session/default.nix +++ b/python/pkgs/flask-session/default.nix @@ -13,7 +13,7 @@ msgspec, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-session"; version = "0.8.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pallets-eco"; repo = "flask-session"; - tag = version; + tag = finalAttrs.version; hash = "sha256-QLtsM0MFgZbuLJPLc5/mUwyYc3bYxildNKNxOF8Z/3Y="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/pallets-eco/flask-session"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-simpleldap/default.nix b/python/pkgs/flask-simpleldap/default.nix index 61138a335..0a95864db 100644 --- a/python/pkgs/flask-simpleldap/default.nix +++ b/python/pkgs/flask-simpleldap/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-simpleldap"; version = "2.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alexferl"; repo = "flask-simpleldap"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WcedTtEwaSc3BYFE3L0FZrtKKdbwk7r3qSPP8evtYlc="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/alexferl/flask-simpleldap"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-sock/default.nix b/python/pkgs/flask-sock/default.nix index 7db764490..dec4e18e5 100644 --- a/python/pkgs/flask-sock/default.nix +++ b/python/pkgs/flask-sock/default.nix @@ -8,7 +8,7 @@ simple-websocket, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-sock"; version = "0.7.0"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "flask-sock"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GKfOVdeLPag2IKGCWrMjQp4NTL1/9GiyLhXhf9jQKhQ="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ flask simple-websocket ]; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/miguelgrinberg/flask-sock/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-socketio/default.nix b/python/pkgs/flask-socketio/default.nix index dffdbab30..996f4f5a6 100644 --- a/python/pkgs/flask-socketio/default.nix +++ b/python/pkgs/flask-socketio/default.nix @@ -7,14 +7,14 @@ python-socketio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-socketio"; version = "5.6.1"; pyproject = true; src = fetchPypi { pname = "flask_socketio"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-/lvZlcPtTampjzNdDYMPoaGdhKZHifYmVkKmcf2srqw="; }; @@ -25,8 +25,6 @@ buildPythonPackage rec { python-socketio ]; - doCheck = false; - pythonImportsCheck = [ "flask_socketio" ]; meta = { @@ -34,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/miguelgrinberg/Flask-SocketIO/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-sqlalchemy-lite/default.nix b/python/pkgs/flask-sqlalchemy-lite/default.nix index 69caf0f80..82ced06d2 100644 --- a/python/pkgs/flask-sqlalchemy-lite/default.nix +++ b/python/pkgs/flask-sqlalchemy-lite/default.nix @@ -7,7 +7,7 @@ sqlalchemy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-sqlalchemy-lite"; version = "0.2.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pallets-eco"; repo = "flask-sqlalchemy-lite"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KX4kpqgvNlcAe4NSWaSkcgtPQINmeQOx46/4uFM8q8A="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/pallets-eco/flask-sqlalchemy-lite"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-sqlalchemy/default.nix b/python/pkgs/flask-sqlalchemy/default.nix index 319a2a5e4..95e539061 100644 --- a/python/pkgs/flask-sqlalchemy/default.nix +++ b/python/pkgs/flask-sqlalchemy/default.nix @@ -7,14 +7,14 @@ sqlalchemy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-sqlalchemy"; version = "3.1.1"; pyproject = true; src = fetchPypi { pname = "flask_sqlalchemy"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-5LaLuIGALdoafYeLL8hMBtHuV/tAuHTT3Jfav6NrgxI="; }; @@ -25,8 +25,6 @@ buildPythonPackage rec { sqlalchemy ]; - doCheck = false; - pythonImportsCheck = [ "flask_sqlalchemy" ]; meta = { @@ -34,4 +32,4 @@ buildPythonPackage rec { homepage = "http://flask-sqlalchemy.pocoo.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-sslify/default.nix b/python/pkgs/flask-sslify/default.nix index 2d275b058..ccf449e11 100644 --- a/python/pkgs/flask-sslify/default.nix +++ b/python/pkgs/flask-sslify/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-sslify"; version = "0.1.5"; pyproject = true; src = fetchPypi { pname = "Flask-SSLify"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-0z4dPAnNlRVBdqqKcxlBjlISn8SC3VbYqK18JFANVD4="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { dependencies = [ flask ]; # no tests - doCheck = false; pythonImportsCheck = [ "flask_sslify" ]; meta = { @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/kennethreitz42/flask-sslify"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/flask-static-digest/default.nix b/python/pkgs/flask-static-digest/default.nix index 2242e59a9..e69a2950d 100644 --- a/python/pkgs/flask-static-digest/default.nix +++ b/python/pkgs/flask-static-digest/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "flask-static-digest"; version = "0.4.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "nickjj"; @@ -35,7 +34,6 @@ buildPythonPackage (finalAttrs: { optional-dependencies.brotli = [ brotli ]; # Upstream does not provide tests. - doCheck = false; pythonImportsCheck = [ "flask_static_digest" ]; diff --git a/python/pkgs/flask-swagger-ui/default.nix b/python/pkgs/flask-swagger-ui/default.nix index 30e4ea9a2..d02a9deff 100644 --- a/python/pkgs/flask-swagger-ui/default.nix +++ b/python/pkgs/flask-swagger-ui/default.nix @@ -6,21 +6,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-swagger-ui"; version = "5.32.14"; pyproject = true; src = fetchPypi { pname = "flask_swagger_ui"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-p3lUxjMu7Q+SaCt71+90n2MSf3NlqEqaimh+JvzEOg4="; }; build-system = [ setuptools ]; - doCheck = false; # there are no tests - dependencies = [ flask ]; meta = { @@ -28,4 +26,4 @@ buildPythonPackage rec { license = lib.licenses.mit; description = "Swagger UI blueprint for Flask"; }; -} +}) diff --git a/python/pkgs/flask-swagger/default.nix b/python/pkgs/flask-swagger/default.nix index 99b12c527..6a9117700 100644 --- a/python/pkgs/flask-swagger/default.nix +++ b/python/pkgs/flask-swagger/default.nix @@ -2,24 +2,27 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, flask, pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.2.14"; - format = "setuptools"; + pyproject = true; pname = "flask-swagger"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "b4085f5bc36df4c20b6548cd1413adc9cf35719b0f0695367cd542065145294d"; }; + build-system = [ setuptools ]; + # No Tests - doCheck = false; - propagatedBuildInputs = [ + dependencies = [ flask pyyaml ]; @@ -30,4 +33,4 @@ buildPythonPackage rec { description = "Extract swagger specs from your flask project"; mainProgram = "flaskswagger"; }; -} +}) diff --git a/python/pkgs/flask-talisman/default.nix b/python/pkgs/flask-talisman/default.nix index be9253518..2f42c13f4 100644 --- a/python/pkgs/flask-talisman/default.nix +++ b/python/pkgs/flask-talisman/default.nix @@ -7,13 +7,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-talisman"; version = "1.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xfSG9fVEIHKfhLPDhQzWP5bosDOpYpvuZsUk6jY3l/8="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/wntrblm/flask-talisman"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/flask-testing/default.nix b/python/pkgs/flask-testing/default.nix index a22cde1d7..ab0bafc2f 100644 --- a/python/pkgs/flask-testing/default.nix +++ b/python/pkgs/flask-testing/default.nix @@ -10,14 +10,14 @@ flask, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-testing"; version = "0.8.1"; pyproject = true; src = fetchPypi { pname = "Flask-Testing"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-CnNNe2jmOpQQtBPNex+WRW+ahYvQmmIi1GVlDMeC6wE="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://pythonhosted.org/Flask-Testing/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-themer/default.nix b/python/pkgs/flask-themer/default.nix index 2d55da410..ad7c7177c 100644 --- a/python/pkgs/flask-themer/default.nix +++ b/python/pkgs/flask-themer/default.nix @@ -8,7 +8,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-themer"; version = "2.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "TkTech"; repo = "flask-themer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2Zw+gKKN0kfjYuruuLQ+3dIFF0X07DTy0Ypc22Ih66w="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/TkTech/flask-themer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flask-unsign/default.nix b/python/pkgs/flask-unsign/default.nix index 82cbee07d..cc3f7584c 100644 --- a/python/pkgs/flask-unsign/default.nix +++ b/python/pkgs/flask-unsign/default.nix @@ -11,7 +11,7 @@ werkzeug, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-unsign"; version = "1.2.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Paradoxis"; repo = "Flask-Unsign"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/WK3g6Ef3mSKeT3aaSAh5J8estUN4sNmM9Tq9An/18A="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "flask-unsign"; }; -} +}) diff --git a/python/pkgs/flask-webtest/default.nix b/python/pkgs/flask-webtest/default.nix index 716c46578..ffb79f50d 100644 --- a/python/pkgs/flask-webtest/default.nix +++ b/python/pkgs/flask-webtest/default.nix @@ -10,7 +10,7 @@ greenlet, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-webtest"; version = "0.1.6"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "level12"; repo = "flask-webtest"; - tag = version; + tag = finalAttrs.version; hash = "sha256-wcEc9j62bQXAmXczsunITQP3sU040d6Ws8cz0w7+5r4="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/level12/flask-webtest"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask-wtf/default.nix b/python/pkgs/flask-wtf/default.nix index 6ff30f42c..b23d3ce0b 100644 --- a/python/pkgs/flask-wtf/default.nix +++ b/python/pkgs/flask-wtf/default.nix @@ -12,14 +12,14 @@ wtforms, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask-wtf"; version = "1.3.0"; pyproject = true; src = fetchPypi { pname = "flask_wtf"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-YdXavFDD34hcKX3L2AgQRDpdYyEGyKacq4znQPDN18w="; }; @@ -31,8 +31,6 @@ buildPythonPackage rec { wtforms ]; - doCheck = false; - pythonImportsCheck = [ "flask_wtf" ]; meta = { @@ -40,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/pallets-eco/flask-wtf/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flask/default.nix b/python/pkgs/flask/default.nix index 0e4371f02..3ff55bc2d 100644 --- a/python/pkgs/flask/default.nix +++ b/python/pkgs/flask/default.nix @@ -18,13 +18,13 @@ python-dotenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flask"; version = "3.1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-DvDlK4qc2TKFU3kZfdj5QEezWcoKeGlRRDBMtF+Hyes="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { ''; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flatbuffers/default.nix b/python/pkgs/flatbuffers/default.nix index fbe69839f..3d6313f4f 100644 --- a/python/pkgs/flatbuffers/default.nix +++ b/python/pkgs/flatbuffers/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flatbuffers"; version = "25.2.10"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-l+RRN3pBJi+Nm9QpXMg2EzQVzAPYy5ZkEKSvkusA0m4="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://google.github.io/flatbuffers/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/flatdict/default.nix b/python/pkgs/flatdict/default.nix index 38f083b63..3a6ad1868 100644 --- a/python/pkgs/flatdict/default.nix +++ b/python/pkgs/flatdict/default.nix @@ -6,7 +6,7 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flatdict"; version = "4.1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gmr"; repo = "flatdict"; - tag = version; + tag = finalAttrs.version; hash = "sha256-sLeW92F473H90+EMHaIWPt9ETqSeL/DoLmlMAg9Thj4="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/gmr/flatdict"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flatlatex/default.nix b/python/pkgs/flatlatex/default.nix index 2daf4e0ae..cc56901d2 100644 --- a/python/pkgs/flatlatex/default.nix +++ b/python/pkgs/flatlatex/default.nix @@ -8,13 +8,13 @@ regex, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flatlatex"; version = "0.15"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-UXDhvNT8y1K9vf8wCxS2hzBIO8RvaiqJ964rsCTk0Tk="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/jb-leger/flatlatex"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/flatten-dict/default.nix b/python/pkgs/flatten-dict/default.nix index 188b71257..dfd55b4e8 100644 --- a/python/pkgs/flatten-dict/default.nix +++ b/python/pkgs/flatten-dict/default.nix @@ -5,13 +5,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flatten_dict"; version = "0.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yolmTQvJVS1SXudWcmtadVwX9ltb8j0KHweEHxgUKLc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ianlini/flatten-dict"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flatten-json/default.nix b/python/pkgs/flatten-json/default.nix index a27c2c500..2f6a2ecab 100644 --- a/python/pkgs/flatten-json/default.nix +++ b/python/pkgs/flatten-json/default.nix @@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "amirziai"; repo = "flatten"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ViOLbfJtFWkDQ5cGNYerTk2BqVg5f5B3hZ96t0uvhpk="; }; diff --git a/python/pkgs/flax/default.nix b/python/pkgs/flax/default.nix index 7f19513d6..9d44327aa 100644 --- a/python/pkgs/flax/default.nix +++ b/python/pkgs/flax/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { pname = "flax"; version = "0.12.7"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "google"; @@ -55,8 +54,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "flax" ]; - doCheck = false; - meta = { description = "Neural network library for JAX"; homepage = "https://github.com/google/flax"; diff --git a/python/pkgs/flaxlib/default.nix b/python/pkgs/flaxlib/default.nix index dd3b9ac1f..de98f8870 100644 --- a/python/pkgs/flaxlib/default.nix +++ b/python/pkgs/flaxlib/default.nix @@ -14,7 +14,7 @@ pkg-config, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flaxlib"; version = "0.12.9"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-a78KiTsCCARWZvbxz9QKdUKnjkDJGXcPVVJu5rU4m/U="; }; - sourceRoot = "${src.name}/flaxlib_src"; + sourceRoot = "${finalAttrs.src.name}/flaxlib_src"; dontUseCmakeConfigure = true; @@ -44,11 +44,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "flaxlib" ]; - doCheck = false; - meta = { description = "Rust library used internally by flax"; homepage = "https://github.com/google/flax/tree/main/flaxlib"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/fleep/default.nix b/python/pkgs/fleep/default.nix index fd520d190..75847dace 100644 --- a/python/pkgs/fleep/default.nix +++ b/python/pkgs/fleep/default.nix @@ -2,13 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, python, }: buildPythonPackage { pname = "fleep"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; # Pypi version does not have tests src = fetchFromGitHub { @@ -18,6 +20,8 @@ buildPythonPackage { hash = "sha256-TaU7njx98nxkhZawGMFqWj4g+yCtIX9aPWQHoamzfMY="; }; + build-system = [ setuptools ]; + patches = [ ./0001-Fixing-paths-on-tests.patch ]; checkPhase = '' diff --git a/python/pkgs/flexcache/default.nix b/python/pkgs/flexcache/default.nix index 28b9798ed..1fcffc898 100644 --- a/python/pkgs/flexcache/default.nix +++ b/python/pkgs/flexcache/default.nix @@ -14,7 +14,7 @@ # checks }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flexcache"; version = "0.3"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hgrecco"; repo = "flexcache"; - rev = version; + tag = finalAttrs.version; hash = "sha256-MAbTe7NxzfRPzo/Wnb5SnPJvJWf6zVeYsaw/g9OJYSE="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/hgrecco/flexcache"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flexit-bacnet/default.nix b/python/pkgs/flexit-bacnet/default.nix index 950b342d6..f447675b6 100644 --- a/python/pkgs/flexit-bacnet/default.nix +++ b/python/pkgs/flexit-bacnet/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flexit-bacnet"; version = "2.2.3"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "piotrbulinski"; repo = "flexit_bacnet"; - tag = version; + tag = finalAttrs.version; hash = "sha256-MudBn+ki/jqeFK1iz/vAXaXkkddLThO+1T4BXFJ90lk="; }; @@ -22,11 +22,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "flexit_bacnet" ]; # upstream has no tests - doCheck = false; meta = { description = "Client BACnet library for Flexit Nordic series of air handling units"; homepage = "https://github.com/piotrbulinski/flexit_bacnet"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flexmock/default.nix b/python/pkgs/flexmock/default.nix index 2ed52edb2..cacbfb39f 100644 --- a/python/pkgs/flexmock/default.nix +++ b/python/pkgs/flexmock/default.nix @@ -5,13 +5,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flexmock"; version = "0.13.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aCnXoNf3Rtswh9qP2mL5JOUt9+zkBRwvWa1YbPWteXc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Testing library that makes it easy to create mocks, stubs and fakes"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/flexparser/default.nix b/python/pkgs/flexparser/default.nix index 0d380f2ba..ec66a91f1 100644 --- a/python/pkgs/flexparser/default.nix +++ b/python/pkgs/flexparser/default.nix @@ -13,7 +13,7 @@ # checks }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flexparser"; version = "0.4"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hgrecco"; repo = "flexparser"; - rev = version; + tag = finalAttrs.version; hash = "sha256-0Ocp4GsrnzkpSqnP+AK5OxJ3KyUf5Uc6CegDXpRYRqo="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/hgrecco/flexparser"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flickrapi/default.nix b/python/pkgs/flickrapi/default.nix index 0e306117a..5bec655d0 100644 --- a/python/pkgs/flickrapi/default.nix +++ b/python/pkgs/flickrapi/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flickrapi"; version = "2.4"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sybrenstuvel"; repo = "flickrapi"; - rev = "version-${version}"; + tag = "version-${finalAttrs.version}"; hash = "sha256-vRZrlXKI0UDdmDevh3XUngH4X8G3VlOCSP0z/rxhIgw="; }; @@ -70,4 +70,4 @@ buildPythonPackage rec { homepage = "https://stuvel.eu/flickrapi"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/flipr-api/default.nix b/python/pkgs/flipr-api/default.nix index ac09650ba..34db9dabd 100644 --- a/python/pkgs/flipr-api/default.nix +++ b/python/pkgs/flipr-api/default.nix @@ -10,7 +10,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flipr-api"; version = "1.6.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cnico"; repo = "flipr-api"; - tag = version; + tag = finalAttrs.version; hash = "sha256-/px8NuBwukAPMxdXvHdyfO/j/a9UatKbdrjDNuT0f4k="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/cnico/flipr-api"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/flit-core/default.nix b/python/pkgs/flit-core/default.nix index ebddb186b..6a6f4ba65 100644 --- a/python/pkgs/flit-core/default.nix +++ b/python/pkgs/flit-core/default.nix @@ -4,7 +4,7 @@ flit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flit-core"; inherit (flit) version; pyproject = true; @@ -19,4 +19,4 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/flit"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/flit-gettext/default.nix b/python/pkgs/flit-gettext/default.nix index a078e45e3..3bfba74f5 100644 --- a/python/pkgs/flit-gettext/default.nix +++ b/python/pkgs/flit-gettext/default.nix @@ -17,7 +17,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flit-gettext"; version = "1.0.2"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "codingjoe"; repo = "flit-gettext"; - rev = version; + tag = finalAttrs.version; hash = "sha256-rCIMwAiXXCJ+PH26/hoPWsuKd68crWStBErAOh9wzUg="; }; @@ -40,7 +40,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ flit-core ]; + dependencies = [ flit-core ]; optional-dependencies = { scm = [ flit-scm ]; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/codingjoe/flit-gettext"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/flit-scm/default.nix b/python/pkgs/flit-scm/default.nix index b1d92e5dc..47c39d9f0 100644 --- a/python/pkgs/flit-scm/default.nix +++ b/python/pkgs/flit-scm/default.nix @@ -23,15 +23,13 @@ buildPythonPackage (finalAttrs: { setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ flit-core setuptools-scm ]; pythonImportsCheck = [ "flit_scm" ]; - doCheck = false; - meta = { description = "PEP 518 build backend that uses setuptools_scm to generate a version file from your version control system, then flit to build the package"; homepage = "https://gitlab.com/WillDaSilva/flit_scm"; diff --git a/python/pkgs/flit/default.nix b/python/pkgs/flit/default.nix index 5664e80c9..62b62d037 100644 --- a/python/pkgs/flit/default.nix +++ b/python/pkgs/flit/default.nix @@ -18,7 +18,7 @@ # python-packages.nix. When it will be used to build wheels, # care should be taken that there is no mingling of PYTHONPATH. -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flit"; version = "3.12.0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pypa"; repo = "flit"; - rev = version; + tag = finalAttrs.version; hash = "sha256-oWV+KK22+iK99iCOCKCV1OCLq2Ef1bcYRKXT5GHwiL8="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/flit"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/floret/default.nix b/python/pkgs/floret/default.nix index 038074231..d5d545022 100644 --- a/python/pkgs/floret/default.nix +++ b/python/pkgs/floret/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "floret"; version = "0.10.5"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "explosion"; repo = "floret"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7vkw6H0ZQoHEwNusY6QWh/vPbSCdP1ZaaqABHsZH6hQ="; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ + dependencies = [ numpy pybind11 ]; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/floret"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/flower/default.nix b/python/pkgs/flower/default.nix index 767e9a3f8..cd7daeeb8 100644 --- a/python/pkgs/flower/default.nix +++ b/python/pkgs/flower/default.nix @@ -10,13 +10,13 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flower"; version = "2.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7Oef0ZC/0ZiUfjBHDEsmptXfGGHVQwlDDdkm7VFjAv8="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/mher/flower"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/fluent-logger/default.nix b/python/pkgs/fluent-logger/default.nix index 4a098ce56..8df3283c4 100644 --- a/python/pkgs/fluent-logger/default.nix +++ b/python/pkgs/fluent-logger/default.nix @@ -13,7 +13,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fluent-logger"; version = "0.11.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fluent"; repo = "fluent-logger-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-i6S5S2ZUwC5gQPdVjefUXrKj43iLIqxd8tdXbMBJNnA="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/fluent/fluent-logger-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/fluss-api/default.nix b/python/pkgs/fluss-api/default.nix index cb7801d5f..e45fbaf2c 100644 --- a/python/pkgs/fluss-api/default.nix +++ b/python/pkgs/fluss-api/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; # upstream has no tests - doCheck = false; pythonImportsCheck = [ "fluss_api" ]; diff --git a/python/pkgs/flux-led/default.nix b/python/pkgs/flux-led/default.nix index 8a1d6deeb..7a3c31bd9 100644 --- a/python/pkgs/flux-led/default.nix +++ b/python/pkgs/flux-led/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flux-led"; version = "1.2.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Danielhiversen"; repo = "flux_led"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+i+/WMHdz4HPKDlRPV1Aq9QqrTo5gZiulSc7Hinn+kI="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl3Plus; mainProgram = "flux_led"; }; -} +}) diff --git a/python/pkgs/fnvhash/default.nix b/python/pkgs/fnvhash/default.nix index 2dfb6fd6a..4bf884b99 100644 --- a/python/pkgs/fnvhash/default.nix +++ b/python/pkgs/fnvhash/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fnvhash"; version = "0.2.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "znerol"; repo = "py-fnvhash"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vAflKSvi0PD5r1q6GCTt6a4vTCsdBIebecRCKbbBphE="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/znerol/py-fnvhash"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/folium/default.nix b/python/pkgs/folium/default.nix index 1a79bb0f4..705477474 100644 --- a/python/pkgs/folium/default.nix +++ b/python/pkgs/folium/default.nix @@ -12,7 +12,7 @@ xyzservices, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "folium"; version = "0.20.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-visualization"; repo = "folium"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yLF4TdrMVEtWvGXZGbwa3OxCkdXMsN4m45rPrGDHlCU="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-visualization/folium"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/font-v/default.nix b/python/pkgs/font-v/default.nix index 36ac9dc95..9567266ee 100644 --- a/python/pkgs/font-v/default.nix +++ b/python/pkgs/font-v/default.nix @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "source-foundry"; repo = "font-v"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ceASyYcNul5aWPAPGajCQrqsQ3bN1sE+nMbCbj7f35w="; }; diff --git a/python/pkgs/fontmath/default.nix b/python/pkgs/fontmath/default.nix index 81de52956..34fce4dea 100644 --- a/python/pkgs/fontmath/default.nix +++ b/python/pkgs/fontmath/default.nix @@ -2,25 +2,29 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, fonttools, setuptools-scm, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fontmath"; version = "0.9.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-H9kZDJ14ThMFw8SXcbkdkQ8kakt8RO3iGcmaB+167aQ="; extension = "zip"; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ fonttools ]; + dependencies = [ fonttools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -29,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/robotools/fontMath/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fontpens/default.nix b/python/pkgs/fontpens/default.nix index ed3c62493..26039d3cf 100644 --- a/python/pkgs/fontpens/default.nix +++ b/python/pkgs/fontpens/default.nix @@ -27,7 +27,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ fonttools ]; # can't run normal tests due to circular dependency with fontParts - doCheck = false; pythonImportsCheck = [ "fontPens" ] diff --git a/python/pkgs/fonttools/default.nix b/python/pkgs/fonttools/default.nix index 1408ee742..39a5aa314 100644 --- a/python/pkgs/fonttools/default.nix +++ b/python/pkgs/fonttools/default.nix @@ -16,7 +16,7 @@ sympy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fonttools"; version = "4.64.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fonttools"; repo = "fonttools"; - tag = version; + tag = finalAttrs.version; hash = "sha256-cKbspI3FekEuKAmzUYzekVGEgLBPLyZz3Howz32sJ6k="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { description = "Library to manipulate font files from Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/foobot-async/default.nix b/python/pkgs/foobot-async/default.nix index 599e2c49b..c586da5aa 100644 --- a/python/pkgs/foobot-async/default.nix +++ b/python/pkgs/foobot-async/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "foobot-async"; version = "1.0.1"; pyproject = true; src = fetchPypi { pname = "foobot_async"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-QQjysk2m8QkOpLBdC8kfuoA9PcljgEwzKyrIAhxHB4c="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/reefab/foobot_async"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/forbiddenfruit/default.nix b/python/pkgs/forbiddenfruit/default.nix index 0cb61ae88..3d424dfd7 100644 --- a/python/pkgs/forbiddenfruit/default.nix +++ b/python/pkgs/forbiddenfruit/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "forbiddenfruit"; version = "0.1.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "clarete"; repo = "forbiddenfruit"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yHIZsVn2UVmWeBNIzWDE6AOwAXZilPqXo+bVtXqGkJk="; }; @@ -23,8 +23,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "forbiddenfruit" ]; - doCheck = false; - meta = { description = "Patch python built-in objects"; homepage = "https://github.com/clarete/forbiddenfruit"; @@ -33,4 +31,4 @@ buildPythonPackage rec { gpl3Plus ]; }; -} +}) diff --git a/python/pkgs/fordpass/default.nix b/python/pkgs/fordpass/default.nix index 10fafa594..12692cfce 100644 --- a/python/pkgs/fordpass/default.nix +++ b/python/pkgs/fordpass/default.nix @@ -3,24 +3,27 @@ requests, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fordpass"; version = "0.0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "clarkd"; repo = "fordpass-python"; - rev = version; + tag = finalAttrs.version; sha256 = "0i1dlswxc2bv1smc5d4r1adbxbl7sgr1swh2cjfajp73vs43xa0m"; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "fordpass" ]; @@ -30,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/clarkd/fordpass-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/formencode/default.nix b/python/pkgs/formencode/default.nix index 4ad8bf7bd..db9b9e955 100644 --- a/python/pkgs/formencode/default.nix +++ b/python/pkgs/formencode/default.nix @@ -7,13 +7,13 @@ legacy-cgi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "formencode"; version = "2.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4X8WGZ0jLlT2eRIATzrTM827uBoaGhAjis8JurmfkZk="; }; @@ -28,8 +28,6 @@ buildPythonPackage rec { legacy-cgi ]; - doCheck = false; - pythonImportsCheck = [ "formencode" ]; meta = { @@ -37,4 +35,4 @@ buildPythonPackage rec { homepage = "http://formencode.org"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/formulaic/default.nix b/python/pkgs/formulaic/default.nix index 625efc147..916ebe68b 100644 --- a/python/pkgs/formulaic/default.nix +++ b/python/pkgs/formulaic/default.nix @@ -16,7 +16,7 @@ sympy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "formulaic"; version = "1.2.2"; pyproject = true; @@ -24,12 +24,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matthewwardrop"; repo = "formulaic"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-C4IUuyxBbW2DUxF4at8/736ZMmVZrFRRp+RxrJfmLkY="; }; # project uses a version-file that is not present in tagged releases - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; build-system = [ hatchling @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://matthewwardrop.github.io/formulaic/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fortiosapi/default.nix b/python/pkgs/fortiosapi/default.nix index 544f93a8f..5888b451b 100644 --- a/python/pkgs/fortiosapi/default.nix +++ b/python/pkgs/fortiosapi/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, oyaml, packaging, paramiko, @@ -10,19 +12,21 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fortiosapi"; version = "1.0.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "fortinet-solutions-cse"; repo = "fortiosapi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-M71vleEhRYnlf+RSGT1GbCy5NEZaG0hWmJo01n9s6Rg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pexpect requests paramiko @@ -32,7 +36,6 @@ buildPythonPackage rec { ]; # Tests require a local VM - doCheck = false; pythonImportsCheck = [ "fortiosapi" ]; @@ -41,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/fortinet-solutions-cse/fortiosapi"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/fpdf/default.nix b/python/pkgs/fpdf/default.nix index 0e9a6f299..68f6c56ba 100644 --- a/python/pkgs/fpdf/default.nix +++ b/python/pkgs/fpdf/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fpdf"; version = "1.7.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ElhAeDKJ59ElUrHoaraSw3Mi56ZblqmeDqhsygQbZ3k="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/reingart/pyfpdf"; license = lib.licenses.lgpl3; }; -} +}) diff --git a/python/pkgs/fpdf2/default.nix b/python/pkgs/fpdf2/default.nix index 085e8d17d..4d053bdce 100644 --- a/python/pkgs/fpdf2/default.nix +++ b/python/pkgs/fpdf2/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fpdf2"; version = "2.8.8"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "py-pdf"; repo = "fpdf2"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ff0wDhKtvPrqqjGBtUjg1b0iDWoesV+6KlgDICf3xck="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { description = "Simple PDF generation for Python"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/fpyutils/default.nix b/python/pkgs/fpyutils/default.nix index 6dd556056..ac8869a11 100644 --- a/python/pkgs/fpyutils/default.nix +++ b/python/pkgs/fpyutils/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fpyutils"; version = "4.0.1"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frnmst"; repo = "fpyutils"; - tag = version; + tag = finalAttrs.version; hash = "sha256-VVR1zsejO6kHlMjqqlftDKu3/SyDzgPov9f48HYL/Bk="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ atomicwrites requests ]; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/frnmst/fpyutils"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/fqdn/default.nix b/python/pkgs/fqdn/default.nix index 1421876cd..0dfc7693a 100644 --- a/python/pkgs/fqdn/default.nix +++ b/python/pkgs/fqdn/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fqdn"; version = "1.5.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ypcrts"; repo = "fqdn"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-T0CdWWr8p3JVhp3nol5hyxsrD3951JE2EDpFt+m+3bE="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "fqdn" ]; meta = { @@ -23,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/ypcrts/fqdn"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/freenub/default.nix b/python/pkgs/freenub/default.nix index 0bc1f46de..fa275e55e 100644 --- a/python/pkgs/freenub/default.nix +++ b/python/pkgs/freenub/default.nix @@ -14,7 +14,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "freenub"; version = "0.1.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = "freenub"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UkW/7KUQ4uCu3cxDSL+kw0gjKjs4KnmxRIOLVP4hwyA="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/bdraco/freenub"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/freertos-gdb/default.nix b/python/pkgs/freertos-gdb/default.nix index de4cfa63c..1afdd17b7 100644 --- a/python/pkgs/freertos-gdb/default.nix +++ b/python/pkgs/freertos-gdb/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "freertos-gdb"; version = "1.0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lH/dlTX2PuZ89rX5zzpedHkqHvdVy+h6BzJ8rVFmkb8="; }; @@ -20,11 +20,10 @@ buildPythonPackage rec { ]; # Project has no tests - doCheck = false; meta = { description = "User-friendly view of FreeRTOS kernel objects in GDB"; homepage = "https://github.com/espressif/freertos-gdb"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/freesms/default.nix b/python/pkgs/freesms/default.nix index bc88343fd..737c2d43d 100644 --- a/python/pkgs/freesms/default.nix +++ b/python/pkgs/freesms/default.nix @@ -8,7 +8,7 @@ httmock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "freesms"; version = "0.3.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bfontaine"; repo = "freesms"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5f5amXH6VVppX9/9DhILdBU8w/6n67EUgBy/zgTEUCM="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/bfontaine/freesms"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/freetype-py/default.nix b/python/pkgs/freetype-py/default.nix index 8df61b65e..880862b44 100644 --- a/python/pkgs/freetype-py/default.nix +++ b/python/pkgs/freetype-py/default.nix @@ -9,13 +9,13 @@ freetype, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "freetype-py"; version = "2.5.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-z+JoahdNDdPXGp2O6b9qLCP1hyOFz4zp8kr4PQduL70="; extension = "zip"; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { description = "FreeType (high-level Python API)"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/freezegun/default.nix b/python/pkgs/freezegun/default.nix index 5b9c252c9..49fc640b6 100644 --- a/python/pkgs/freezegun/default.nix +++ b/python/pkgs/freezegun/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "freezegun"; version = "1.5.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rHdCpsxsJaLDXpKS39VUuJe1F9LewmiRoujevyBcuUo="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/spulec/freezegun"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/frelatage/default.nix b/python/pkgs/frelatage/default.nix index e1446bd2b..5aba824d7 100644 --- a/python/pkgs/frelatage/default.nix +++ b/python/pkgs/frelatage/default.nix @@ -8,7 +8,7 @@ timeout-decorator, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "frelatage"; version = "0.1.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Rog3rSm1th"; repo = "frelatage"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eHVqp6govBV9FvSQyaZuEEImHQRs/mbLaW86RCvtDbM="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Rog3rSm1th/frelatage"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/frigidaire/default.nix b/python/pkgs/frigidaire/default.nix index 39d28c619..424caab7e 100644 --- a/python/pkgs/frigidaire/default.nix +++ b/python/pkgs/frigidaire/default.nix @@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ certifi chardet idna @@ -38,7 +38,6 @@ buildPythonPackage (finalAttrs: { ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "frigidaire" ]; diff --git a/python/pkgs/frilouz/default.nix b/python/pkgs/frilouz/default.nix index 6c93d4a06..4ffc05ebd 100644 --- a/python/pkgs/frilouz/default.nix +++ b/python/pkgs/frilouz/default.nix @@ -3,22 +3,26 @@ astunparse, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "frilouz"; version = "0.0.2"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchFromGitHub { owner = "QuantStack"; repo = "frilouz"; - rev = version; + tag = finalAttrs.version; sha256 = "0w2qzi4zb10r9iw64151ay01vf0yzyhh0bsjkx1apxp8fs15cdiw"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ astunparse ]; preCheck = "cd test"; @@ -36,4 +40,4 @@ buildPythonPackage rec { description = "Python AST parser adapter with partial error recovery"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/frozendict/default.nix b/python/pkgs/frozendict/default.nix index bc25ffeeb..5fffcb52a 100644 --- a/python/pkgs/frozendict/default.nix +++ b/python/pkgs/frozendict/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "frozendict"; version = "2.4.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5Hj7KhORpWyKbhDMl8SpACtBDs0awowY14BmF2Licb0="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Module for immutable dictionary"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/frozenlist/default.nix b/python/pkgs/frozenlist/default.nix index 53a8d4336..c29418e46 100644 --- a/python/pkgs/frozenlist/default.nix +++ b/python/pkgs/frozenlist/default.nix @@ -9,7 +9,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "frozenlist"; version = "1.8.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "frozenlist"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vkZ60qI0yQ82QSLQkBDzLnikTBQhUUuAzV+YsorrM2Q="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/frozenlist"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/frozenlist2/default.nix b/python/pkgs/frozenlist2/default.nix index 41e747d18..c2a612abe 100644 --- a/python/pkgs/frozenlist2/default.nix +++ b/python/pkgs/frozenlist2/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "frozenlist2"; version = "1.0.0"; @@ -14,11 +14,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rohanpm"; repo = "frozenlist2"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fF0oFZ2q1wRH7IKBlCjm3Za4xtEMSHyEaGL09rHgtTY="; }; - propagatedBuildInputs = [ setuptools ]; + dependencies = [ setuptools ]; pythonImportsCheck = [ "frozenlist2" ]; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/rohanpm/frozenlist2"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/fs-s3fs/default.nix b/python/pkgs/fs-s3fs/default.nix index ad630e840..df4094b72 100644 --- a/python/pkgs/fs-s3fs/default.nix +++ b/python/pkgs/fs-s3fs/default.nix @@ -1,34 +1,37 @@ { buildPythonPackage, fetchPypi, + # build-system + setuptools, lib, fs, six, boto3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fs-s3fs"; version = "1.1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "b57f8c7664460ff7b451b4b44ca2ea9623a374d74e1284c2d5e6df499dc7976c"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ fs six boto3 ]; # tests try to integrate an s3 bucket which can't be tested properly in an isolated environment. - doCheck = false; meta = { homepage = "https://pypi.org/project/fs-s3fs/"; license = lib.licenses.mit; description = "Amazon S3 filesystem for PyFilesystem2"; }; -} +}) diff --git a/python/pkgs/fs/default.nix b/python/pkgs/fs/default.nix index c93e02484..40dceea40 100644 --- a/python/pkgs/fs/default.nix +++ b/python/pkgs/fs/default.nix @@ -9,13 +9,13 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fs"; version = "2.4.16"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rpfH1RIT9LcLapWCklMCiQkN46fhWEHhCPvhRPBp0xM="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/PyFilesystem/pyfilesystem2"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/fsspec/default.nix b/python/pkgs/fsspec/default.nix index ffa511d17..963d83272 100644 --- a/python/pkgs/fsspec/default.nix +++ b/python/pkgs/fsspec/default.nix @@ -17,7 +17,7 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fsspec"; version = "2026.3.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fsspec"; repo = "filesystem_spec"; - tag = version; + tag = finalAttrs.version; hash = "sha256-K/qHc9uBYq/HkA6xhKAujdCBqH+0kcFnfD3a506A9Ns="; }; @@ -64,4 +64,4 @@ buildPythonPackage rec { homepage = "https://github.com/fsspec/filesystem_spec"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ftputil/default.nix b/python/pkgs/ftputil/default.nix index a4cf7b81a..67244b27e 100644 --- a/python/pkgs/ftputil/default.nix +++ b/python/pkgs/ftputil/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ftputil"; version = "5.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2IK6UcUDXPio+zMkCDYHVgbXYp5FasS9DoDA2jge720="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://ftputil.sschwarzer.net/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/func-timeout/default.nix b/python/pkgs/func-timeout/default.nix index 6ffd2afdc..081aa4b36 100644 --- a/python/pkgs/func-timeout/default.nix +++ b/python/pkgs/func-timeout/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "func-timeout"; version = "4.3.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "func_timeout"; - inherit version; + inherit (finalAttrs) version; sha256 = "74cd3c428ec94f4edfba81f9b2f14904846d5ffccc27c92433b8b5939b5575dd"; }; + + build-system = [ setuptools ]; pythonImportsCheck = [ "func_timeout" ]; meta = { @@ -21,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/kata198/func_timeout"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/funcparserlib/default.nix b/python/pkgs/funcparserlib/default.nix index 3c733fdc9..59d96cd1f 100644 --- a/python/pkgs/funcparserlib/default.nix +++ b/python/pkgs/funcparserlib/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "funcparserlib"; version = "1.0.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vlasovskikh"; repo = "funcparserlib"; - rev = version; + tag = finalAttrs.version; hash = "sha256-LE9ItCaEzEGeahpM3M3sSnDBXEr6uX5ogEkO5x2Jgzc="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/funcsigs/default.nix b/python/pkgs/funcsigs/default.nix index 1b1c1b306..91224b7e2 100644 --- a/python/pkgs/funcsigs/default.nix +++ b/python/pkgs/funcsigs/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "funcsigs"; version = "1.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-p7sPLPOj/Rqycyy0nrpCUsKvQkBEJBW0q847hwIqj1A="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "funcsigs" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/funcy/default.nix b/python/pkgs/funcy/default.nix index 35af6192f..d0d14374f 100644 --- a/python/pkgs/funcy/default.nix +++ b/python/pkgs/funcy/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "funcy"; version = "2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OWMxXVnUHG8wwEvJEOEKtQo6xKIlhov6lv7tEz3wdcs="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Collection of fancy functional tools focused on practicality"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/funk/default.nix b/python/pkgs/funk/default.nix index d0160f177..07e74bfa3 100644 --- a/python/pkgs/funk/default.nix +++ b/python/pkgs/funk/default.nix @@ -7,7 +7,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "funk"; version = "0.5.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mwilliamson"; repo = "funk"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dEq3zyA8rtNt0sui2TfQ3OUSCZ0XDMOdthcqt/QrCsU="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "funk" ]; # Disabling tests, they rely on Nose which is outdated and not supported - doCheck = false; passthru.updateScript = gitUpdater { }; @@ -35,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/mwilliamson/funk"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/furl/default.nix b/python/pkgs/furl/default.nix index d8adcc300..94b3f482e 100644 --- a/python/pkgs/furl/default.nix +++ b/python/pkgs/furl/default.nix @@ -11,7 +11,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "furl"; version = "2.1.4"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gruns"; repo = "furl"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NRkOJlluZjscM4ZhxHoXIzV2A0+mrkaw7rcxfklGCHs="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/gruns/furl"; license = lib.licenses.unlicense; }; -} +}) diff --git a/python/pkgs/furo/default.nix b/python/pkgs/furo/default.nix index cc038f58a..57101c943 100644 --- a/python/pkgs/furo/default.nix +++ b/python/pkgs/furo/default.nix @@ -56,7 +56,7 @@ let ''; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { inherit pname version src; pyproject = true; @@ -89,4 +89,4 @@ buildPythonPackage rec { homepage = "https://github.com/pradyunsg/furo"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fusepy/default.nix b/python/pkgs/fusepy/default.nix index 7f2771408..3b320de27 100644 --- a/python/pkgs/fusepy/default.nix +++ b/python/pkgs/fusepy/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ pkgs.fuse ]; # No tests included - doCheck = false; pythonImportsCheck = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "fuse" ]; diff --git a/python/pkgs/future-fstrings/default.nix b/python/pkgs/future-fstrings/default.nix index c690f88a8..b11c1569d 100644 --- a/python/pkgs/future-fstrings/default.nix +++ b/python/pkgs/future-fstrings/default.nix @@ -2,21 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "future-fstrings"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "future_fstrings"; sha256 = "6cf41cbe97c398ab5a81168ce0dbb8ad95862d3caf23c21e4430627b90844089"; }; + build-system = [ setuptools ]; + # No tests included in Pypi archive - doCheck = false; meta = { homepage = "https://github.com/asottile/future-fstrings"; @@ -24,4 +27,4 @@ buildPythonPackage rec { mainProgram = "future-fstrings-show"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/future-typing/default.nix b/python/pkgs/future-typing/default.nix index 91d8c9e8c..a5e194453 100644 --- a/python/pkgs/future-typing/default.nix +++ b/python/pkgs/future-typing/default.nix @@ -2,20 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "future-typing"; version = "0.4.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "future_typing"; - inherit version; + inherit (finalAttrs) version; sha256 = "65fdc5034a95db212790fee5e977fb0a2df8deb60dccf3bac17d6d2b1a9bbacd"; }; - doCheck = false; # No tests in pypi source. Did not get tests from GitHub source to work. + build-system = [ setuptools ]; pythonImportsCheck = [ "future_typing" ]; @@ -25,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/PrettyWood/future-typing"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/future/default.nix b/python/pkgs/future/default.nix index 62b297b7c..d0ffe4b88 100644 --- a/python/pkgs/future/default.nix +++ b/python/pkgs/future/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "future"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vSloMJMHhh7a4UWKT4pPNZjAO+Q7l1IQdq6/XZTAewU="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { description = "Clean single-source support for Python 3 and 2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/fuzzyfinder/default.nix b/python/pkgs/fuzzyfinder/default.nix index 8729a2dd4..00f89a2c2 100644 --- a/python/pkgs/fuzzyfinder/default.nix +++ b/python/pkgs/fuzzyfinder/default.nix @@ -5,7 +5,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fuzzyfinder"; version = "2.3.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amjith"; repo = "fuzzyfinder"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Zqh2H2d2TCxErmEE9gQwdpzZBGsjeQIo3AxBsc+C5u0="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Fuzzy Finder implemented in Python"; homepage = "https://github.com/amjith/fuzzyfinder"; - changelog = "https://github.com/amjith/fuzzyfinder/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/amjith/fuzzyfinder/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/fuzzywuzzy/default.nix b/python/pkgs/fuzzywuzzy/default.nix index dc4856500..5f29541d6 100644 --- a/python/pkgs/fuzzywuzzy/default.nix +++ b/python/pkgs/fuzzywuzzy/default.nix @@ -10,13 +10,13 @@ levenshtein, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fuzzywuzzy"; version = "0.18.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RQFukiZHgOWJctyhs9k5rIZLeEN0Ir7s67MJX479AOg="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/seatgeek/fuzzywuzzy"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/fxrays/default.nix b/python/pkgs/fxrays/default.nix index 8644367c6..013ba45a8 100644 --- a/python/pkgs/fxrays/default.nix +++ b/python/pkgs/fxrays/default.nix @@ -7,7 +7,7 @@ cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fxrays"; version = "1.3.6"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "3-manifolds"; repo = "FXrays"; - tag = "${version}_as_released"; + tag = "${finalAttrs.version}_as_released"; hash = "sha256-IwEY54zDXqMci7WRvhueDJidTsbMwv6eqQSGZzFOtnQ"; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/3-manifolds/FXrays"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/fyta-cli/default.nix b/python/pkgs/fyta-cli/default.nix index e17578963..e97cb2af7 100644 --- a/python/pkgs/fyta-cli/default.nix +++ b/python/pkgs/fyta-cli/default.nix @@ -30,8 +30,6 @@ buildPythonPackage (finalAttrs: { mashumaro ]; - doCheck = false; # Failed: async def functions are not natively supported. - nativeCheckInputs = [ aioresponses pytest-asyncio diff --git a/python/pkgs/g2pkk/default.nix b/python/pkgs/g2pkk/default.nix index 3cf40e084..130c442c2 100644 --- a/python/pkgs/g2pkk/default.nix +++ b/python/pkgs/g2pkk/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.2"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-YarV1Btn1x3Sm4Vw/JDSyJy3ZJMXAQHZJJJklSG0R+Q="; @@ -30,8 +28,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "g2pkk" ]; - doCheck = false; - meta = { description = "Cross-platform g2p for Korean"; homepage = "https://github.com/harmlessman/g2pkk"; diff --git a/python/pkgs/galois/default.nix b/python/pkgs/galois/default.nix index b6be6f0e0..f8093fa69 100644 --- a/python/pkgs/galois/default.nix +++ b/python/pkgs/galois/default.nix @@ -10,7 +10,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "galois"; version = "0.4.11"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mhostetter"; repo = "galois"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iTxPsuWmaQ4L19ND0UeRLKrdM++M8UnT3I06z+E8jjc="; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = { description = "Python package that extends NumPy arrays to operate over finite fields"; homepage = "https://github.com/mhostetter/galois"; - downloadPage = "https://github.com/mhostetter/galois/releases/tag/v${version}"; + downloadPage = "https://github.com/mhostetter/galois/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gamble/default.nix b/python/pkgs/gamble/default.nix index 4d30363f7..7a825b698 100644 --- a/python/pkgs/gamble/default.nix +++ b/python/pkgs/gamble/default.nix @@ -6,7 +6,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gamble"; version = "0.14.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jpetrucciani"; repo = "gamble"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vzaY5gJ0Ou2ArUJ0kuTWzTeLfiRDhUt/Hxpns9rFiDk="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/jpetrucciani/gamble"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/garminconnect-aio/default.nix b/python/pkgs/garminconnect-aio/default.nix index 389e33f21..8e6910bfd 100644 --- a/python/pkgs/garminconnect-aio/default.nix +++ b/python/pkgs/garminconnect-aio/default.nix @@ -4,29 +4,32 @@ brotlipy, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "garminconnect-aio"; version = "0.1.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-garminconnect-aio"; - rev = version; + tag = finalAttrs.version; hash = "sha256-GWY2kTG2D+wOJqM/22pNV5rLvWjAd4jxVGlHBou/T2g="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp brotlipy yarl ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "garminconnect_aio" ]; @@ -35,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/cyberjunky/python-garminconnect-aio"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gassist-text/default.nix b/python/pkgs/gassist-text/default.nix index 2402df43a..952e93083 100644 --- a/python/pkgs/gassist-text/default.nix +++ b/python/pkgs/gassist-text/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gassist-text"; version = "0.1.0"; pyproject = true; @@ -19,13 +19,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tronikos"; repo = "gassist_text"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KrlStBYsE8PwAH7C7WzLezLffBFcmj/1cA0YJq/hkkU="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 google-auth grpcio @@ -33,7 +33,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "gassist_text" ]; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/tronikos/gassist_text"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/gast/default.nix b/python/pkgs/gast/default.nix index b4d47abee..edac10cef 100644 --- a/python/pkgs/gast/default.nix +++ b/python/pkgs/gast/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gast"; version = "0.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-C7FM0bgGci6R3bq2+4a7oUjCK0Dn/xHiSJdOBMit/a4="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/serge-sans-paille/gast/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/gattlib/default.nix b/python/pkgs/gattlib/default.nix index 2ef8ff57d..84f8e66eb 100644 --- a/python/pkgs/gattlib/default.nix +++ b/python/pkgs/gattlib/default.nix @@ -13,7 +13,7 @@ glib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gattlib"; version = "0.20210616"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oscaracena"; repo = "pygattlib"; - tag = "v.${lib.removePrefix "0." version}"; + tag = "v.${lib.removePrefix "0." finalAttrs.version}"; hash = "sha256-n3D9CWKvgw4FYmbvsfhaHN963HARBG0p4CcZBC8Gkb0="; }; @@ -61,4 +61,4 @@ buildPythonPackage rec { homepage = "https://github.com/oscaracena/pygattlib"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/gb-io/default.nix b/python/pkgs/gb-io/default.nix index cc16bec36..b475e55dc 100644 --- a/python/pkgs/gb-io/default.nix +++ b/python/pkgs/gb-io/default.nix @@ -8,7 +8,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gb-io"; version = "0.4.0"; pyproject = true; @@ -16,12 +16,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "althonos"; repo = "gb-io.py"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6owaHSOVahgOG1gvN4Tox8c49qGzQ4lG1n8GKwEnCRk="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit + inherit (finalAttrs) pname version src @@ -30,7 +30,7 @@ buildPythonPackage rec { hash = "sha256-ZUvcbVwhV2P8AvsuVoaPWUW5G9VaEvx3mt4kub0xHRk="; }; - sourceRoot = src.name; + sourceRoot = finalAttrs.src.name; nativeBuildInputs = [ cargo @@ -49,4 +49,4 @@ buildPythonPackage rec { description = "Python interface to gb-io, a fast GenBank parser written in Rust"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gcloud-aio-auth/default.nix b/python/pkgs/gcloud-aio-auth/default.nix index 17289b757..4bdd4bcb7 100644 --- a/python/pkgs/gcloud-aio-auth/default.nix +++ b/python/pkgs/gcloud-aio-auth/default.nix @@ -11,14 +11,14 @@ tenacity, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gcloud-aio-auth"; version = "5.5.0"; pyproject = true; src = fetchPypi { pname = "gcloud_aio_auth"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-VsP+8x3sbzhB9esMefr5oc0+R1+ix6GUv1FiJqo5/Rg="; }; @@ -36,11 +36,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "gcloud.aio.auth" ]; # Tests require network access - doCheck = false; meta = { description = "Python client for Google Cloud auth"; homepage = "https://github.com/talkiq/gcloud-aio"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gcloud-aio-storage/default.nix b/python/pkgs/gcloud-aio-storage/default.nix index dedfb0e66..4a27dd1f9 100644 --- a/python/pkgs/gcloud-aio-storage/default.nix +++ b/python/pkgs/gcloud-aio-storage/default.nix @@ -10,14 +10,14 @@ rsa, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gcloud-aio-storage"; version = "9.6.4"; pyproject = true; src = fetchPypi { pname = "gcloud_aio_storage"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-TadB6eRfCrX1eqm6LUYDLd5LgPPrCgPeMax0Gt1CBIU="; }; @@ -39,11 +39,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "gcloud.aio.storage" ]; # Tests require network access - doCheck = false; meta = { description = "Python client for Google Cloud Storage"; homepage = "https://github.com/talkiq/gcloud-aio"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gcodepy/default.nix b/python/pkgs/gcodepy/default.nix index c7dd9c757..aca3de4b7 100644 --- a/python/pkgs/gcodepy/default.nix +++ b/python/pkgs/gcodepy/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gcodepy"; version = "0.1.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rmeno12"; repo = "gcodepy"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+amBkwwISPyes8ABdqgCw50Zg5ioDa46WZgQsZZgl+8="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/rmeno12/gcodepy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gcp-storage-emulator/default.nix b/python/pkgs/gcp-storage-emulator/default.nix index cbdd478c4..c6b68b6d6 100644 --- a/python/pkgs/gcp-storage-emulator/default.nix +++ b/python/pkgs/gcp-storage-emulator/default.nix @@ -11,7 +11,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gcp-storage-emulator"; version = "2024.08.03"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oittaa"; repo = "gcp-storage-emulator"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Lp9Wvod0wSE2+cnvLXguhagT30ax9TivyR8gC/kB7w0="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "gcp-storage-emulator"; }; -} +}) diff --git a/python/pkgs/gcsa/default.nix b/python/pkgs/gcsa/default.nix index 5ed1777eb..e4b77d2b5 100644 --- a/python/pkgs/gcsa/default.nix +++ b/python/pkgs/gcsa/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, pyfakefs, tzlocal, @@ -12,19 +14,21 @@ beautiful-date, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gcsa"; version = "2.7.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "kuzmoyev"; repo = "google-calendar-simple-api"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lDmdV1F/EFtZEhq4ufH9nPvzNZ9msUGNZcmWiVTTTWc="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ tzlocal google-api-python-client google-auth-httplib2 @@ -44,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/kuzmoyev/google-calendar-simple-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gcsfs/default.nix b/python/pkgs/gcsfs/default.nix index a6b60d1ec..52b5470c1 100644 --- a/python/pkgs/gcsfs/default.nix +++ b/python/pkgs/gcsfs/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { pname = "gcsfs"; version = "2026.3.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "fsspec"; @@ -47,7 +46,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests require a running Docker instance - doCheck = false; pythonImportsCheck = [ "gcsfs" ]; diff --git a/python/pkgs/gdata/default.nix b/python/pkgs/gdata/default.nix index d35778905..03ece5264 100644 --- a/python/pkgs/gdata/default.nix +++ b/python/pkgs/gdata/default.nix @@ -2,24 +2,27 @@ lib, buildPythonPackage, fetchurl, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gdata"; version = "2.0.18"; - format = "setuptools"; + pyproject = true; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gdata-python-client/${pname}-${version}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gdata-python-client/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "1dpxl5hwyyqd71avpm5vkvw8fhlvf9liizmhrq9jphhrx0nx5rsn"; }; + build-system = [ setuptools ]; + # Fails with "error: invalid command 'test'" - doCheck = false; meta = { homepage = "https://github.com/google/gdata-python-client"; description = "Python client library for Google data APIs"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/gdown/default.nix b/python/pkgs/gdown/default.nix index 699117272..30f70061f 100644 --- a/python/pkgs/gdown/default.nix +++ b/python/pkgs/gdown/default.nix @@ -16,13 +16,13 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gdown"; version = "6.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-C78l03YSYiY6LZ1KbLJuvH4PIlrY8TSDIJmSUIvM3FQ="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/wkentaro/gdown"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gekko/default.nix b/python/pkgs/gekko/default.nix index f36b3fd32..7545e25db 100644 --- a/python/pkgs/gekko/default.nix +++ b/python/pkgs/gekko/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gekko"; version = "1.3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-o5nNn4lshkrb37ud0FL5V9EG9FTgpxG9U9tpbIiazn4="; }; @@ -21,7 +21,6 @@ buildPythonPackage rec { dependencies = [ numpy ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "gekko" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/BYU-PRISM/GEKKO"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gemfileparser/default.nix b/python/pkgs/gemfileparser/default.nix index d209ae38e..4de060027 100644 --- a/python/pkgs/gemfileparser/default.nix +++ b/python/pkgs/gemfileparser/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gemfileparser"; version = "0.8.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-g5WS5J6j/Zhc7AA+9Y+OdwCaae12RKDArMlM9t2bjW4="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { ]; mainProgram = "parsegemfile"; }; -} +}) diff --git a/python/pkgs/gemfileparser2/default.nix b/python/pkgs/gemfileparser2/default.nix index e80719812..a4f02370d 100644 --- a/python/pkgs/gemfileparser2/default.nix +++ b/python/pkgs/gemfileparser2/default.nix @@ -7,13 +7,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gemfileparser2"; version = "0.9.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ezfioBwlZMGb1cEzzwa1afXUrTnxsgpzX0CNOTyVzgY="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { gpl3Plus ]; }; -} +}) diff --git a/python/pkgs/genai-prices/default.nix b/python/pkgs/genai-prices/default.nix index 7184eb85c..dd81ea48c 100644 --- a/python/pkgs/genai-prices/default.nix +++ b/python/pkgs/genai-prices/default.nix @@ -44,8 +44,6 @@ buildPythonPackage (finalAttrs: { "genai_prices" ]; - doCheck = false; # no tests - meta = { description = "Calculate prices for calling LLM inference APIs"; homepage = "https://github.com/pydantic/genai-prices"; diff --git a/python/pkgs/genanki/default.nix b/python/pkgs/genanki/default.nix index 79354019b..d2db706aa 100644 --- a/python/pkgs/genanki/default.nix +++ b/python/pkgs/genanki/default.nix @@ -4,22 +4,26 @@ cached-property, chevron, fetchPypi, + # build-system + setuptools, frozendict, pystache, pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "genanki"; version = "0.13.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hNCQQjqIeVIEZb/peECD7ay4014rpRH6Whve8B2Pce0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cached-property chevron frozendict @@ -33,7 +37,6 @@ buildPythonPackage rec { ''; # relies on upstream anki - doCheck = false; pythonImportsCheck = [ "genanki" ]; @@ -42,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/kerrickstaley/genanki"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/general-sam/default.nix b/python/pkgs/general-sam/default.nix index 144728c6d..f1933cbec 100644 --- a/python/pkgs/general-sam/default.nix +++ b/python/pkgs/general-sam/default.nix @@ -8,7 +8,7 @@ rustc, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "general-sam"; version = "1.0.4.post0"; pyproject = true; @@ -16,12 +16,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ModelTC"; repo = "general-sam-py"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bpJL6kpcpMWNNUOSLUnRLsAi7yp3fl0WKzvfXiGwYeE="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-kmc1sGlSTQHdLaW7fDk0AmkEDmttEEljVEsc6inLRuw="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/generic/default.nix b/python/pkgs/generic/default.nix index f32fa9b9d..490946516 100644 --- a/python/pkgs/generic/default.nix +++ b/python/pkgs/generic/default.nix @@ -6,13 +6,13 @@ exceptiongroup, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "generic"; version = "1.1.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0U2uZihULrCEQ0WI01B1bIjy8wx+I0itX8+gH723zu0="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/gaphor/generic"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/genie-partner-sdk/default.nix b/python/pkgs/genie-partner-sdk/default.nix index 66361e194..7acf369ac 100644 --- a/python/pkgs/genie-partner-sdk/default.nix +++ b/python/pkgs/genie-partner-sdk/default.nix @@ -6,23 +6,22 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "genie-partner-sdk"; version = "1.0.11"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "genie_partner_sdk"; hash = "sha256-eNeN+mtpPzY6p0iVo/ot0eLza/aeJP70PxNHx7/MVoY="; }; nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; # No tests - doCheck = false; pythonImportsCheck = [ "genie_partner_sdk" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/Genie-Garage/aladdin-python-sdk"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/geniushub-client/default.nix b/python/pkgs/geniushub-client/default.nix index 875f4c1e6..795944a56 100644 --- a/python/pkgs/geniushub-client/default.nix +++ b/python/pkgs/geniushub-client/default.nix @@ -3,28 +3,32 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "geniushub-client"; version = "0.7.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "manzanotti"; repo = "geniushub-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6jVLqOf9OmxynUOjEuOPI/Pvbv3NYAbWE3glwBAY4p8="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace 'VERSION = os.environ["GITHUB_REF_NAME"]' "" \ - --replace "version=VERSION," 'version="${version}",' + --replace "version=VERSION," 'version="${finalAttrs.version}",' ''; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -35,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/manzanotti/geniushub-client"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/genome-collector/default.nix b/python/pkgs/genome-collector/default.nix index 65921691d..668476208 100644 --- a/python/pkgs/genome-collector/default.nix +++ b/python/pkgs/genome-collector/default.nix @@ -4,27 +4,30 @@ appdirs, biopython, fetchPypi, + # build-system + setuptools, proglog, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "genome_collector"; version = "0.1.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0023ihrz0waxbhq28xh1ymvk51ih882y9psg4glm6s9d1zmqvdph"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ appdirs biopython proglog ]; # Project hasn't released the tests yet - doCheck = false; pythonImportsCheck = [ "genome_collector" ]; meta = { @@ -32,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/Edinburgh-Genome-Foundry/genome_collector"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/genshi/default.nix b/python/pkgs/genshi/default.nix index 03ae3171e..58a805760 100644 --- a/python/pkgs/genshi/default.nix +++ b/python/pkgs/genshi/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "genshi"; version = "0.7.11"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gsT5u/SwO+UWKiTW2OT9v+PtJgLT68v1BaMzUKN53Lc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://genshi.edgewall.org/"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/gensim/default.nix b/python/pkgs/gensim/default.nix index 1e76b1ff5..4c868d68d 100644 --- a/python/pkgs/gensim/default.nix +++ b/python/pkgs/gensim/default.nix @@ -18,8 +18,6 @@ buildPythonPackage (finalAttrs: { version = "4.4.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "piskvorky"; repo = "gensim"; diff --git a/python/pkgs/genson/default.nix b/python/pkgs/genson/default.nix index 669e70ff0..090f47ec4 100644 --- a/python/pkgs/genson/default.nix +++ b/python/pkgs/genson/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "genson"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vH8cG66HohykTYEUmuyVo/RGjWdt6biwjKoGTzxQs9o="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/wolverdude/GenSON"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gentools/default.nix b/python/pkgs/gentools/default.nix index b37f2d384..8489c31de 100644 --- a/python/pkgs/gentools/default.nix +++ b/python/pkgs/gentools/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gentools"; version = "1.2.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ariebovenberg"; repo = "gentools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+6KTFxOpwvGOCqy6JU87gOZmDa6MvjR10qES5wIfrjI="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://gentools.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/genzshcomp/default.nix b/python/pkgs/genzshcomp/default.nix index 3050aa771..e87eb977b 100644 --- a/python/pkgs/genzshcomp/default.nix +++ b/python/pkgs/genzshcomp/default.nix @@ -8,13 +8,15 @@ buildPythonPackage (finalAttrs: { pname = "genzshcomp"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; sha256 = "b582910d36f9ad0992756d7e9ccbe3e5cf811934b1002b51f25b99d3dda9d573"; }; + build-system = [ setuptools ]; + buildInputs = [ setuptools ]; meta = { diff --git a/python/pkgs/geoalchemy2/default.nix b/python/pkgs/geoalchemy2/default.nix index c9996e18a..8394f906a 100644 --- a/python/pkgs/geoalchemy2/default.nix +++ b/python/pkgs/geoalchemy2/default.nix @@ -11,7 +11,7 @@ pytest-benchmark, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "geoalchemy2"; version = "0.20.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "geoalchemy"; repo = "geoalchemy2"; - tag = version; + tag = finalAttrs.version; hash = "sha256-QtikpkMEM/DdL0Mmt4PZuQc3EFla8xbI0MODecT1hGY="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://geoalchemy-2.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/geoarrow-types/default.nix b/python/pkgs/geoarrow-types/default.nix index 57438ab95..53b952933 100644 --- a/python/pkgs/geoarrow-types/default.nix +++ b/python/pkgs/geoarrow-types/default.nix @@ -6,7 +6,7 @@ pyarrow, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "geoarrow-types"; version = "0.3.0"; pyproject = true; @@ -14,19 +14,16 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "geoarrow-python"; owner = "geoarrow"; - tag = "geoarrow-types-${version}"; + tag = "geoarrow-types-${finalAttrs.version}"; hash = "sha256-ciElwh94ukFyFdOBuQWyOUVpn4jBM1RKfxiBCcM+nmE="; }; - sourceRoot = "${src.name}/geoarrow-types"; + sourceRoot = "${finalAttrs.src.name}/geoarrow-types"; build-system = [ setuptools-scm ]; nativeCheckInputs = [ pytestCheckHook - ]; - - checkInputs = [ pyarrow ]; @@ -37,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/geoarrow/geoarrow-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/geocoder/default.nix b/python/pkgs/geocoder/default.nix index c46c9aa06..e628aff0a 100644 --- a/python/pkgs/geocoder/default.nix +++ b/python/pkgs/geocoder/default.nix @@ -39,7 +39,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests are outdated - doCheck = false; pythonImportsCheck = [ "geocoder" ]; diff --git a/python/pkgs/geodatasets/default.nix b/python/pkgs/geodatasets/default.nix index a71838056..18e6dc134 100644 --- a/python/pkgs/geodatasets/default.nix +++ b/python/pkgs/geodatasets/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "geodatasets"; version = "2026.5.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "geopandas"; repo = "geodatasets"; - tag = version; + tag = finalAttrs.version; hash = "sha256-wKe5hDK0J3e+9PyMvH1dJWpNMC8Ct4u5ysJoi7/xw4k="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://geodatasets.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/geographiclib/default.nix b/python/pkgs/geographiclib/default.nix index af946e07e..fd6777ed0 100644 --- a/python/pkgs/geographiclib/default.nix +++ b/python/pkgs/geographiclib/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "geographiclib"; version = "2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-amVF5iYtDtNSLhPFFXE3GHl+N+2MZywxrXsknzcu8Qg="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Algorithms for geodesics (Karney, 2013) for solving the direct and inverse problems for an ellipsoid of revolution"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/geoip2/default.nix b/python/pkgs/geoip2/default.nix index 9b54e13d5..6af38fe44 100644 --- a/python/pkgs/geoip2/default.nix +++ b/python/pkgs/geoip2/default.nix @@ -10,13 +10,13 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "geoip2"; version = "5.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bJ3tGVP46xYEPtCo6iDm6VJOp7Zet0VyThJJCspE7wA="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/maxmind/GeoIP2-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/geojson-client/default.nix b/python/pkgs/geojson-client/default.nix index b41466091..898032c02 100644 --- a/python/pkgs/geojson-client/default.nix +++ b/python/pkgs/geojson-client/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, geojson, haversine, pytz, @@ -9,19 +11,21 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "geojson-client"; version = "0.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-geojson-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nzM5P1ww6yWM3e2v3hRw0ECoYmRPhTs0Q7Wwicl+IpU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ geojson haversine pytz @@ -37,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/exxamalte/python-geojson-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/geojson/default.nix b/python/pkgs/geojson/default.nix index 779581eb0..c85ef1d1e 100644 --- a/python/pkgs/geojson/default.nix +++ b/python/pkgs/geojson/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "geojson"; version = "3.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-kug7nLN4pFC0LxIHu5sqAx+fyJGF8zUVPEQ2m4uLcf0="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Python bindings and utilities for GeoJSON"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/geomet/default.nix b/python/pkgs/geomet/default.nix index ef2e7ea96..9d5759a95 100644 --- a/python/pkgs/geomet/default.nix +++ b/python/pkgs/geomet/default.nix @@ -7,7 +7,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "geomet"; version = "1.1.0"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "geomet"; repo = "geomet"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YfI29925nffzRBMJb6Gm3muvlpwP3zSw2YJ2vWcf+Bo="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ click six ]; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/geomet/geomet"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/geometric/default.nix b/python/pkgs/geometric/default.nix index 56aec3d75..56e79bcb5 100644 --- a/python/pkgs/geometric/default.nix +++ b/python/pkgs/geometric/default.nix @@ -2,6 +2,8 @@ buildPythonPackage, lib, fetchFromGitHub, + # build-system + setuptools, networkx, numpy, scipy, @@ -9,19 +11,21 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "geometric"; version = "1.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "leeping"; repo = "geomeTRIC"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LY5eNKocJL/Ty8tLup6q2o5RkGfIp6P6Hmju4wF3cDw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ networkx numpy scipy @@ -36,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/leeping/geomeTRIC"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/geopandas/default.nix b/python/pkgs/geopandas/default.nix index 154ad31e1..0d8e32f81 100644 --- a/python/pkgs/geopandas/default.nix +++ b/python/pkgs/geopandas/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { pname = "geopandas"; version = "1.1.4"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "geopandas"; @@ -51,12 +50,10 @@ buildPythonPackage (finalAttrs: { optional-dependencies = { all = [ (folium.overridePythonAttrs (prevAttrs: { - doCheck = false; })) geoalchemy2 geopy (mapclassify.overridePythonAttrs (prevAttrs: { - doCheck = false; })) matplotlib psycopg diff --git a/python/pkgs/geoparquet/default.nix b/python/pkgs/geoparquet/default.nix index bbdb77af2..4b2d4ea34 100644 --- a/python/pkgs/geoparquet/default.nix +++ b/python/pkgs/geoparquet/default.nix @@ -36,8 +36,6 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "geoparquet" ]; - doCheck = false; # no tests - meta = { description = "API between Parquet files and GeoDataFrames for fast input/output of GIS data"; homepage = "https://github.com/darcy-r/geoparquet-python"; diff --git a/python/pkgs/geopy/default.nix b/python/pkgs/geopy/default.nix index dd8c5f272..45dc63dad 100644 --- a/python/pkgs/geopy/default.nix +++ b/python/pkgs/geopy/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "2.5.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "geopy"; repo = "geopy"; diff --git a/python/pkgs/georss-client/default.nix b/python/pkgs/georss-client/default.nix index ad6442b22..5ab66438e 100644 --- a/python/pkgs/georss-client/default.nix +++ b/python/pkgs/georss-client/default.nix @@ -16,14 +16,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "georss-client"; version = "2026.6.1"; pyproject = true; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3JaFZY6c5wlJs2yE3KJITJIeCgifzurW7chOfQubQ5w="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/exxamalte/python-georss-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/georss-generic-client/default.nix b/python/pkgs/georss-generic-client/default.nix index 71598db21..15c593f8f 100644 --- a/python/pkgs/georss-generic-client/default.nix +++ b/python/pkgs/georss-generic-client/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "georss-generic-client"; version = "2026.6.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-generic-client"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1sEDkME4x0SK+5H9uenjfFDhnLUxUJMNEmtTx+VZ2I4="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/exxamalte/python-georss-generic-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/georss-ign-sismologia-client/default.nix b/python/pkgs/georss-ign-sismologia-client/default.nix index bbc6b09b9..850e0ccc6 100644 --- a/python/pkgs/georss-ign-sismologia-client/default.nix +++ b/python/pkgs/georss-ign-sismologia-client/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "georss-ign-sismologia-client"; version = "2026.6.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ign-sismologia-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qAgV6w+wsZ3sJwegrWuZ8cp7ZlRws04Qjn1frZ334IU="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/exxamalte/python-georss-ign-sismologia-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/georss-nrcan-earthquakes-client/default.nix b/python/pkgs/georss-nrcan-earthquakes-client/default.nix index 69044209f..2ef6282e2 100644 --- a/python/pkgs/georss-nrcan-earthquakes-client/default.nix +++ b/python/pkgs/georss-nrcan-earthquakes-client/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "georss-nrcan-earthquakes-client"; version = "2026.6.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-nrcan-earthquakes-client"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JRU+ncPRbkA/fQ6aIOX6J09ErMpgH2Rk8AF+eWR5WXg="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/exxamalte/python-georss-nrcan-earthquakes-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/georss-qld-bushfire-alert-client/default.nix b/python/pkgs/georss-qld-bushfire-alert-client/default.nix index c783b9e5f..84ef36fca 100644 --- a/python/pkgs/georss-qld-bushfire-alert-client/default.nix +++ b/python/pkgs/georss-qld-bushfire-alert-client/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "georss-qld-bushfire-alert-client"; version = "2026.6.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-qld-bushfire-alert-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iXcBzrU0hPeNykz4OZ3XiXAG0CobdARVHeC6LVuH+KY="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/exxamalte/python-georss-qld-bushfire-alert-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/georss-tfs-incidents-client/default.nix b/python/pkgs/georss-tfs-incidents-client/default.nix index 839877db2..02ebfbf65 100644 --- a/python/pkgs/georss-tfs-incidents-client/default.nix +++ b/python/pkgs/georss-tfs-incidents-client/default.nix @@ -2,23 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, georss-client, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "georss-tfs-incidents-client"; version = "0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-tfs-incidents-client"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Cz0PRcGReAE0mg04ktCUaoLqPTjvyU1TiB/Pdz7o7zo="; }; - propagatedBuildInputs = [ georss-client ]; + build-system = [ setuptools ]; + + dependencies = [ georss-client ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -29,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/exxamalte/python-georss-tfs-incidents-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/georss-wa-dfes-client/default.nix b/python/pkgs/georss-wa-dfes-client/default.nix index cf5196279..40f48aa35 100644 --- a/python/pkgs/georss-wa-dfes-client/default.nix +++ b/python/pkgs/georss-wa-dfes-client/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "georss-wa-dfes-client"; version = "2026.6.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-wa-dfes-client"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9wkGwuO8FV3ZJWq0LqdUFFwW4WQw+f826mTPFp+LMpw="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/exxamalte/python-georss-wa-dfes-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/gerbonara/default.nix b/python/pkgs/gerbonara/default.nix index dc539c81c..291637b12 100644 --- a/python/pkgs/gerbonara/default.nix +++ b/python/pkgs/gerbonara/default.nix @@ -32,7 +32,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "gerbonara" ]; # Test environment is exceptionally tricky to get set up, so skip for now. - doCheck = false; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/python/pkgs/getch/default.nix b/python/pkgs/getch/default.nix index 7afa29fb5..ef843f992 100644 --- a/python/pkgs/getch/default.nix +++ b/python/pkgs/getch/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "getch" ]; # Module has no tests - doCheck = false; meta = { description = "Does single char input, like C getch/getche"; diff --git a/python/pkgs/getjump/default.nix b/python/pkgs/getjump/default.nix index 47f51f554..5efcd6ed1 100644 --- a/python/pkgs/getjump/default.nix +++ b/python/pkgs/getjump/default.nix @@ -42,7 +42,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "getjump" ]; # all the tests talk to the internet - doCheck = false; meta = { description = "Get and save images from jump web viewer"; diff --git a/python/pkgs/getkey/default.nix b/python/pkgs/getkey/default.nix index 1398f7215..aab25017a 100644 --- a/python/pkgs/getkey/default.nix +++ b/python/pkgs/getkey/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "getkey"; version = "0.6.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aMfHAsOzTerPQn9sDx/WbFwqoS14AaoyRC/BpxyM4Fk="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/kcsaff/getkey"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/getmac/default.nix b/python/pkgs/getmac/default.nix index b7106c071..266c76aee 100644 --- a/python/pkgs/getmac/default.nix +++ b/python/pkgs/getmac/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "getmac"; version = "0.9.5"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GhostofGoes"; repo = "getmac"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ZbTCbbASs7+ChmgcDePXSbiHOst6/eCkq9SiKgYhFyM="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "getmac"; }; -} +}) diff --git a/python/pkgs/gevent-eventemitter/default.nix b/python/pkgs/gevent-eventemitter/default.nix index 4babb620c..095ed51c3 100644 --- a/python/pkgs/gevent-eventemitter/default.nix +++ b/python/pkgs/gevent-eventemitter/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gevent-eventemitter"; version = "2.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rossengeorgiev"; repo = "gevent-eventemitter"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aW4OsQi3N5yAMdbTd8rxbb2qYMfFJBR4WQFIXvxpiMw="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/gevent-socketio/default.nix b/python/pkgs/gevent-socketio/default.nix index 7394db291..3542f5f13 100644 --- a/python/pkgs/gevent-socketio/default.nix +++ b/python/pkgs/gevent-socketio/default.nix @@ -2,29 +2,32 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, gevent, gevent-websocket, versiontools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gevent-socketio"; version = "0.3.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-UzlKuT+9hNnbuyvvhTSfalA7/FPYapvoZTJQ8aBBKv8="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ versiontools ]; buildInputs = [ gevent-websocket ]; - propagatedBuildInputs = [ gevent ]; + dependencies = [ gevent ]; # Tests are not ported to Python 3 - doCheck = false; pythonImportsCheck = [ "socketio" ]; @@ -33,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/abourget/gevent-socketio"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/gevent-websocket/default.nix b/python/pkgs/gevent-websocket/default.nix index 5659b398f..cca1b4e0b 100644 --- a/python/pkgs/gevent-websocket/default.nix +++ b/python/pkgs/gevent-websocket/default.nix @@ -7,13 +7,13 @@ gunicorn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gevent-websocket"; version = "0.10.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fq7zKWgpDJEh98Nblz4swwL/sHbQGMkGjS9cqLLYX7A="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://www.gitlab.com/noppo/gevent-websocket"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/gevent/default.nix b/python/pkgs/gevent/default.nix index 3082e3e35..b0a53db5c 100644 --- a/python/pkgs/gevent/default.nix +++ b/python/pkgs/gevent/default.nix @@ -17,13 +17,13 @@ libuv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gevent"; version = "26.8.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lgOfQbvebc1yVZ5f+9QIoE9Gd0tH2ZHUzwMtqPp55aA="; }; @@ -54,10 +54,9 @@ buildPythonPackage rec { }; # Bunch of failures. - doCheck = false; pythonImportsCheck = [ "gevent" "gevent.events" ]; -} +}) diff --git a/python/pkgs/geventhttpclient/default.nix b/python/pkgs/geventhttpclient/default.nix index ab6522aa0..9d1925e12 100644 --- a/python/pkgs/geventhttpclient/default.nix +++ b/python/pkgs/geventhttpclient/default.nix @@ -11,7 +11,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "geventhttpclient"; version = "2.3.9"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "geventhttpclient"; repo = "geventhttpclient"; - tag = version; + tag = finalAttrs.version; # TODO: unvendor llhttp fetchSubmodules = true; hash = "sha256-SBrF/e36wO9W+tNzbe6nGQrRgl1w0X4X1lmkrJM1OLY="; @@ -44,4 +44,4 @@ buildPythonPackage rec { description = "High performance, concurrent HTTP client library using gevent"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gflags/default.nix b/python/pkgs/gflags/default.nix index 7c6015911..6ede777c2 100644 --- a/python/pkgs/gflags/default.nix +++ b/python/pkgs/gflags/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-gflags"; version = "3.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QK4THome9o6eFKpTygY4OcNPahaK/mIiF7W4dUkqHuI="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/python-gflags"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/gflanguages/default.nix b/python/pkgs/gflanguages/default.nix index dc1a0b173..b1c814d41 100644 --- a/python/pkgs/gflanguages/default.nix +++ b/python/pkgs/gflanguages/default.nix @@ -8,13 +8,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gflanguages"; version = "0.7.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JR+lmwGhPR/RoskpouNzGOE9kRgvSGgzx5Xa196k0eA="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/googlefonts/lang"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ghdiff/default.nix b/python/pkgs/ghdiff/default.nix index bc1606c39..9ee1977d9 100644 --- a/python/pkgs/ghdiff/default.nix +++ b/python/pkgs/ghdiff/default.nix @@ -2,23 +2,27 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, zope-testrunner, six, chardet, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ghdiff"; version = "0.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "17mdhi2sq9017nq8rkjhhc87djpi5z99xiil0xz17dyplr7nmkqk"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ zope-testrunner ]; - propagatedBuildInputs = [ + dependencies = [ six chardet ]; @@ -29,4 +33,4 @@ buildPythonPackage rec { description = "Generate Github-style HTML for unified diffs"; mainProgram = "ghdiff"; }; -} +}) diff --git a/python/pkgs/ghome-foyer-api/default.nix b/python/pkgs/ghome-foyer-api/default.nix index a968b958f..7d2fa77d6 100644 --- a/python/pkgs/ghome-foyer-api/default.nix +++ b/python/pkgs/ghome-foyer-api/default.nix @@ -8,7 +8,7 @@ protobuf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ghome-foyer-api"; version = "1.2.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KapJI"; repo = "ghome-foyer-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hIprnkfAUbKoAp++sxu+T7MuGqLKOM1N1hqGBDOSo3k="; }; @@ -30,8 +30,6 @@ buildPythonPackage rec { protobuf ]; - doCheck = false; # no tests - pythonRelaxDeps = [ "protobuf" ]; meta = { @@ -39,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/KapJI/ghome-foyer-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ghrepo-stats/default.nix b/python/pkgs/ghrepo-stats/default.nix index eaa207346..b618f7cae 100644 --- a/python/pkgs/ghrepo-stats/default.nix +++ b/python/pkgs/ghrepo-stats/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "ghrepo_stats" ]; diff --git a/python/pkgs/gibberish-detector/default.nix b/python/pkgs/gibberish-detector/default.nix index 7e291b7d0..6215283a9 100644 --- a/python/pkgs/gibberish-detector/default.nix +++ b/python/pkgs/gibberish-detector/default.nix @@ -10,12 +10,10 @@ buildPythonPackage (finalAttrs: { version = "0.1.1"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "domanchi"; repo = "gibberish-detector"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; sha256 = "1si0fkpnk9vjkwl31sq5jkyv3rz8a5f2nh3xq7591j9wv2b6dn0b"; }; diff --git a/python/pkgs/gidgethub/default.nix b/python/pkgs/gidgethub/default.nix index a05f39527..ca3c7d7ef 100644 --- a/python/pkgs/gidgethub/default.nix +++ b/python/pkgs/gidgethub/default.nix @@ -13,13 +13,13 @@ pytest-tornasync, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gidgethub"; version = "5.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dHDXcj18F0NHGi1i55yHUvuhKxwJcuS61XJSM4pQHb0="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/brettcannon/gidgethub"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/gilknocker/default.nix b/python/pkgs/gilknocker/default.nix index 9ca962539..234d5e934 100644 --- a/python/pkgs/gilknocker/default.nix +++ b/python/pkgs/gilknocker/default.nix @@ -17,7 +17,7 @@ pytest-rerunfailures, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gilknocker"; version = "0.4.2"; pyproject = true; @@ -25,12 +25,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "milesgranger"; repo = "gilknocker"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RFLThZRxAXqF/Yzjpmafn2dVavOGJrM9U258FfLej/I="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-C3rxqmZMSc6SC8bU5VB61x8Xk/crD3o7Nr1xvzv7uqI="; }; @@ -84,4 +84,4 @@ buildPythonPackage rec { unlicense ]; }; -} +}) diff --git a/python/pkgs/gipc/default.nix b/python/pkgs/gipc/default.nix index e84324ba1..d7531adcf 100644 --- a/python/pkgs/gipc/default.nix +++ b/python/pkgs/gipc/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gipc"; version = "1.8.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jgehrcke"; repo = "gipc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-P3soMA/EBMuhkXQsiLv9gnDBfo9XGosKnSMi+EZ0gaM="; }; @@ -61,4 +61,4 @@ buildPythonPackage rec { homepage = "http://gehrcke.de/gipc"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gistyc/default.nix b/python/pkgs/gistyc/default.nix index 22820a4c1..05ae8cea2 100644 --- a/python/pkgs/gistyc/default.nix +++ b/python/pkgs/gistyc/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, certifi, click, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gistyc"; version = "1.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-WVK45U9e3qyZFi9wSRHNi9+1u4TetlZkYXAZN7LVqhE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ certifi click requests @@ -38,4 +42,4 @@ buildPythonPackage rec { ''; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/git-filter-repo/default.nix b/python/pkgs/git-filter-repo/default.nix index 4cc24eb1e..5999b53d9 100644 --- a/python/pkgs/git-filter-repo/default.nix +++ b/python/pkgs/git-filter-repo/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "git-filter-repo"; version = "2.47.0"; docs_version = "71d71d4be238628bf9cb9b27be79b8bb824ed1a9"; @@ -15,19 +15,19 @@ buildPythonPackage rec { src = fetchPypi { pname = "git_filter_repo"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-QRsn5ooIDAemnCM8tSbbwthIsJpy8QR39ERN0IIs8pA="; }; docs = fetchFromGitHub { owner = "newren"; repo = "git-filter-repo"; - rev = docs_version; + rev = finalAttrs.docs_version; hash = "sha256-m9NI7bLR5F+G7f3Dyi4sP6n4qz2i8cdBRuIn0OcpHAw="; }; postInstall = '' - installManPage ${docs}/man1/git-filter-repo.1 + installManPage ${finalAttrs.docs}/man1/git-filter-repo.1 ''; build-system = [ setuptools-scm ]; @@ -47,4 +47,4 @@ buildPythonPackage rec { mainProgram = "git-filter-repo"; }; -} +}) diff --git a/python/pkgs/git-find-repos/default.nix b/python/pkgs/git-find-repos/default.nix index a98d002f7..1abc801c4 100644 --- a/python/pkgs/git-find-repos/default.nix +++ b/python/pkgs/git-find-repos/default.nix @@ -4,7 +4,7 @@ lib, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "git-find-repos"; version = "2.1.1"; pyproject = true; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "acroz"; repo = "git-find-repos"; - rev = version; + tag = finalAttrs.version; sha256 = "sha256-+MiCMgIakpJaWWdN2grerlPbPAnfIXuclvRw8XQ1YiI="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "git-find-repos"; }; -} +}) diff --git a/python/pkgs/git-sweep/default.nix b/python/pkgs/git-sweep/default.nix index 22354b0d7..7420f6e95 100644 --- a/python/pkgs/git-sweep/default.nix +++ b/python/pkgs/git-sweep/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ gitpython ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "gitsweep" ]; diff --git a/python/pkgs/git-versioner/default.nix b/python/pkgs/git-versioner/default.nix index 7e998e0ca..b993c2e77 100644 --- a/python/pkgs/git-versioner/default.nix +++ b/python/pkgs/git-versioner/default.nix @@ -5,7 +5,7 @@ fetchFromGitLab, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "git-versioner"; version = "7.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "alelec"; repo = "__version__"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bnpuFJSd4nBXJA75V61kiB+nU5pUzdEAIScfKx7aaGU="; }; @@ -21,7 +21,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; pythonImportsCheck = [ "__version__" ]; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/alelec/__version__"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gitdb/default.nix b/python/pkgs/gitdb/default.nix index ca3aaafce..741892769 100644 --- a/python/pkgs/gitdb/default.nix +++ b/python/pkgs/gitdb/default.nix @@ -6,13 +6,13 @@ smmap, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gitdb"; version = "4.0.12"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XvcfhV0ZGjMm/PvA1dqDXyaxP7y6YMMsIQkcNJ/9tXE="; }; @@ -22,7 +22,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "smmap" ]; - propagatedBuildInputs = [ smmap ]; + dependencies = [ smmap ]; pythonImportsCheck = [ "gitdb" ]; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/gitpython-developers/gitdb"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/github-webhook/default.nix b/python/pkgs/github-webhook/default.nix index 6db61b55c..06785fa28 100644 --- a/python/pkgs/github-webhook/default.nix +++ b/python/pkgs/github-webhook/default.nix @@ -24,7 +24,6 @@ buildPythonPackage (finalAttrs: { ]; # touches network - doCheck = false; meta = { description = "Framework for writing webhooks for GitHub"; diff --git a/python/pkgs/github3-py/default.nix b/python/pkgs/github3-py/default.nix index 57527690f..22978c4df 100644 --- a/python/pkgs/github3-py/default.nix +++ b/python/pkgs/github3-py/default.nix @@ -13,14 +13,14 @@ fetchpatch, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "github3-py"; version = "4.0.1"; pyproject = true; src = fetchPypi { pname = "github3.py"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-MNVxB2dT78OJ7cf5qu8zik/LJLVNiWjV85sTQvRd3TY="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { description = "Wrapper for the GitHub API written in python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/gitignore-parser/default.nix b/python/pkgs/gitignore-parser/default.nix index 3626f36ab..9d3a8929c 100644 --- a/python/pkgs/gitignore-parser/default.nix +++ b/python/pkgs/gitignore-parser/default.nix @@ -6,7 +6,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gitignore-parser"; version = "0.1.13"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mherrmann"; repo = "gitignore_parser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jd5C8whfdLuEC+ebDAAYso33o2H963P+8RWcm26koVM="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/mherrmann/gitignore_parser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gitingest/default.nix b/python/pkgs/gitingest/default.nix index d8258cd61..6cc7beecb 100644 --- a/python/pkgs/gitingest/default.nix +++ b/python/pkgs/gitingest/default.nix @@ -30,7 +30,7 @@ python-multipart, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gitingest"; version = "0.3.1"; pyproject = true; @@ -38,7 +38,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "coderamp-labs"; repo = "gitingest"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-drsncGneZyOCC2GJbrDM+bf4QGI2luacxMhrmdk03l4="; }; @@ -103,4 +103,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "gitingest"; }; -} +}) diff --git a/python/pkgs/gitlike-commands/default.nix b/python/pkgs/gitlike-commands/default.nix index a35db664f..8c232b576 100644 --- a/python/pkgs/gitlike-commands/default.nix +++ b/python/pkgs/gitlike-commands/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { build-system = [ poetry-core ]; # Module has no real tests - doCheck = false; pythonImportsCheck = [ "gitlike_commands" ]; diff --git a/python/pkgs/gitpython/default.nix b/python/pkgs/gitpython/default.nix index 2f27698a1..35237f0f7 100644 --- a/python/pkgs/gitpython/default.nix +++ b/python/pkgs/gitpython/default.nix @@ -34,7 +34,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests require a git repo - doCheck = false; pythonImportsCheck = [ "git" ]; diff --git a/python/pkgs/giturlparse/default.nix b/python/pkgs/giturlparse/default.nix index b82769afa..1d412e819 100644 --- a/python/pkgs/giturlparse/default.nix +++ b/python/pkgs/giturlparse/default.nix @@ -5,7 +5,7 @@ setuptools, unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "giturlparse"; version = "0.15.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nephila"; repo = "giturlparse"; - tag = version; + tag = finalAttrs.version; hash = "sha256-EGhmWudQjzqw8xK/pIj5nZqosBX2lnYEgNRNQ/ePEmo="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/nephila/giturlparse"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/glad/default.nix b/python/pkgs/glad/default.nix index bac6dc1d1..d07edf0f0 100644 --- a/python/pkgs/glad/default.nix +++ b/python/pkgs/glad/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "glad"; version = "0.1.36"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-P7ANv+x65t2+ugTiFUf2fzzPx5X8NFYkUM8/K7Gf28c="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/Dav1dde/glad"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/glad2/default.nix b/python/pkgs/glad2/default.nix index 35b2d6dda..f64408ac5 100644 --- a/python/pkgs/glad2/default.nix +++ b/python/pkgs/glad2/default.nix @@ -6,13 +6,13 @@ jinja2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "glad2"; version = "2.0.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uEB5ufpATzcXG5Yb3R2NohNw5sgY3vuEgcWz/j1kNto="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/Dav1dde/glad"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/glean-parser/default.nix b/python/pkgs/glean-parser/default.nix index 113f7bd3b..744c8a755 100644 --- a/python/pkgs/glean-parser/default.nix +++ b/python/pkgs/glean-parser/default.nix @@ -13,14 +13,14 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "glean-parser"; version = "21.0.1"; pyproject = true; src = fetchPypi { pname = "glean_parser"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Dg8R63l3iwItwevZWPjOGcBhuLW9k8+OFnGKXWZX/NU="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://github.com/mozilla/glean_parser"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/globus-sdk/default.nix b/python/pkgs/globus-sdk/default.nix index ec072aa6d..d4352cbc0 100644 --- a/python/pkgs/globus-sdk/default.nix +++ b/python/pkgs/globus-sdk/default.nix @@ -8,7 +8,7 @@ pyjwt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "globus-sdk"; version = "4.9.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "globus"; repo = "globus-sdk-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-i0cvhZaz1ANeOzRFsxYj9PNJAf2SwauX1omJ/fVmgwI="; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "Interface to Globus REST APIs, including the Transfer API and the Globus Auth API"; homepage = "https://github.com/globus/globus-sdk-python"; - changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${src.tag}"; + changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/glocaltokens/default.nix b/python/pkgs/glocaltokens/default.nix index 6a7b7689f..7e944d15c 100644 --- a/python/pkgs/glocaltokens/default.nix +++ b/python/pkgs/glocaltokens/default.nix @@ -20,7 +20,7 @@ faker, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "glocaltokens"; version = "0.7.6"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "leikoilja"; repo = "glocaltokens"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+7HpyZUumu1r/UXM4awckjTkpVbCz7MsAJOp2JiJzho="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { homepage = "https://github.com/leikoilja/glocaltokens"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/glom/default.nix b/python/pkgs/glom/default.nix index f8efff474..b285d8f1d 100644 --- a/python/pkgs/glom/default.nix +++ b/python/pkgs/glom/default.nix @@ -12,13 +12,13 @@ face, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "glom"; version = "25.12.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GufaiL42k99ArSe99Xp2WlXAdchslxvN3WeSdAPrAGk="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/mahmoud/glom"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/gmqtt/default.nix b/python/pkgs/gmqtt/default.nix index 622c6b108..f8ad876ee 100644 --- a/python/pkgs/gmqtt/default.nix +++ b/python/pkgs/gmqtt/default.nix @@ -11,20 +11,19 @@ pytest-asyncio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gmqtt"; version = "0.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vt/se6wmtrTOHwxMMs/z1mNSalTIgtMj1BVg/DubRKI="; }; build-system = [ setuptools ]; # Tests require local socket connection which is forbidden in the sandbox - doCheck = false; nativeCheckInputs = [ pytestCheckHook @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/wialon/gmqtt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gntp/default.nix b/python/pkgs/gntp/default.nix index 490d81aa0..e8922122d 100644 --- a/python/pkgs/gntp/default.nix +++ b/python/pkgs/gntp/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gntp"; version = "1.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-9KTyAJ7Li7QaGq3dX7fAMIeyoUysLAOvApugS5Fm2uA="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/kfdm/gntp/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gnureadline/default.nix b/python/pkgs/gnureadline/default.nix index 670efed31..79eb66d0d 100644 --- a/python/pkgs/gnureadline/default.nix +++ b/python/pkgs/gnureadline/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, isPyPy, pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "8.3.3"; - format = "setuptools"; + pyproject = true; pname = "gnureadline"; disabled = isPyPy; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CXI5K9LzEkTi2YEXgkb+i3Kch2ZFT9rrJ1lGrEe36f0="; }; + build-system = [ setuptools ]; + buildInputs = [ pkgs.ncurses ]; patchPhase = '' substituteInPlace setup.py --replace "/bin/bash" "${pkgs.bash}/bin/bash" @@ -27,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/ludwigschwardt/python-gnureadline"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/goalzero/default.nix b/python/pkgs/goalzero/default.nix index 599c7e1ec..aa95f63c6 100644 --- a/python/pkgs/goalzero/default.nix +++ b/python/pkgs/goalzero/default.nix @@ -3,22 +3,25 @@ aiohttp, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "goalzero"; version = "0.2.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-h/EaEOe0zvnO5BYfcIyC3Vq8sPED6ts1IeI/GM+vm7c="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # no tests implemented - doCheck = false; pythonImportsCheck = [ "goalzero" ]; @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/tkdrob/goalzero"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gocardless-pro/default.nix b/python/pkgs/gocardless-pro/default.nix index 41fe63b18..d1f6ed725 100644 --- a/python/pkgs/gocardless-pro/default.nix +++ b/python/pkgs/gocardless-pro/default.nix @@ -9,7 +9,7 @@ responses, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gocardless-pro"; version = "3.7.3"; pyproject = true; @@ -17,13 +17,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gocardless"; repo = "gocardless-pro-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SSmyrFHDwmxmgt1D5XurFY1mvw3V2Q7AOr4JnYKJHC8="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ requests six ]; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/gocardless/gocardless-pro-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/google-ads/default.nix b/python/pkgs/google-ads/default.nix index 444abf773..306cf5df1 100644 --- a/python/pkgs/google-ads/default.nix +++ b/python/pkgs/google-ads/default.nix @@ -13,14 +13,14 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-ads"; version = "31.4.0"; pyproject = true; src = fetchPypi { pname = "google_ads"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-A45QJgivweiIiOLkrjZ7x6eHi1wyBpEHU8agifC0Y8w="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleads/google-ads-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-analytics-admin/default.nix b/python/pkgs/google-analytics-admin/default.nix index 1050211d2..fcf48219f 100644 --- a/python/pkgs/google-analytics-admin/default.nix +++ b/python/pkgs/google-analytics-admin/default.nix @@ -10,14 +10,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-analytics-admin"; version = "0.30.1"; pyproject = true; src = fetchPypi { pname = "google_analytics_admin"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-zIsVAhfb7EVwiGfZ2BIW6KEOD21DLl5qxm2iqD1BGbY="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-analytics-admin"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-api-core/default.nix b/python/pkgs/google-api-core/default.nix index 9b557f0c5..3128839d7 100644 --- a/python/pkgs/google-api-core/default.nix +++ b/python/pkgs/google-api-core/default.nix @@ -12,7 +12,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-api-core"; version = "2.29.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "python-api-core"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wqDGtCYAH2f+P3zUfXgiQTePLr7a0qzUTeEc6pdCGio="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-api-core"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-auth-httplib2/default.nix b/python/pkgs/google-auth-httplib2/default.nix index 4ff4680d1..5b94544a4 100644 --- a/python/pkgs/google-auth-httplib2/default.nix +++ b/python/pkgs/google-auth-httplib2/default.nix @@ -7,7 +7,7 @@ httplib2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-auth-httplib2"; version = "0.3.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "google-auth-library-python-httplib2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-NXz2oqbNVGTWOECH+Ly9v/CMxbhygFZhlHRHrnYLhCg="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-auth/default.nix b/python/pkgs/google-auth/default.nix index 53b9094f1..03d6defb7 100644 --- a/python/pkgs/google-auth/default.nix +++ b/python/pkgs/google-auth/default.nix @@ -9,7 +9,7 @@ rsa, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-auth"; version = "2.50.0"; pyproject = true; @@ -17,11 +17,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-auth-v${version}"; + tag = "google-auth-v${finalAttrs.version}"; hash = "sha256-Z3TsDEtDDfXO23gOlmEM5O4a9qS2+fTB7g0vJ4dOFH4="; }; - sourceRoot = "${src.name}/packages/google-auth"; + sourceRoot = "${finalAttrs.src.name}/packages/google-auth"; build-system = [ setuptools ]; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-auth"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-access-context-manager/default.nix b/python/pkgs/google-cloud-access-context-manager/default.nix index 90d228939..6e69878b2 100644 --- a/python/pkgs/google-cloud-access-context-manager/default.nix +++ b/python/pkgs/google-cloud-access-context-manager/default.nix @@ -31,7 +31,6 @@ buildPythonPackage (finalAttrs: { ++ google-api-core.optional-dependencies.grpc; # No tests in repo - doCheck = false; pythonImportsCheck = [ "google.identity.accesscontextmanager" ]; diff --git a/python/pkgs/google-cloud-aiplatform/default.nix b/python/pkgs/google-cloud-aiplatform/default.nix index ee5f877ba..1c53e0418 100644 --- a/python/pkgs/google-cloud-aiplatform/default.nix +++ b/python/pkgs/google-cloud-aiplatform/default.nix @@ -17,14 +17,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-aiplatform"; version = "2.1.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_aiplatform"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-lk7KFg1K9IouBLXuR2+004yEOI8jtEIOLHGzAVHWJb0="; }; @@ -61,4 +61,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-aiplatform"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-appengine-logging/default.nix b/python/pkgs/google-cloud-appengine-logging/default.nix index 95fd1f918..0d3fbd5a9 100644 --- a/python/pkgs/google-cloud-appengine-logging/default.nix +++ b/python/pkgs/google-cloud-appengine-logging/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-appengine-logging"; version = "1.10.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_appengine_logging"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-tVY+dgEKNuat8cxIliDCnuT7O5hrAG0jfpoGHrDwq7c="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-appengine-logging"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-artifact-registry/default.nix b/python/pkgs/google-cloud-artifact-registry/default.nix index 2bae6b1bb..f8771ea85 100644 --- a/python/pkgs/google-cloud-artifact-registry/default.nix +++ b/python/pkgs/google-cloud-artifact-registry/default.nix @@ -11,14 +11,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-artifact-registry"; version = "1.22.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_artifact_registry"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-DoFzqXrmld/PAsgyd6D9V04aOb5AnaY0W5Rb6+V3rZQ="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-artifact-registry"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-audit-log/default.nix b/python/pkgs/google-cloud-audit-log/default.nix index 457974ae3..869ffacf6 100644 --- a/python/pkgs/google-cloud-audit-log/default.nix +++ b/python/pkgs/google-cloud-audit-log/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-audit-log"; version = "0.6.2"; pyproject = true; src = fetchPypi { pname = "google_cloud_audit_log"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-6l3IkrGFjTRa7wxVY6coU0+odb0DiHZTkVdNPFf9jw4="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-audit-log"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-automl/default.nix b/python/pkgs/google-cloud-automl/default.nix index 240e90dff..b60f4cf0b 100644 --- a/python/pkgs/google-cloud-automl/default.nix +++ b/python/pkgs/google-cloud-automl/default.nix @@ -11,14 +11,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-automl"; version = "2.20.1"; pyproject = true; src = fetchPypi { pname = "google_cloud_automl"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-PIZ21kxcBgQXcJL77jNzy04qfaNsfBYy6WNAhIN+Bk0="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-automl"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-batch/default.nix b/python/pkgs/google-cloud-batch/default.nix index 2244612af..85fd36bd8 100644 --- a/python/pkgs/google-cloud-batch/default.nix +++ b/python/pkgs/google-cloud-batch/default.nix @@ -10,14 +10,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-batch"; version = "0.22.3"; pyproject = true; src = fetchPypi { pname = "google_cloud_batch"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ULIqB2tIIhFMSFtgCPcjoEvqksosIeI0sK78kYZGz20="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-batch"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-bigquery-datatransfer/default.nix b/python/pkgs/google-cloud-bigquery-datatransfer/default.nix index 5700b7442..8cef7a532 100644 --- a/python/pkgs/google-cloud-bigquery-datatransfer/default.nix +++ b/python/pkgs/google-cloud-bigquery-datatransfer/default.nix @@ -10,14 +10,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-bigquery-datatransfer"; version = "3.23.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_bigquery_datatransfer"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-LQEAqT9uiaEV1mjU/Cq8DwwiPqCZ9bfHNrzgECumI/k="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-bigquery-datatransfer"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-bigquery-storage/default.nix b/python/pkgs/google-cloud-bigquery-storage/default.nix index caee8ab42..0433709d9 100644 --- a/python/pkgs/google-cloud-bigquery-storage/default.nix +++ b/python/pkgs/google-cloud-bigquery-storage/default.nix @@ -10,14 +10,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-bigquery-storage"; version = "2.41.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_bigquery_storage"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-uZkpXwjOfi1qJg0kW1uYQ7oWA/YWRRXJ8Mtdge5xpdI="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigquery-storage"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-bigquery/default.nix b/python/pkgs/google-cloud-bigquery/default.nix index cd9cbb9bc..72290fbf2 100644 --- a/python/pkgs/google-cloud-bigquery/default.nix +++ b/python/pkgs/google-cloud-bigquery/default.nix @@ -19,14 +19,14 @@ ipython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-bigquery"; version = "3.45.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_bigquery"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-WnmYVoJfR3Q85WGALL0BtNXHAGKzapQs/vUUYBfs8KQ="; }; @@ -72,4 +72,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigquery"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-bigtable/default.nix b/python/pkgs/google-cloud-bigtable/default.nix index 6f1abfacb..8cd1bbc97 100644 --- a/python/pkgs/google-cloud-bigtable/default.nix +++ b/python/pkgs/google-cloud-bigtable/default.nix @@ -12,7 +12,7 @@ libcst, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-bigtable"; version = "2.35.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "python-bigtable"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rvw7mHWifJ6+g89DXtV0pOFwbbGQNlK1J+IRhy/7W5o="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigtable"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-compute/default.nix b/python/pkgs/google-cloud-compute/default.nix index f8a6ad409..3d8cb73ca 100644 --- a/python/pkgs/google-cloud-compute/default.nix +++ b/python/pkgs/google-cloud-compute/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-compute"; version = "1.52.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_compute"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-PSZDc1VdtxF7j1irKQumTRP4EiM+FS6lNm8gjHNvrlw="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-compute"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-container/default.nix b/python/pkgs/google-cloud-container/default.nix index 39c9249cb..3414df811 100644 --- a/python/pkgs/google-cloud-container/default.nix +++ b/python/pkgs/google-cloud-container/default.nix @@ -11,14 +11,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-container"; version = "2.66.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_container"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-wCKi7VNx4Rac4rlHRi641R1MzTAoxiHvaZQot2a+DNw="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-container"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-core/default.nix b/python/pkgs/google-cloud-core/default.nix index 120ed1b96..eb26ce70c 100644 --- a/python/pkgs/google-cloud-core/default.nix +++ b/python/pkgs/google-cloud-core/default.nix @@ -9,7 +9,7 @@ grpcio-status, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-core"; version = "2.5.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "python-cloud-core"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mB0gHxyK+g+e5I/3TRVAyQzPu005ug7fTvRNxciJ9LQ="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-cloud-core"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-dataflow-client/default.nix b/python/pkgs/google-cloud-dataflow-client/default.nix index 6e17b2cd1..55f0b0f6c 100644 --- a/python/pkgs/google-cloud-dataflow-client/default.nix +++ b/python/pkgs/google-cloud-dataflow-client/default.nix @@ -10,14 +10,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-dataflow-client"; version = "0.14.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_dataflow_client"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-luoVCivPdtJs5hgStMkEhQ6nVARIp1y/a8gLT6LCLac="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dataflow-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-dataform/default.nix b/python/pkgs/google-cloud-dataform/default.nix index 1831405b0..d8dc9d0b7 100644 --- a/python/pkgs/google-cloud-dataform/default.nix +++ b/python/pkgs/google-cloud-dataform/default.nix @@ -11,14 +11,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-dataform"; version = "0.11.3"; pyproject = true; src = fetchPypi { pname = "google_cloud_dataform"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-UTuLDr7LU6LwgJmRsQrNP11tHwbXd9OjZTAPBZi6u2k="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dataform"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-dataproc-metastore/default.nix b/python/pkgs/google-cloud-dataproc-metastore/default.nix index 448ac9c2d..b4e62f081 100644 --- a/python/pkgs/google-cloud-dataproc-metastore/default.nix +++ b/python/pkgs/google-cloud-dataproc-metastore/default.nix @@ -11,14 +11,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-dataproc-metastore"; version = "1.23.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_dataproc_metastore"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-J1iZ6gE3q3KZPSg81SqEqdSPDEhR6wtliZgvLU09rU0="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dataproc-metastore"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-dataproc/default.nix b/python/pkgs/google-cloud-dataproc/default.nix index 87b0eed4c..9b256f812 100644 --- a/python/pkgs/google-cloud-dataproc/default.nix +++ b/python/pkgs/google-cloud-dataproc/default.nix @@ -12,14 +12,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-dataproc"; version = "5.30.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_dataproc"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-KjxEzD1qPXpoDckzHx+XzVfFk0oTV67negdgcnZkTm0="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dataproc"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-dlp/default.nix b/python/pkgs/google-cloud-dlp/default.nix index 7c204ac69..3a9403959 100644 --- a/python/pkgs/google-cloud-dlp/default.nix +++ b/python/pkgs/google-cloud-dlp/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-dlp"; version = "3.39.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_dlp"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-dabUewER8SFoc4QYyGy1V71IqxYpzUsnNyRNUfgZH04="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dlp"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-dns/default.nix b/python/pkgs/google-cloud-dns/default.nix index 5bcedd2cf..317a3274b 100644 --- a/python/pkgs/google-cloud-dns/default.nix +++ b/python/pkgs/google-cloud-dns/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-dns"; version = "0.37.1"; pyproject = true; src = fetchPypi { pname = "google_cloud_dns"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-hOh+a74RhF41dkhPVb5apEq8vS5nfNV9P4Qed6uSdwI="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://cloud.google.com/dns"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-error-reporting/default.nix b/python/pkgs/google-cloud-error-reporting/default.nix index 9461d470e..c6d70787a 100644 --- a/python/pkgs/google-cloud-error-reporting/default.nix +++ b/python/pkgs/google-cloud-error-reporting/default.nix @@ -19,7 +19,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-error-reporting"; version = "1.14.0"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "python-error-reporting"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-do/pxm+Bo2c57ehg1cRlpax+UggSUMv8WSK30sXhHpo="; }; @@ -73,4 +73,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-error-reporting"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-iam/default.nix b/python/pkgs/google-cloud-iam/default.nix index f272df4e2..506cd8e9f 100644 --- a/python/pkgs/google-cloud-iam/default.nix +++ b/python/pkgs/google-cloud-iam/default.nix @@ -14,7 +14,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-iam"; version = "2.24.0"; pyproject = true; @@ -22,11 +22,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-cloud-iam-v${version}"; + tag = "google-cloud-iam-v${finalAttrs.version}"; hash = "sha256-ywRS1BfK6s+gcU8QRem0cSnfZq4BUQ2ABNcgnOa01LI="; }; - sourceRoot = "${src.name}/packages/google-cloud-iam"; + sourceRoot = "${finalAttrs.src.name}/packages/google-cloud-iam"; build-system = [ setuptools ]; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-iam"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-iot/default.nix b/python/pkgs/google-cloud-iot/default.nix index 8e1e77b71..91ab43b8c 100644 --- a/python/pkgs/google-cloud-iot/default.nix +++ b/python/pkgs/google-cloud-iot/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, google-api-core, grpc-google-iam-v1, libcst, @@ -12,17 +14,19 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-iot"; version = "2.9.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-pLQgcwR89F+9jcSDtW/5+6Gy+Wk7XQf4iD49vDPkN9U="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ google-api-core grpc-google-iam-v1 libcst @@ -61,4 +65,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-iot"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-kms/default.nix b/python/pkgs/google-cloud-kms/default.nix index 679c89d05..81d7f6d3b 100644 --- a/python/pkgs/google-cloud-kms/default.nix +++ b/python/pkgs/google-cloud-kms/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-kms"; version = "3.16.0"; pyproject = true; @@ -17,11 +17,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-cloud-kms-v${version}"; + tag = "google-cloud-kms-v${finalAttrs.version}"; hash = "sha256-FqlIazChaviPUlTiIyy67/g2i/3r4H/Icj7vVuYkiaU="; }; - sourceRoot = "${src.name}/packages/google-cloud-kms"; + sourceRoot = "${finalAttrs.src.name}/packages/google-cloud-kms"; build-system = [ setuptools ]; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-kms"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-language/default.nix b/python/pkgs/google-cloud-language/default.nix index 744b9f589..22701bb7b 100644 --- a/python/pkgs/google-cloud-language/default.nix +++ b/python/pkgs/google-cloud-language/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-language"; version = "2.21.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_language"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-MPDmkVDJckVeJUOaCA97VjDyC9QE3O+KVq5QP5Skvm0="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-language"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-logging/default.nix b/python/pkgs/google-cloud-logging/default.nix index e2f5581e5..b8342a19b 100644 --- a/python/pkgs/google-cloud-logging/default.nix +++ b/python/pkgs/google-cloud-logging/default.nix @@ -13,14 +13,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-logging"; version = "3.16.3"; pyproject = true; src = fetchPypi { pname = "google_cloud_logging"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-XXkku7M8Bmu0P3DTO6ZnSf8cKbIH3kyAsrzhqs1T9nY="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-logging"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-memcache/default.nix b/python/pkgs/google-cloud-memcache/default.nix index 5b1aed097..b7abee542 100644 --- a/python/pkgs/google-cloud-memcache/default.nix +++ b/python/pkgs/google-cloud-memcache/default.nix @@ -10,14 +10,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-memcache"; version = "1.16.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_memcache"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-5zs8e/S97VbLYnyO/CKn8P2vdUiSit6X+QTLa/qDfz8="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-memcache"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-monitoring/default.nix b/python/pkgs/google-cloud-monitoring/default.nix index 57ee9071b..428f39384 100644 --- a/python/pkgs/google-cloud-monitoring/default.nix +++ b/python/pkgs/google-cloud-monitoring/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-monitoring"; version = "2.31.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_monitoring"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-tMnTUoyGQ9TrS51ojLs8WRS8X2mzFP98XhtHvcBzqa4="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-monitoring"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-orchestration-airflow/default.nix b/python/pkgs/google-cloud-orchestration-airflow/default.nix index 701f2e416..7832f9afe 100644 --- a/python/pkgs/google-cloud-orchestration-airflow/default.nix +++ b/python/pkgs/google-cloud-orchestration-airflow/default.nix @@ -10,14 +10,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-orchestration-airflow"; version = "1.22.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_orchestration_airflow"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-GIMZWqhhZY62xTp5TQZYufYmvY7nXTAFW0yManQwQsw="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-orchestration-airflow"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-os-config/default.nix b/python/pkgs/google-cloud-os-config/default.nix index 0cadb3d7f..b458838e4 100644 --- a/python/pkgs/google-cloud-os-config/default.nix +++ b/python/pkgs/google-cloud-os-config/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-os-config"; version = "1.25.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_os_config"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-LgJxfWoNq+j26/e5s36yi19w4zWL18rwzdvPhDswPaE="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-os-config"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-os-login/default.nix b/python/pkgs/google-cloud-os-login/default.nix index ae9cf57ec..988281e2d 100644 --- a/python/pkgs/google-cloud-os-login/default.nix +++ b/python/pkgs/google-cloud-os-login/default.nix @@ -10,14 +10,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-os-login"; version = "2.22.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_os_login"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-xyDUE2/5BvAF4nKqH1sNcfszq/fMGlr0oiaB7ZSdt+I="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-os-login"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-pubsub/default.nix b/python/pkgs/google-cloud-pubsub/default.nix index 86d8a7f70..cde741968 100644 --- a/python/pkgs/google-cloud-pubsub/default.nix +++ b/python/pkgs/google-cloud-pubsub/default.nix @@ -14,14 +14,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-pubsub"; version = "2.40.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_pubsub"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-/n1+t291P2rrzdovTf9TZ0jRmZFH9k2VWlVPVyq7FYU="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-pubsub"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-redis/default.nix b/python/pkgs/google-cloud-redis/default.nix index aca1e7e83..73ddded54 100644 --- a/python/pkgs/google-cloud-redis/default.nix +++ b/python/pkgs/google-cloud-redis/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-redis"; version = "2.22.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_redis"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-EFysFdIdh87u5BhHYY8A6mzKqjYLiws/0uQveaI9CGg="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-redis"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-resource-manager/default.nix b/python/pkgs/google-cloud-resource-manager/default.nix index 5dea3cd52..acfd7e050 100644 --- a/python/pkgs/google-cloud-resource-manager/default.nix +++ b/python/pkgs/google-cloud-resource-manager/default.nix @@ -10,14 +10,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-resource-manager"; version = "1.18.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_resource_manager"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-22ifgAoUxm0EEZan+7i7iq6NyH8owpKeEBpex2axVRI="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-resource-manager"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-run/default.nix b/python/pkgs/google-cloud-run/default.nix index 4ec7fd89d..9149974ef 100644 --- a/python/pkgs/google-cloud-run/default.nix +++ b/python/pkgs/google-cloud-run/default.nix @@ -11,14 +11,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-run"; version = "0.16.1"; pyproject = true; src = fetchPypi { pname = "google_cloud_run"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Vov3/Ouo+ESjm2mFio5kL2zKJ+q3JGxiHZ00HCibEVg="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/google-cloud-run/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-runtimeconfig/default.nix b/python/pkgs/google-cloud-runtimeconfig/default.nix index a3b74b92e..d69af25bb 100644 --- a/python/pkgs/google-cloud-runtimeconfig/default.nix +++ b/python/pkgs/google-cloud-runtimeconfig/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-runtimeconfig"; version = "0.37.1"; pyproject = true; src = fetchPypi { pname = "google_cloud_runtimeconfig"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-oj/3RJYhPCXwy7o4TbNdmVjYuuObeAB9RHFV7QIB+dw="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-runtimeconfig"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-secret-manager/default.nix b/python/pkgs/google-cloud-secret-manager/default.nix index 1db993608..4f4b428ff 100644 --- a/python/pkgs/google-cloud-secret-manager/default.nix +++ b/python/pkgs/google-cloud-secret-manager/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-secret-manager"; version = "2.30.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_secret_manager"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-JuyHc3cxtIP3+VwmqMereeIstmMXyVAG5/aYXbxDyKI="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-secret-manager"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-spanner/default.nix b/python/pkgs/google-cloud-spanner/default.nix index 9f44df0f8..90fbd71b8 100644 --- a/python/pkgs/google-cloud-spanner/default.nix +++ b/python/pkgs/google-cloud-spanner/default.nix @@ -20,7 +20,7 @@ opentelemetry-resourcedetector-gcp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-spanner"; version = "3.63.0"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "python-spanner"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QWBl7X/cKGds617IrHKaIteOnqgwB83jgfi8j/ESUws="; }; @@ -73,4 +73,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-spanner"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-speech/default.nix b/python/pkgs/google-cloud-speech/default.nix index 8e95e8d4b..239f12ac1 100644 --- a/python/pkgs/google-cloud-speech/default.nix +++ b/python/pkgs/google-cloud-speech/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-speech"; version = "2.40.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_speech"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-6J5ojkzguSZ1QDi/mS0NDwZcXxw1A7sg5sRtCLY2WPw="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-speech"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-storage/default.nix b/python/pkgs/google-cloud-storage/default.nix index ad4802a45..62dc1a621 100644 --- a/python/pkgs/google-cloud-storage/default.nix +++ b/python/pkgs/google-cloud-storage/default.nix @@ -17,7 +17,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-storage"; version = "3.10.1"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "python-storage"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pKy1A9RNyRlAn4bXclcdvbfW4kZOP9Z4HqKWwcrDePo="; }; @@ -63,4 +63,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-storage"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-tasks/default.nix b/python/pkgs/google-cloud-tasks/default.nix index 08c2d62f9..a4c71a1ae 100644 --- a/python/pkgs/google-cloud-tasks/default.nix +++ b/python/pkgs/google-cloud-tasks/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-tasks"; version = "2.24.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_tasks"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-qk+HZOWxV8urga9hnMT9nxTr7Oi2nlOUplfDKKg2Yig="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-tasks"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-testutils/default.nix b/python/pkgs/google-cloud-testutils/default.nix index 84a97a4e8..f47893192 100644 --- a/python/pkgs/google-cloud-testutils/default.nix +++ b/python/pkgs/google-cloud-testutils/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-testutils"; version = "1.7.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "python-test-utils"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-g7XwDQp4c+duKfUWqhnI8T001fu6cM22oWLriyCZZag="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-test-utils"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-texttospeech/default.nix b/python/pkgs/google-cloud-texttospeech/default.nix index 44ec40718..1362481b9 100644 --- a/python/pkgs/google-cloud-texttospeech/default.nix +++ b/python/pkgs/google-cloud-texttospeech/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-texttospeech"; version = "2.37.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_texttospeech"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-23JjgvOTzrazYALDWr1itTxNjhf8LzHfiwf9D6u+T4s="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-texttospeech"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-trace/default.nix b/python/pkgs/google-cloud-trace/default.nix index b30e6dc3f..3507f53df 100644 --- a/python/pkgs/google-cloud-trace/default.nix +++ b/python/pkgs/google-cloud-trace/default.nix @@ -11,14 +11,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-trace"; version = "1.20.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_trace"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-9ab5uNpTC3bEUhY7g+UIHBaW8bT2cpDIeLDnNw8ekQo="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-trace"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-translate/default.nix b/python/pkgs/google-cloud-translate/default.nix index 4307affc7..4a68f08ec 100644 --- a/python/pkgs/google-cloud-translate/default.nix +++ b/python/pkgs/google-cloud-translate/default.nix @@ -13,14 +13,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-translate"; version = "3.27.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_translate"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-KueO8aqNu17JdnoI6rzjT9p7tFoHumeubg6tjP1flfc="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-translate"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-videointelligence/default.nix b/python/pkgs/google-cloud-videointelligence/default.nix index 71f61483f..a99d09015 100644 --- a/python/pkgs/google-cloud-videointelligence/default.nix +++ b/python/pkgs/google-cloud-videointelligence/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-videointelligence"; version = "2.20.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_videointelligence"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-5EktMzhD8EAZG0cw/1igpK6hAINQBTh5vEBY3fYtqKA="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-videointelligence"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-vision/default.nix b/python/pkgs/google-cloud-vision/default.nix index 8ffc7114e..4c0932b39 100644 --- a/python/pkgs/google-cloud-vision/default.nix +++ b/python/pkgs/google-cloud-vision/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-vision"; version = "3.15.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_vision"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-7St5ygWlipKewRIlmpyqaYUJ9jSHYqjs7TMQ5lcqbHA="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-vision"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-cloud-workflows/default.nix b/python/pkgs/google-cloud-workflows/default.nix index 204971121..df148ebc6 100644 --- a/python/pkgs/google-cloud-workflows/default.nix +++ b/python/pkgs/google-cloud-workflows/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-workflows"; version = "1.23.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_workflows"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-vo4IpdE0GG2834Z8BbFZrYrH3jtkJbIb76q39PJY1Kg="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-workflows"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-crc32c/default.nix b/python/pkgs/google-crc32c/default.nix index cb1452481..3ae27fb51 100644 --- a/python/pkgs/google-crc32c/default.nix +++ b/python/pkgs/google-crc32c/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-crc32c"; version = "1.8.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "python-crc32c"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bNTWyOWie1tPiptJ6NPCyC5kzcCpgOZ0w5hKVw07iwc="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-crc32c"; license = with lib.licenses; [ asl20 ]; }; -} +}) diff --git a/python/pkgs/google-genai/default.nix b/python/pkgs/google-genai/default.nix index d4a022d33..d5c57d5f8 100644 --- a/python/pkgs/google-genai/default.nix +++ b/python/pkgs/google-genai/default.nix @@ -19,7 +19,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-genai"; version = "2.22.0"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "python-genai"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cEeQVDAKHp8hFR9tJ5uIzv7+Es8xNHqG1EdR4U4Zvrg="; }; @@ -64,11 +64,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "google.genai" ]; # ValueError: GOOGLE_GENAI_REPLAYS_DIRECTORY environment variable is not set - doCheck = false; meta = { description = "Google Generative AI Python SDK"; homepage = "https://github.com/googleapis/python-genai"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-generativeai/default.nix b/python/pkgs/google-generativeai/default.nix index 9e19ec463..68dcb158b 100644 --- a/python/pkgs/google-generativeai/default.nix +++ b/python/pkgs/google-generativeai/default.nix @@ -13,7 +13,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-generativeai"; version = "0.8.6"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = "generative-ai-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zUNgQqpGgMyCBhW+Z9EiSJIyuIQh2XhwlCdgrTymCVk="; }; @@ -41,7 +41,6 @@ buildPythonPackage rec { ]; # Issue with the google.ai module. Check with the next release - doCheck = false; pythonImportsCheck = [ "google.generativeai" ]; @@ -50,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/generative-ai-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-geo-type/default.nix b/python/pkgs/google-geo-type/default.nix index eb31f36dc..5685d37cb 100644 --- a/python/pkgs/google-geo-type/default.nix +++ b/python/pkgs/google-geo-type/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-geo-type"; version = "0.7.0"; pyproject = true; @@ -19,11 +19,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-geo-type-v${version}"; + tag = "google-geo-type-v${finalAttrs.version}"; hash = "sha256-M/7uDWWz4YCfxa4gyM9BaAo10iyTMvtR2MhNpdFYnis="; }; - sourceRoot = "${src.name}/packages/google-geo-type"; + sourceRoot = "${finalAttrs.src.name}/packages/google-geo-type"; build-system = [ setuptools ]; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-geo-type"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-i18n-address/default.nix b/python/pkgs/google-i18n-address/default.nix index 7f671ef42..1bd8c5d54 100644 --- a/python/pkgs/google-i18n-address/default.nix +++ b/python/pkgs/google-i18n-address/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-i18n-address"; version = "3.1.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mirumee"; repo = "google-i18n-address"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7RqS/+6zInlhWydJwp4xf2uGpfmSdiSwvJugpL8Mlpk="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "update-validation-files"; }; -} +}) diff --git a/python/pkgs/google-maps-routing/default.nix b/python/pkgs/google-maps-routing/default.nix index 80e064c13..ab4835be5 100644 --- a/python/pkgs/google-maps-routing/default.nix +++ b/python/pkgs/google-maps-routing/default.nix @@ -13,7 +13,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-maps-routing"; version = "0.11.0"; pyproject = true; @@ -21,11 +21,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-maps-routing-v${version}"; + tag = "google-maps-routing-v${finalAttrs.version}"; hash = "sha256-M/7uDWWz4YCfxa4gyM9BaAo10iyTMvtR2MhNpdFYnis="; }; - sourceRoot = "${src.name}/packages/google-maps-routing"; + sourceRoot = "${finalAttrs.src.name}/packages/google-maps-routing"; build-system = [ setuptools ]; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-maps-routing"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-pasta/default.nix b/python/pkgs/google-pasta/default.nix index cb48f76b0..5c4d2b205 100644 --- a/python/pkgs/google-pasta/default.nix +++ b/python/pkgs/google-pasta/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-pasta"; version = "0.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yfLI38j5bQ1YCCmZIHIb4wye7DfyOJ8okE9FRWXIoW4="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/pasta"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-photos-library-api/default.nix b/python/pkgs/google-photos-library-api/default.nix index c6f223b3f..415bf30ca 100644 --- a/python/pkgs/google-photos-library-api/default.nix +++ b/python/pkgs/google-photos-library-api/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-photos-library-api"; version = "1.0.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "allenporter"; repo = "python-google-photos-library-api"; - tag = version; + tag = finalAttrs.version; hash = "sha256-pmAAvwhr783ih9vpqr5DmT462z3Ug1xwHaz9itu/mt4="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/allenporter/python-google-photos-library-api"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-re2/default.nix b/python/pkgs/google-re2/default.nix index b29b7295b..2bb775748 100644 --- a/python/pkgs/google-re2/default.nix +++ b/python/pkgs/google-re2/default.nix @@ -7,14 +7,14 @@ re2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-re2"; version = "1.1.20251105"; pyproject = true; src = fetchPypi { pname = "google_re2"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-HbFKKS7oMDuR6R58N+BawX08Rn8pQWx5rHCni+PmW9o="; }; @@ -24,8 +24,6 @@ buildPythonPackage rec { dependencies = [ pybind11 ]; - doCheck = false; # no tests in sdist - pythonImportsCheck = [ "re2" ]; meta = { @@ -33,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/re2"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/google-resumable-media/default.nix b/python/pkgs/google-resumable-media/default.nix index 9466c185b..4510690d8 100644 --- a/python/pkgs/google-resumable-media/default.nix +++ b/python/pkgs/google-resumable-media/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-resumable-media"; version = "2.10.2"; pyproject = true; src = fetchPypi { pname = "google_resumable_media"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-HeRBcDzSmNdaQZv9wAZun8ewod5jDflu6ozo9cdZNYw="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/google-search-results/default.nix b/python/pkgs/google-search-results/default.nix index 1224f93e0..0a9b5329f 100644 --- a/python/pkgs/google-search-results/default.nix +++ b/python/pkgs/google-search-results/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-search-results"; version = "2.4.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "serpapi"; repo = "google-search-results-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2GRhBaRE0KHNFsdMrIC87dx6yMzql+QQFSSm2Gf7xHU="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ requests ]; # almost all tests require an API key or network access - doCheck = false; pythonImportsCheck = [ "serpapi" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/serpapi/google-search-results-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/google/default.nix b/python/pkgs/google/default.nix index 5f051a6c2..558944f2a 100644 --- a/python/pkgs/google/default.nix +++ b/python/pkgs/google/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, beautifulsoup4, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-FDUwEi7lEwUJrV6YnwUS98shiy1O3br7rUD9EOjYzL4="; }; - propagatedBuildInputs = [ beautifulsoup4 ]; + build-system = [ setuptools ]; + + dependencies = [ beautifulsoup4 ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "googlesearch" ]; @@ -28,4 +31,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/google/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/googleapis-common-protos/default.nix b/python/pkgs/googleapis-common-protos/default.nix index 04ce29ffc..b7d80c656 100644 --- a/python/pkgs/googleapis-common-protos/default.nix +++ b/python/pkgs/googleapis-common-protos/default.nix @@ -36,7 +36,6 @@ buildPythonPackage (finalAttrs: { }; # does not contain tests - doCheck = false; pythonImportsCheck = [ "google.api" diff --git a/python/pkgs/googlemaps/default.nix b/python/pkgs/googlemaps/default.nix index e9f0975ed..d4d7c67e5 100644 --- a/python/pkgs/googlemaps/default.nix +++ b/python/pkgs/googlemaps/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "googlemaps"; version = "4.10.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googlemaps"; repo = "google-maps-services-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8oGZEMKUGaDHKq4qIZy10cbLNMmVclJnQE/dx877pNQ="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/googlemaps/google-maps-services-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/googletrans/default.nix b/python/pkgs/googletrans/default.nix index 253dbc1d2..df0c58bd4 100644 --- a/python/pkgs/googletrans/default.nix +++ b/python/pkgs/googletrans/default.nix @@ -6,13 +6,13 @@ httpx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "googletrans"; version = "4.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2e8Sa12S+r7sC7ndzb7s1Dhl/ADhfx36B3F4N4J6F94="; }; @@ -21,7 +21,6 @@ buildPythonPackage rec { dependencies = [ httpx ] ++ httpx.optional-dependencies.http2; # Majority of tests just try to ping Google's Translate API endpoint - doCheck = false; pythonImportsCheck = [ "googletrans" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "translate"; }; -} +}) diff --git a/python/pkgs/gophish/default.nix b/python/pkgs/gophish/default.nix index b56945b34..a6cd2f55d 100644 --- a/python/pkgs/gophish/default.nix +++ b/python/pkgs/gophish/default.nix @@ -15,7 +15,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gophish"; version = "0.5.1"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gophish"; repo = "api-client-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ITwwU/Xixyi9JSWbYf606HB7S5E4jiI0lEYcOdNg3mo="; }; @@ -47,11 +47,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "gophish" ]; # Module has no test - doCheck = false; meta = { description = "Module to interact with Gophish"; homepage = "https://github.com/gophish/api-client-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gorilla/default.nix b/python/pkgs/gorilla/default.nix index 3d46957cf..c43345117 100644 --- a/python/pkgs/gorilla/default.nix +++ b/python/pkgs/gorilla/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gorilla"; version = "0.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AFq4hTsDcWKnx3u4JGBMbggYeO4DwJrQHvQXRIVgGdM="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/christophercrouzet/gorilla"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/goslide-api/default.nix b/python/pkgs/goslide-api/default.nix index d51f1c474..13bd793c0 100644 --- a/python/pkgs/goslide-api/default.nix +++ b/python/pkgs/goslide-api/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "goslide-api"; version = "0.7.4"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ualex73"; repo = "goslide-api"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Z3+GijoI+351zV7IpLSBQu6LE2OhhXho4ygNMVbg2xs="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail "version='0.7.3'" "version='${version}'" + --replace-fail "version='0.7.3'" "version='${finalAttrs.version}'" ''; build-system = [ setuptools ]; @@ -30,11 +30,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "goslideapi" ]; # upstream has no tests - doCheck = false; meta = { description = "Python API to utilise the Slide Open Cloud and Local API"; homepage = "https://github.com/ualex73/goslide-api"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/gotailwind/default.nix b/python/pkgs/gotailwind/default.nix index f049f55ea..74f019d7e 100644 --- a/python/pkgs/gotailwind/default.nix +++ b/python/pkgs/gotailwind/default.nix @@ -18,7 +18,7 @@ zeroconf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gotailwind"; version = "0.4.0"; pyproject = true; @@ -26,14 +26,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frenck"; repo = "python-gotailwind"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sDQnweGVDyewvTPkRlmk9f7YMnUdPmvB9VrvegAC2B8="; }; postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace-fail "0.0.0" "${version}" + --replace-fail "0.0.0" "${finalAttrs.version}" ''; build-system = [ poetry-core ]; @@ -59,7 +59,7 @@ buildPythonPackage rec { pytestCheckHook syrupy ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; pythonImportsCheck = [ "gotailwind" ]; @@ -69,4 +69,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "tailwind"; }; -} +}) diff --git a/python/pkgs/gotenberg-client/default.nix b/python/pkgs/gotenberg-client/default.nix index ad6f4650f..c1cd75567 100644 --- a/python/pkgs/gotenberg-client/default.nix +++ b/python/pkgs/gotenberg-client/default.nix @@ -5,7 +5,7 @@ hatchling, httpx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gotenberg-client"; version = "1.0.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stumpylog"; repo = "gotenberg-client"; - tag = version; + tag = finalAttrs.version; hash = "sha256-NgfqUgtD70XvpFee8e32rTPe3TOS+JdmCnefzFY4gNY="; }; @@ -25,7 +25,6 @@ buildPythonPackage rec { ++ httpx.optional-dependencies.http2; # requires running gotenberg service - doCheck = false; pythonImportsCheck = [ "gotenberg_client" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/stumpylog/gotenberg-client"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/govee-local-api/default.nix b/python/pkgs/govee-local-api/default.nix index 649ea0a87..62b7583ff 100644 --- a/python/pkgs/govee-local-api/default.nix +++ b/python/pkgs/govee-local-api/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "govee-local-api"; version = "3.0.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Galorhallen"; repo = "govee-local-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qc4/GNty3JuSKYhiLl5sHx3cwNiuqQXwlHdpW71ezNI="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/Galorhallen/govee-local-api"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/goveelights/default.nix b/python/pkgs/goveelights/default.nix index cb8512534..6b61889ed 100644 --- a/python/pkgs/goveelights/default.nix +++ b/python/pkgs/goveelights/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "goveelights"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-A7tfY+aFzhfruCZ43usj1/CsTejbPMzHM8SYrY/TU1s="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "goveelights" ]; @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/arcanearronax/govee_lights"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gpg/default.nix b/python/pkgs/gpg/default.nix index 72a4f9a25..5f29e0be2 100644 --- a/python/pkgs/gpg/default.nix +++ b/python/pkgs/gpg/default.nix @@ -10,13 +10,13 @@ swig, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gpg"; version = "2.0.0"; pyproject = true; src = fetchurl { - url = "mirror://gnupg/gpgmepy/gpgmepy-${version}.tar.bz2"; + url = "mirror://gnupg/gpgmepy/gpgmepy-${finalAttrs.version}.tar.bz2"; hash = "sha256-B+EmVkj/UdojjJr3oYs/HcewxmtPIacvJ8dLOWzTM20="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://dev.gnupg.org/source/gpgmepy/"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/gpiozero/default.nix b/python/pkgs/gpiozero/default.nix index 908ab5896..ad7c0c85a 100644 --- a/python/pkgs/gpiozero/default.nix +++ b/python/pkgs/gpiozero/default.nix @@ -11,7 +11,7 @@ colorzero, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gpiozero"; version = "2.0.1.post3"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gpiozero"; repo = "gpiozero"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8NSGR+GLnf+7F9iu0XVK/yVYVw8L9b73FIs07OSvMj4="; }; @@ -34,7 +34,7 @@ buildPythonPackage rec { sphinxHook ]; - propagatedBuildInputs = [ colorzero ]; + dependencies = [ colorzero ]; pythonImportsCheck = [ "gpiozero" @@ -47,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/gprof2dot/default.nix b/python/pkgs/gprof2dot/default.nix index 50dd2779b..897a8b14f 100644 --- a/python/pkgs/gprof2dot/default.nix +++ b/python/pkgs/gprof2dot/default.nix @@ -1,23 +1,27 @@ { lib, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, python, graphviz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gprof2dot"; version = "2025.04.14"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jrfonseca"; repo = "gprof2dot"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kX/DCXO/qwm1iF44gG7aBSUpG4Vf2Aer0zwrtq4YNHo="; }; + build-system = [ setuptools ]; + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ graphviz ]}" ]; # Needed so dot is on path of the test script @@ -36,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/jrfonseca/gprof2dot"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/gps3/default.nix b/python/pkgs/gps3/default.nix index 754488ba5..d870411d4 100644 --- a/python/pkgs/gps3/default.nix +++ b/python/pkgs/gps3/default.nix @@ -2,12 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: buildPythonPackage { pname = "gps3"; version = "unstable-2017-11-01"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "wadda"; @@ -16,8 +18,9 @@ buildPythonPackage { hash = "sha256-sVK61l8YunKAGFTSAq/m5aUGFfnizwhqTYbdznBIKfk="; }; + build-system = [ setuptools ]; + # Project has no tests - doCheck = false; pythonImportsCheck = [ "gps3" ]; meta = { diff --git a/python/pkgs/gpsoauth/default.nix b/python/pkgs/gpsoauth/default.nix index f96e3d8d0..21b0684c1 100644 --- a/python/pkgs/gpsoauth/default.nix +++ b/python/pkgs/gpsoauth/default.nix @@ -7,13 +7,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gpsoauth"; version = "2.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-njt2WmpOA2TewbxBV70+1+XsMGZYnihdC0aYaRCqa9I="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/simon-weber/gpsoauth"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gputil/default.nix b/python/pkgs/gputil/default.nix index 4f57522de..87588fabd 100644 --- a/python/pkgs/gputil/default.nix +++ b/python/pkgs/gputil/default.nix @@ -8,7 +8,7 @@ }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gputil"; version = "1.4.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "anderskm"; repo = "gputil"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iOyB653BMmDBtK1fM1ZyddjlnaypsuLMOV0sKaBt+yE="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.mit; description = "Getting GPU status from NVIDA GPUs using nvidia-smi"; }; -} +}) diff --git a/python/pkgs/gpxpy/default.nix b/python/pkgs/gpxpy/default.nix index 599f27ca1..c6a44da10 100644 --- a/python/pkgs/gpxpy/default.nix +++ b/python/pkgs/gpxpy/default.nix @@ -6,13 +6,13 @@ lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gpxpy"; version = "1.6.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-pyxIS5fsQrgINDU7ApzI7ht58P/KEXmyIQuzuvJsAa4="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/gql/default.nix b/python/pkgs/gql/default.nix index 52cb8b205..aa39b442e 100644 --- a/python/pkgs/gql/default.nix +++ b/python/pkgs/gql/default.nix @@ -16,7 +16,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gql"; version = "4.0.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "graphql-python"; repo = "gql"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bPdlFN6MRT6G9Mw2g2BBfsOGpQmT7pbRatpqa7CImSs="; }; @@ -67,4 +67,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "gql-cli"; }; -} +}) diff --git a/python/pkgs/gradient-statsd/default.nix b/python/pkgs/gradient-statsd/default.nix index ef5a3d6ff..d4fe29b50 100644 --- a/python/pkgs/gradient-statsd/default.nix +++ b/python/pkgs/gradient-statsd/default.nix @@ -6,23 +6,27 @@ datadog, decorator, fetchPypi, + # build-system + setuptools, idna, requests, urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gradient-statsd"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "gradient_statsd"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-iWlNX43ZtvU73wz4+8DgDulQNOnssJGxTBkvAaLj530="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ certifi chardet datadog @@ -35,7 +39,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "gradient_statsd" ]; # Pypi does not contain tests - doCheck = false; meta = { description = "Wrapper around the DogStatsd client"; @@ -43,4 +46,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/gradient-utils/default.nix b/python/pkgs/gradient-utils/default.nix index f3d76193b..e1b43dc20 100644 --- a/python/pkgs/gradient-utils/default.nix +++ b/python/pkgs/gradient-utils/default.nix @@ -11,7 +11,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gradient-utils"; version = "0.5.0"; pyproject = true; @@ -19,13 +19,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Paperspace"; repo = "gradient-utils"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-swnl0phdOsBSP8AX/OySI/aYI9z60Ss3SsJox/mb9KY="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ hyperopt prometheus-client numpy @@ -63,4 +63,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/gradient/default.nix b/python/pkgs/gradient/default.nix index c3ae3dabd..a717b8871 100644 --- a/python/pkgs/gradient/default.nix +++ b/python/pkgs/gradient/default.nix @@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "digitalocean"; repo = "gradient-python"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2blzsP8KJfCbqBmoaWgQRCmiR5Dj3ofbd65fJqQpfAI="; }; diff --git a/python/pkgs/grafanalib/default.nix b/python/pkgs/grafanalib/default.nix index a01835e0a..036890eeb 100644 --- a/python/pkgs/grafanalib/default.nix +++ b/python/pkgs/grafanalib/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grafanalib"; version = "0.7.1"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "weaveworks"; repo = "grafanalib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vXnyAfC9avKz8U4+MJVnu2zoPD0nR2qarWYidhEPW5s="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ attrs ]; + dependencies = [ attrs ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/weaveworks/grafanalib/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/grammalecte/default.nix b/python/pkgs/grammalecte/default.nix index 9b7c7fb48..ac9524c02 100644 --- a/python/pkgs/grammalecte/default.nix +++ b/python/pkgs/grammalecte/default.nix @@ -2,27 +2,31 @@ lib, buildPythonPackage, fetchurl, + # build-system + setuptools, bottle, isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grammalecte"; version = "2.1.1"; - format = "setuptools"; + pyproject = true; src = fetchurl { - url = "https://grammalecte.net/grammalecte/zip/Grammalecte-fr-v${version}.zip"; + url = "https://grammalecte.net/grammalecte/zip/Grammalecte-fr-v${finalAttrs.version}.zip"; sha256 = "076jv3ywdgqqzg92bfbagc7ypy08xjq5zn4vgna6j9350fkfqhzn"; }; + build-system = [ setuptools ]; + patchPhase = '' runHook prePatch substituteInPlace grammalecte-server.py --replace sys.version_info.major sys.version_info runHook postPatch ''; - propagatedBuildInputs = [ bottle ]; + dependencies = [ bottle ]; sourceRoot = "."; @@ -33,4 +37,4 @@ buildPythonPackage rec { homepage = "https://grammalecte.net"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/grandalf/default.nix b/python/pkgs/grandalf/default.nix index e0f977472..c0e5d3364 100644 --- a/python/pkgs/grandalf/default.nix +++ b/python/pkgs/grandalf/default.nix @@ -6,7 +6,7 @@ pyparsing, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grandalf"; version = "0.8"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdcht"; repo = "grandalf"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oKuzk/vsEkoiEPgt/fsaaurKfz5CElXPEJe88aFBLqU="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/bdcht/grandalf"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/granian/default.nix b/python/pkgs/granian/default.nix index df0c1cc06..c96a6a043 100644 --- a/python/pkgs/granian/default.nix +++ b/python/pkgs/granian/default.nix @@ -16,7 +16,7 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "granian"; version = "2.7.9"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "emmett-framework"; repo = "granian"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SYbdLrE/LaPGpzsrW4FBWtKyTM1VTqJ6sWRVbLjvCM8="; }; @@ -37,7 +37,7 @@ buildPythonPackage rec { ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-DZZUWpTsKkJQ8ku1Hm5eKFNxhYVfxv7D2N9DLPS9+a4="; }; @@ -65,7 +65,6 @@ buildPythonPackage rec { # numbers of times. The issue has not been fully identified, # and upstream claims it does not exist. # FIXME: root cause and fix this. - doCheck = false; pythonImportsCheck = [ "granian" ]; @@ -78,4 +77,4 @@ buildPythonPackage rec { mainProgram = "granian"; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/graphene-django/default.nix b/python/pkgs/graphene-django/default.nix index 85d3e9c3a..983860e9b 100644 --- a/python/pkgs/graphene-django/default.nix +++ b/python/pkgs/graphene-django/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, graphene, graphql-core, django, @@ -11,24 +13,26 @@ py, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "graphene-django"; version = "3.2.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "graphql-python"; repo = "graphene-django"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uMkzgXn3YRgEU46Sv5lg60cvetHir9bv0mzJGDv79DI="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace '"pytest-runner"' "" ''; - propagatedBuildInputs = [ + dependencies = [ djangorestframework graphene graphql-core @@ -42,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/graphql-python/graphene-django"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/graphene/default.nix b/python/pkgs/graphene/default.nix index 387780949..e0bf065b8 100644 --- a/python/pkgs/graphene/default.nix +++ b/python/pkgs/graphene/default.nix @@ -12,7 +12,7 @@ python-dateutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "graphene"; version = "3.4.3"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "graphql-python"; repo = "graphene"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-K1IGKK3nTsRBe2D/cKJ/ahnAO5xxjf4gtollzTwt1zU="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/graphql-python/graphene"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/graphlib-backport/default.nix b/python/pkgs/graphlib-backport/default.nix index cf410ab2e..d51558f68 100644 --- a/python/pkgs/graphlib-backport/default.nix +++ b/python/pkgs/graphlib-backport/default.nix @@ -6,7 +6,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "graphlib-backport"; version = "1.1.0"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mariushelf"; repo = "graphlib_backport"; - rev = version; + tag = finalAttrs.version; hash = "sha256-ssJLtBQH8sSnccgcAKLKfYpPyw5U0RIm1F66/Er81lo="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { --replace 'poetry.masonry.api' 'poetry.core.masonry.api' ''; - propagatedBuildInputs = [ + dependencies = [ setuptools poetry-core ]; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/mariushelf/graphlib_backport"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/graphql-core/default.nix b/python/pkgs/graphql-core/default.nix index 89cbb10eb..f6b4202b0 100644 --- a/python/pkgs/graphql-core/default.nix +++ b/python/pkgs/graphql-core/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "graphql-core"; version = "3.2.12"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "graphql-python"; repo = "graphql-core"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KzPjD/5HGPI2lrsCfW8aocXMhXc7YB7N+WUukc9Ru3s="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/graphql-python/graphql-core"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/graphql-relay/default.nix b/python/pkgs/graphql-relay/default.nix index f6f084fed..24b473205 100644 --- a/python/pkgs/graphql-relay/default.nix +++ b/python/pkgs/graphql-relay/default.nix @@ -6,13 +6,13 @@ graphql-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "graphql-relay"; version = "3.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-H/HFEpg1bkgaC+AJzN/ySYMs5T8wVZwTOPIqDg0XJQw="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/graphql-python/graphql-relay-py/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/graphql-server-core/default.nix b/python/pkgs/graphql-server-core/default.nix index 04d856459..1a89b34d1 100644 --- a/python/pkgs/graphql-server-core/default.nix +++ b/python/pkgs/graphql-server-core/default.nix @@ -5,21 +5,25 @@ graphql-core, promise, fetchpatch, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "graphql-server-core"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "graphql-python"; repo = "graphql-server-core"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1w3biv2za2m1brwjy0z049c2m94gm1zfwxzgc6lwrsci724jv9fr"; }; + build-system = [ setuptools ]; + patches = [ (fetchpatch { url = "https://github.com/graphql-python/graphql-server-core/commit/865ee9d5602f352c958f6f7e15adbe9abe216784.patch"; @@ -27,13 +31,12 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + dependencies = [ graphql-core promise ]; # fail with: cannot import name 'format_error' from 'graphql' - doCheck = false; nativeCheckInputs = [ pytestCheckHook ]; @@ -42,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/graphql-python/graphql-server-core"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/graphql-subscription-manager/default.nix b/python/pkgs/graphql-subscription-manager/default.nix index 7d154a23a..3322985b4 100644 --- a/python/pkgs/graphql-subscription-manager/default.nix +++ b/python/pkgs/graphql-subscription-manager/default.nix @@ -6,25 +6,26 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "graphql-subscription-manager"; version = "0.7.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "PyGraphqlWebsocketManager"; - tag = version; + tag = finalAttrs.version; hash = "sha256-6/REvY5QxsAPV41Pvg8vrJPYbDrGUrpOPn0vzIcCu0k="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ setuptools websockets ]; # no tests implemented - doCheck = false; pythonImportsCheck = [ "graphql_subscription_manager" ]; @@ -33,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/Danielhiversen/PyGraphqlWebsocketManager"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/graphqlclient/default.nix b/python/pkgs/graphqlclient/default.nix index b798279ea..20bc3ea5b 100644 --- a/python/pkgs/graphqlclient/default.nix +++ b/python/pkgs/graphqlclient/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.2.4"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "graphqlclient"; inherit (finalAttrs) version; @@ -24,7 +22,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ six ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "graphqlclient" ]; diff --git a/python/pkgs/graphviz/default.nix b/python/pkgs/graphviz/default.nix index 9b647498b..88114e37c 100644 --- a/python/pkgs/graphviz/default.nix +++ b/python/pkgs/graphviz/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "graphviz"; version = "0.21"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IHQ+cYO+gqqqitbJP4iTySO9ZligTDLuEV7bPIqDX3g="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Simple Python interface for Graphviz"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/grappelli-safe/default.nix b/python/pkgs/grappelli-safe/default.nix index bd3d15319..cbff42a74 100644 --- a/python/pkgs/grappelli-safe/default.nix +++ b/python/pkgs/grappelli-safe/default.nix @@ -5,21 +5,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "1.1.1"; pname = "grappelli-safe"; pyproject = true; src = fetchPypi { pname = "grappelli_safe"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-7jSz4qNxFJix+No9naqKEjnv3yVaISGBdCtqWJD6wDk="; }; nativeBuildInputs = [ setuptools ]; # upstream has no tests - doCheck = false; pythonImportsCheck = [ "grappelli_safe" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { downloadPage = "http://pypi.org/pypi/grappelli_safe/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/great-expectations/default.nix b/python/pkgs/great-expectations/default.nix index cdbca7cdd..18f2f3fc8 100644 --- a/python/pkgs/great-expectations/default.nix +++ b/python/pkgs/great-expectations/default.nix @@ -70,8 +70,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "great_expectations" ]; - doCheck = false; - meta = { description = "Library for writing unit tests for data validation"; homepage = "https://docs.greatexpectations.io"; diff --git a/python/pkgs/greeclimate/default.nix b/python/pkgs/greeclimate/default.nix index 8579a031d..b59448bc0 100644 --- a/python/pkgs/greeclimate/default.nix +++ b/python/pkgs/greeclimate/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "greeclimate"; version = "3.2.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cmroche"; repo = "greeclimate"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lDsMx08BDaUZwmT9afwj9SOMovOftNOlfNV5btSAW8E="; }; @@ -63,4 +63,4 @@ buildPythonPackage rec { homepage = "https://github.com/cmroche/greeclimate"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/greek-accentuation/default.nix b/python/pkgs/greek-accentuation/default.nix index 341e6a07e..9c423f835 100644 --- a/python/pkgs/greek-accentuation/default.nix +++ b/python/pkgs/greek-accentuation/default.nix @@ -9,8 +9,6 @@ buildPythonPackage (finalAttrs: { version = "1.2.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "greek-accentuation"; inherit (finalAttrs) version; diff --git a/python/pkgs/green/default.nix b/python/pkgs/green/default.nix index 0fc82d053..5d1f9d0c0 100644 --- a/python/pkgs/green/default.nix +++ b/python/pkgs/green/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, colorama, coverage, unidecode, lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "green"; version = "4.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-pAZ8P5/CpkTtNfU2ZJUGQzROxGLm0uu1vXS3YpcVprE="; }; + build-system = [ setuptools ]; + patches = [ ./tests.patch ]; postPatch = '' @@ -25,7 +29,7 @@ buildPythonPackage rec { --subst-var-by green "$out/bin/green" ''; - propagatedBuildInputs = [ + dependencies = [ colorama coverage unidecode @@ -46,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/CleanCut/green"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/greenback/default.nix b/python/pkgs/greenback/default.nix index a4965f8c5..f8ce222d5 100644 --- a/python/pkgs/greenback/default.nix +++ b/python/pkgs/greenback/default.nix @@ -11,7 +11,7 @@ sniffio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "greenback"; version = "1.3.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oremanj"; repo = "greenback"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YAQEG3Lnyy9O+d58zZatDOeF+rxk34VqJ09XikqTyQk="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/oremanj/greenback"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/greenlet/default.nix b/python/pkgs/greenlet/default.nix index df30e7ffd..c53029b6d 100644 --- a/python/pkgs/greenlet/default.nix +++ b/python/pkgs/greenlet/default.nix @@ -13,20 +13,19 @@ }: let - greenlet = buildPythonPackage rec { + greenlet = buildPythonPackage (finalAttrs: { pname = "greenlet"; version = "3.5.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rbS64C6RqOhj5IsXfkAUvcrIprXgR+od9oemFTS4Xmw="; }; build-system = [ setuptools ]; # tests in passthru, infinite recursion via objgraph/graphviz - doCheck = false; # https://github.com/python-greenlet/greenlet/issues/395 env.NIX_CFLAGS_COMPILE = lib.optionalString ( stdenv.hostPlatform.isPower64 || stdenv.hostPlatform.isLoongArch64 @@ -48,6 +47,6 @@ let mit ]; }; - }; + }); in greenlet diff --git a/python/pkgs/gremlinpython/default.nix b/python/pkgs/gremlinpython/default.nix index f71a383e3..b3a82c6b3 100644 --- a/python/pkgs/gremlinpython/default.nix +++ b/python/pkgs/gremlinpython/default.nix @@ -10,8 +10,7 @@ setuptools, }: -buildPythonPackage rec { - __structuredAttrs = true; +buildPythonPackage (finalAttrs: { pname = "gremlinpython"; version = "3.8.0"; @@ -20,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "apache"; repo = "tinkerpop"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dslSvtne+0mobjhjZDiO7crQE3aW5wEMWw7l3LkBTV8="; }; @@ -59,4 +58,4 @@ buildPythonPackage rec { homepage = "https://tinkerpop.apache.org/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/grep-ast/default.nix b/python/pkgs/grep-ast/default.nix index 970d974b3..3f429a80b 100644 --- a/python/pkgs/grep-ast/default.nix +++ b/python/pkgs/grep-ast/default.nix @@ -8,13 +8,13 @@ tree-sitter-language-pack, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grep-ast"; version = "0.9.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "grep_ast"; hash = "sha256-YgokKkST5nITONHJpsI0rmUfh3T0kkptz5D2hl1LLuM="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { description = "Python implementation of the ast-grep tool"; mainProgram = "grep-ast"; }; -} +}) diff --git a/python/pkgs/grequests/default.nix b/python/pkgs/grequests/default.nix index 4fc0caeb5..6ee0cfc69 100644 --- a/python/pkgs/grequests/default.nix +++ b/python/pkgs/grequests/default.nix @@ -7,13 +7,13 @@ gevent, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grequests"; version = "0.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XDPxQmjfW4+hEH2FN4Fb5v67rW7FYFJNakBLd3jPa6Y="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/kennethreitz/grequests"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/griffe/default.nix b/python/pkgs/griffe/default.nix index a9a8954ad..a5aefb0b4 100644 --- a/python/pkgs/griffe/default.nix +++ b/python/pkgs/griffe/default.nix @@ -10,7 +10,7 @@ pytest-gitconfig, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "griffe"; version = "1.15.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkdocstrings"; repo = "griffe"; - tag = version; + tag = finalAttrs.version; hash = "sha256-AMMTAqsJfj2MltTgAxfvjUTVzi+ZFmx+J9pzhMp28Z4="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.isc; mainProgram = "griffe"; }; -} +}) diff --git a/python/pkgs/grip/default.nix b/python/pkgs/grip/default.nix index a0fd00b1f..bb59ac315 100644 --- a/python/pkgs/grip/default.nix +++ b/python/pkgs/grip/default.nix @@ -19,8 +19,6 @@ buildPythonPackage (finalAttrs: { version = "4.6.1"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "joeyespo"; repo = "grip"; diff --git a/python/pkgs/groestlcoin-hash/default.nix b/python/pkgs/groestlcoin-hash/default.nix index c04c27f69..e46562123 100644 --- a/python/pkgs/groestlcoin-hash/default.nix +++ b/python/pkgs/groestlcoin-hash/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "groestlcoin-hash"; version = "1.0.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "groestlcoin_hash"; - inherit version; + inherit (finalAttrs) version; sha256 = "31a8f6fa4c19db5258c3c73c071b71702102c815ba862b6015d9e4b75ece231e"; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "groestlcoin_hash" ]; meta = { @@ -22,4 +26,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/groestlcoin_hash/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/groovy/default.nix b/python/pkgs/groovy/default.nix index 401568c5b..79ee3734b 100644 --- a/python/pkgs/groovy/default.nix +++ b/python/pkgs/groovy/default.nix @@ -5,20 +5,19 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "groovy"; version = "0.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JcHcCbP51+KSRYqnYsa+uW6gNwcb9ekX/IH7eNIjEIM="; }; build-system = [ hatchling ]; # Tests require gradio and attempt to load a cert file - doCheck = false; pythonImportsCheck = [ "groovy" ]; @@ -27,4 +26,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/groovy"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/groq/default.nix b/python/pkgs/groq/default.nix index d4b0f4146..27576cd5d 100644 --- a/python/pkgs/groq/default.nix +++ b/python/pkgs/groq/default.nix @@ -19,7 +19,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "groq"; version = "1.7.0"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "groq"; repo = "groq-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GqGiD4gwroz5i0W2MewgId+bliPTmmSGR/zMs9EV7q8="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { homepage = "https://github.com/groq/groq-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/growattserver/default.nix b/python/pkgs/growattserver/default.nix index 2c29d2535..1799995b2 100644 --- a/python/pkgs/growattserver/default.nix +++ b/python/pkgs/growattserver/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ requests ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "growattServer" ]; diff --git a/python/pkgs/grpc-google-iam-v1/default.nix b/python/pkgs/grpc-google-iam-v1/default.nix index 463ac8884..5203b9fb3 100644 --- a/python/pkgs/grpc-google-iam-v1/default.nix +++ b/python/pkgs/grpc-google-iam-v1/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grpc-google-iam-v1"; version = "3.31.3"; pyproject = true; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-cloud-build-v${version}"; + tag = "google-cloud-build-v${finalAttrs.version}"; hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U="; }; - sourceRoot = "${src.name}/packages/grpc-google-iam-v1"; + sourceRoot = "${finalAttrs.src.name}/packages/grpc-google-iam-v1"; build-system = [ setuptools ]; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/grpc-google-iam-v1"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/grpc-interceptor/default.nix b/python/pkgs/grpc-interceptor/default.nix index dcb5d6969..0b53725a6 100644 --- a/python/pkgs/grpc-interceptor/default.nix +++ b/python/pkgs/grpc-interceptor/default.nix @@ -7,7 +7,7 @@ protobuf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grpc-interceptor"; version = "0.15.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "d5h-foss"; repo = "grpc-interceptor"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GJkVCslPXShJNDrqhFtCsAK5+VaG8qFJo0RQTsiMIFY="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/d5h-foss/grpc-interceptor"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/grpcio-channelz/default.nix b/python/pkgs/grpcio-channelz/default.nix index c3ce8de0f..e490af189 100644 --- a/python/pkgs/grpcio-channelz/default.nix +++ b/python/pkgs/grpcio-channelz/default.nix @@ -10,14 +10,14 @@ # This package should be updated together with the main grpc package and other # related python grpc packages. # nixpkgs-update: no auto update -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grpcio-channelz"; version = "1.83.1"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-XrsLFMK8yBFJ4oSNHSZCQEJnYqBQsinTNzRruzfT4x8="; }; @@ -36,11 +36,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "grpc_channelz" ]; # no tests - doCheck = false; meta = { description = "Channel Level Live Debug Information Service for gRPC"; homepage = "https://pypi.org/project/grpcio-channelz"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/grpcio-gcp/default.nix b/python/pkgs/grpcio-gcp/default.nix index d9e4a2595..b4a95c38b 100644 --- a/python/pkgs/grpcio-gcp/default.nix +++ b/python/pkgs/grpcio-gcp/default.nix @@ -6,13 +6,13 @@ grpcio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grpcio-gcp"; version = "0.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4pJgXv/H2jm3qHNMcZr7EuxLU2Kt01KNivrTqjqpBXw="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://grpc.io"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/grpcio-health-checking/default.nix b/python/pkgs/grpcio-health-checking/default.nix index d8d6a3700..50753f06e 100644 --- a/python/pkgs/grpcio-health-checking/default.nix +++ b/python/pkgs/grpcio-health-checking/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, grpcio, protobuf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grpcio-health-checking"; version = "1.83.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "grpcio_health_checking"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-1gkk5vutOPNcNyd5vF62UaAORG1tJPHRxy8UKXodDlY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ grpcio protobuf ]; @@ -27,11 +31,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "grpc_health" ]; # no tests - doCheck = false; meta = { description = "Standard Health Checking Service for gRPC"; homepage = "https://pypi.org/project/grpcio-health-checking/"; license = with lib.licenses; [ asl20 ]; }; -} +}) diff --git a/python/pkgs/grpcio-reflection/default.nix b/python/pkgs/grpcio-reflection/default.nix index 789ccbf9b..f9342a762 100644 --- a/python/pkgs/grpcio-reflection/default.nix +++ b/python/pkgs/grpcio-reflection/default.nix @@ -10,14 +10,14 @@ # This package should be updated together with the main grpc package and other # related python grpc packages. # nixpkgs-update: no auto update -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grpcio-reflection"; version = "1.83.1"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-wzlT8urhMTqx0sK2oc7G3a6+Z2PaGyYxmAeS2XkuYjM="; }; @@ -36,11 +36,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "grpc_reflection" ]; # no tests - doCheck = false; meta = { description = "Standard Protobuf Reflection Service for gRPC"; homepage = "https://pypi.org/project/grpcio-reflection"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/grpcio-status/default.nix b/python/pkgs/grpcio-status/default.nix index d0eff9d05..49e36dfb7 100644 --- a/python/pkgs/grpcio-status/default.nix +++ b/python/pkgs/grpcio-status/default.nix @@ -2,35 +2,38 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, googleapis-common-protos, grpcio, protobuf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grpcio-status"; version = "1.83.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "grpcio_status"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-wIyNVT1quW7/rh2SODneIpJvWjFqlC9IpIBA4EfFF68="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace 'protobuf>=4.21.6' 'protobuf' ''; - propagatedBuildInputs = [ + dependencies = [ googleapis-common-protos grpcio protobuf ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "grpc_status" ]; @@ -39,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/grpc/grpc/tree/master/src/python/grpcio_status"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/grpcio-testing/default.nix b/python/pkgs/grpcio-testing/default.nix index f4cd26241..79aa0de4d 100644 --- a/python/pkgs/grpcio-testing/default.nix +++ b/python/pkgs/grpcio-testing/default.nix @@ -10,14 +10,14 @@ # This package should be updated together with the main grpc package and other # related python grpc packages. # nixpkgs-update: no auto update -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grpcio-testing"; version = "1.83.1"; pyproject = true; src = fetchPypi { pname = "grpcio_testing"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-xye7371SOlXGMECLeX/43w89GEFyHV8+eOoV4C/39Vs="; }; @@ -40,11 +40,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "grpc_testing" ]; # Module has no tests - doCheck = false; meta = { description = "Testing utilities for gRPC Python"; homepage = "https://grpc.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/grpcio-tools/default.nix b/python/pkgs/grpcio-tools/default.nix index b307bbc48..60ad59e56 100644 --- a/python/pkgs/grpcio-tools/default.nix +++ b/python/pkgs/grpcio-tools/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grpcio-tools"; version = "1.83.1"; pyproject = true; src = fetchPypi { pname = "grpcio_tools"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-qBSO7OOW+KNJCXlYvADxSIIAMzHzt8KugHnBxjLRfW8="; }; @@ -48,7 +48,6 @@ buildPythonPackage rec { ]; # no tests in the package - doCheck = false; pythonImportsCheck = [ "grpc_tools" ]; @@ -57,4 +56,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; homepage = "https://grpc.io/grpc/python/"; }; -} +}) diff --git a/python/pkgs/grpcio/default.nix b/python/pkgs/grpcio/default.nix index 9d0cdfb02..f5baf373d 100644 --- a/python/pkgs/grpcio/default.nix +++ b/python/pkgs/grpcio/default.nix @@ -13,13 +13,13 @@ zlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grpcio"; version = "1.83.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nO5vy/LrV8S0lFF4e/qHvo78HKAqCzJ91LVNRFAuNis="; }; @@ -77,4 +77,4 @@ buildPythonPackage rec { homepage = "https://grpc.io/grpc/python/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/grpclib/default.nix b/python/pkgs/grpclib/default.nix index 1960f48ae..faaf9ed06 100644 --- a/python/pkgs/grpclib/default.nix +++ b/python/pkgs/grpclib/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "grpclib"; version = "0.4.9"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vmagamedov"; repo = "grpclib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9ElCIL084B+KihV1AXYJejBletj8y6LnoWRGEj4E1tQ="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/vmagamedov/grpclib"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/gsd/default.nix b/python/pkgs/gsd/default.nix index 2c2273c47..eacba7341 100644 --- a/python/pkgs/gsd/default.nix +++ b/python/pkgs/gsd/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gsd"; version = "5.0.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "glotzerlab"; repo = "gsd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jgj5XgBN68E/Rd60YnXwsy0YIJDcPAk8ajnGeVe1k9g="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/glotzerlab/gsd"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/gspread/default.nix b/python/pkgs/gspread/default.nix index 26ae505ed..82a968744 100644 --- a/python/pkgs/gspread/default.nix +++ b/python/pkgs/gspread/default.nix @@ -8,7 +8,7 @@ strenum, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gspread"; version = "6.2.1"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "burnash"; repo = "gspread"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-j7UNti5N8c1mjw+1qTPIRCWJ6M4Ur0P9sG1uJnp170M="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ google-auth google-auth-oauthlib strenum @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/burnash/gspread"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gstools-cython/default.nix b/python/pkgs/gstools-cython/default.nix index d0c1d5862..6c1b93b9d 100644 --- a/python/pkgs/gstools-cython/default.nix +++ b/python/pkgs/gstools-cython/default.nix @@ -11,7 +11,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gstools-cython"; version = "1.2.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GeoStat-Framework"; repo = "GSTools-Cython"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-D5oOSOVfmwAOF7MYpMmOMXIS82NJeztRJh4sDXS+Ouc="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/GeoStat-Framework/GSTools-Cython"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/gtfs-realtime-bindings/default.nix b/python/pkgs/gtfs-realtime-bindings/default.nix index 0ced4ca6a..b5e1287b7 100644 --- a/python/pkgs/gtfs-realtime-bindings/default.nix +++ b/python/pkgs/gtfs-realtime-bindings/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gtfs-realtime-bindings"; version = "2.2.0"; pyproject = true; src = fetchPypi { pname = "gtfs_realtime_bindings"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-HhhAdf9qrh+OjJGuKOuUavXltla3Q6Qae8o3gYeEiGs="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { dependencies = [ protobuf ]; # Tests are not shipped, only a tarball for Java is present - doCheck = false; pythonImportsCheck = [ "google.transit" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/MobilityData/gtfs-realtime-bindings"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/gtts-token/default.nix b/python/pkgs/gtts-token/default.nix index 3cb0ff17a..ee6914c7d 100644 --- a/python/pkgs/gtts-token/default.nix +++ b/python/pkgs/gtts-token/default.nix @@ -2,26 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gtts-token"; version = "1.1.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "boudewijn26"; repo = "gTTS-token"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0vr52zc0jqyfvsccl67j1baims3cdx2is1y2lpx2kav9gadkn8hp"; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # requires internet access meta = { description = "Calculates a token to run the Google Translate text to speech"; homepage = "https://github.com/boudewijn26/gTTS-token"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gtts/default.nix b/python/pkgs/gtts/default.nix index a62d8d3b9..e98a11932 100644 --- a/python/pkgs/gtts/default.nix +++ b/python/pkgs/gtts/default.nix @@ -15,7 +15,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gtts"; version = "2.5.4"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ryTR7cESDO9pH5r2FBz+6JuNMEQr39hil/FSklgaIGg="; }; @@ -42,7 +42,6 @@ buildPythonPackage rec { twine ]; # majority of tests just try to call out to Google's Translate API endpoint - doCheck = false; checkPhase = '' pytest ''; @@ -55,4 +54,4 @@ buildPythonPackage rec { homepage = "https://gtts.readthedocs.io"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/guessit/default.nix b/python/pkgs/guessit/default.nix index 2da7317dc..c36037de8 100644 --- a/python/pkgs/guessit/default.nix +++ b/python/pkgs/guessit/default.nix @@ -8,13 +8,13 @@ python-dateutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "guessit"; version = "3.8.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Zhn8u/mgUQ7IwsM3RMQlHK0FB7HVc9Bch13hftxe2+0="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://guessit-io.github.io/guessit/"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/guidata/default.nix b/python/pkgs/guidata/default.nix index da08e09a3..875e3b9ba 100644 --- a/python/pkgs/guidata/default.nix +++ b/python/pkgs/guidata/default.nix @@ -14,7 +14,7 @@ guidata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "guidata"; version = "3.15.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PlotPyStack"; repo = "guidata"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-u9iT19xQRQ6vw7tJW9Wr7geYAGdBTDisvsE0pq9jZlo="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/PlotPyStack/guidata"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/gunicorn/default.nix b/python/pkgs/gunicorn/default.nix index 3058afbc3..9881d1859 100644 --- a/python/pkgs/gunicorn/default.nix +++ b/python/pkgs/gunicorn/default.nix @@ -15,7 +15,7 @@ setproctitle, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gunicorn"; version = "26.2.2"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "benoitc"; repo = "gunicorn"; - tag = version; + tag = finalAttrs.version; hash = "sha256-F1zjgh5iCmy3LExWhs0tWRjiqloHEUlD4IqVp7U+ht4="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "gunicorn"; }; -} +}) diff --git a/python/pkgs/guzzle-sphinx-theme/default.nix b/python/pkgs/guzzle-sphinx-theme/default.nix index 2dffac84f..9e7acf2ba 100644 --- a/python/pkgs/guzzle-sphinx-theme/default.nix +++ b/python/pkgs/guzzle-sphinx-theme/default.nix @@ -6,14 +6,14 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "guzzle-sphinx-theme"; version = "0.7.11"; pyproject = true; src = fetchPypi { pname = "guzzle_sphinx_theme"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-m4wWOcNDwCw/PbffZg3fb1M7VFTukqX3sC7apXP+0+Y="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/guzzle/guzzle_sphinx_theme/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gviz-api/default.nix b/python/pkgs/gviz-api/default.nix index 4339c7e0c..69d344a8e 100644 --- a/python/pkgs/gviz-api/default.nix +++ b/python/pkgs/gviz-api/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "1.10.0"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; sha256 = "sha256-hGaS3YzHMiT8MbGOQVib2TThzAUJDGV2r0tLJsLnG5A="; diff --git a/python/pkgs/gvm-tools/default.nix b/python/pkgs/gvm-tools/default.nix index 852fadc2c..0f0899ae4 100644 --- a/python/pkgs/gvm-tools/default.nix +++ b/python/pkgs/gvm-tools/default.nix @@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ python-gvm ]; + dependencies = [ python-gvm ]; pythonImportsCheck = [ "gvmtools" ]; diff --git a/python/pkgs/gym-notices/default.nix b/python/pkgs/gym-notices/default.nix index 7757f0528..8846fbb2a 100644 --- a/python/pkgs/gym-notices/default.nix +++ b/python/pkgs/gym-notices/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gym-notices"; version = "0.1.0"; pyproject = true; src = fetchPypi { pname = "gym_notices"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-n5R372iowV5CYl1PpTYxI34+aulH8yW1wUnAgUma3Bs="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/Farama-Foundation/gym-notices"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gym/default.nix b/python/pkgs/gym/default.nix index e05fa10db..78c4c2a03 100644 --- a/python/pkgs/gym/default.nix +++ b/python/pkgs/gym/default.nix @@ -10,7 +10,7 @@ gym-notices, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gym"; version = "0.26.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openai"; repo = "gym"; - tag = version; + tag = finalAttrs.version; hash = "sha256-uJgm8l1SxIRC5PV6BIH/ht/1ucGT5UaUhkFMdusejgA="; }; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://www.gymlibrary.dev/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/gymnasium/default.nix b/python/pkgs/gymnasium/default.nix index 69d6782ec..77b0f517f 100644 --- a/python/pkgs/gymnasium/default.nix +++ b/python/pkgs/gymnasium/default.nix @@ -13,7 +13,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gymnasium"; version = "1.3.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Gymnasium"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-asQ/RqnmGRoVdwBkp4RIkqzGtQ7PnISt8/mRcXrNbBc="; }; @@ -36,11 +36,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "gymnasium" ]; - doCheck = false; - meta = { description = "Standard API for reinforcement learning and a diverse set of reference environments"; homepage = "https://github.com/Farama-Foundation/Gymnasium"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/h11/default.nix b/python/pkgs/h11/default.nix index 542854ab6..574a4d52a 100644 --- a/python/pkgs/h11/default.nix +++ b/python/pkgs/h11/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "h11"; version = "0.16.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-TjW5Vs9FeS5MqliF5p+6AL28b/r7+gIDAOVJsgjuX/E="; }; + + build-system = [ setuptools ]; # Some of the tests use localhost networking. meta = { description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1"; homepage = "https://github.com/python-hyper/h11"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/h2/default.nix b/python/pkgs/h2/default.nix index 45f5d85b1..eacc35b30 100644 --- a/python/pkgs/h2/default.nix +++ b/python/pkgs/h2/default.nix @@ -7,7 +7,7 @@ hyperframe, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "h2"; version = "4.3.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-hyper"; repo = "h2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-04we2xeh5LtLA4La9WPfXQVczDIz7NpL/6y9TmIELgM="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-hyper/h2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/h5io/default.nix b/python/pkgs/h5io/default.nix index 3060c5901..98b5b9942 100644 --- a/python/pkgs/h5io/default.nix +++ b/python/pkgs/h5io/default.nix @@ -17,7 +17,7 @@ tables, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "h5io"; version = "0.2.5"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "h5io"; repo = "h5io"; - tag = "h5io-${version}"; + tag = "h5io-${finalAttrs.version}"; hash = "sha256-ZkG9e7KtDvoRq9XCExYseE+Z7tMQTWcSiwsSrN5prdI="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/h5io/h5io"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/h5netcdf/default.nix b/python/pkgs/h5netcdf/default.nix index 8461a7e40..5cb1902e6 100644 --- a/python/pkgs/h5netcdf/default.nix +++ b/python/pkgs/h5netcdf/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "h5netcdf"; version = "1.8.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "h5netcdf"; repo = "h5netcdf"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-g7cAUhIrTzWv/ELOWLNMKhm2rM7i+7o4iJS5d4vzal4="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/shoyer/h5netcdf"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/h5py/default.nix b/python/pkgs/h5py/default.nix index 7b8175cf8..158ba8417 100644 --- a/python/pkgs/h5py/default.nix +++ b/python/pkgs/h5py/default.nix @@ -17,13 +17,13 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "3.16.0"; pname = "h5py"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-oNuq15aEDMqmekwUSg0MgIAHPDTHbVppQdaBhnjvJzg="; }; @@ -78,4 +78,4 @@ buildPythonPackage rec { homepage = "http://www.h5py.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ha-ffmpeg/default.nix b/python/pkgs/ha-ffmpeg/default.nix index da669b8c3..305aaf43b 100644 --- a/python/pkgs/ha-ffmpeg/default.nix +++ b/python/pkgs/ha-ffmpeg/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ha-ffmpeg"; version = "3.2.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "ha-ffmpeg"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TbSoKoOiLx3O7iykiTri5GBHGj7WoB8iSCpFIrV4ZgU="; }; @@ -24,7 +24,6 @@ buildPythonPackage rec { ]; # only manual tests - doCheck = false; pythonImportsCheck = [ "haffmpeg.camera" @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-libs/ha-ffmpeg/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ha-iotawattpy/default.nix b/python/pkgs/ha-iotawattpy/default.nix index dba8f9d6b..cbd0622a0 100644 --- a/python/pkgs/ha-iotawattpy/default.nix +++ b/python/pkgs/ha-iotawattpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; - propagatedBuildInputs = [ httpx ]; + dependencies = [ httpx ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/python/pkgs/ha-mqtt-discoverable/default.nix b/python/pkgs/ha-mqtt-discoverable/default.nix index 3d6c6039a..e78185e92 100644 --- a/python/pkgs/ha-mqtt-discoverable/default.nix +++ b/python/pkgs/ha-mqtt-discoverable/default.nix @@ -37,7 +37,6 @@ buildPythonPackage (finalAttrs: { ]; # Test require a running Mosquitto instance - doCheck = false; pythonImportsCheck = [ "ha_mqtt_discoverable" ]; diff --git a/python/pkgs/ha-philipsjs/default.nix b/python/pkgs/ha-philipsjs/default.nix index 874f9a8e3..6f72a10e1 100644 --- a/python/pkgs/ha-philipsjs/default.nix +++ b/python/pkgs/ha-philipsjs/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ha-philipsjs"; version = "3.3.4"; # FIXME Can we check metadata again? pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danielperna84"; repo = "ha-philipsjs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Ui15KtTpyfVTHmiHNVx/99qiUtKLZeyOOtAuQvfnU8k="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/danielperna84/ha-philipsjs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ha-silabs-firmware-client/default.nix b/python/pkgs/ha-silabs-firmware-client/default.nix index 46591c4a6..4156ab71f 100644 --- a/python/pkgs/ha-silabs-firmware-client/default.nix +++ b/python/pkgs/ha-silabs-firmware-client/default.nix @@ -11,7 +11,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ha-silabs-firmware-client"; version = "0.3.0"; pyproject = true; @@ -21,14 +21,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "ha-silabs-firmware-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OCDMJtcgBfVKATJQgqH/YuEU8112tSBjqT81jDUu4b8="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail ', "setuptools-git-versioning<3"' "" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-libs/ha-silabs-firmware-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/habanero/default.nix b/python/pkgs/habanero/default.nix index e2f02ec1d..0a789f874 100644 --- a/python/pkgs/habanero/default.nix +++ b/python/pkgs/habanero/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "habanero"; version = "2.9.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sckott"; repo = "habanero"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XRqMq0L0fedFt4hX6p4XzNeRxg8JL/xdIfuqLdpVnzo="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://habanero.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/habiticalib/default.nix b/python/pkgs/habiticalib/default.nix index d2b99d8c4..36dc32d8b 100644 --- a/python/pkgs/habiticalib/default.nix +++ b/python/pkgs/habiticalib/default.nix @@ -16,7 +16,7 @@ syrupy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "habiticalib"; version = "0.4.7"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tr4nt0r"; repo = "habiticalib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZZY7UnA4d4JNHGLMtaEGobAgzAwYDgL2SUGfxGABxTs="; }; @@ -66,4 +66,4 @@ buildPythonPackage rec { homepage = "https://github.com/tr4nt0r/habiticalib"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/habitipy/default.nix b/python/pkgs/habitipy/default.nix index ce25c6a9d..1fc6c8858 100644 --- a/python/pkgs/habitipy/default.nix +++ b/python/pkgs/habitipy/default.nix @@ -10,7 +10,7 @@ responses, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "habitipy"; version = "0.3.3"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ASMfreaK"; repo = "habitipy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AEeTCrxLXkokRRnNUfW4y23Qdh8ek1F88GmCPLGb84A="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/ASMfreaK/habitipy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hachoir/default.nix b/python/pkgs/hachoir/default.nix index 2b9840e61..666fe8726 100644 --- a/python/pkgs/hachoir/default.nix +++ b/python/pkgs/hachoir/default.nix @@ -2,23 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, urwid, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hachoir"; version = "3.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "vstinner"; repo = "hachoir"; - tag = version; + tag = finalAttrs.version; hash = "sha256-sTUJx8Xyhw4Z6juRtREw/okuVjSTSVWpSLKeZ7T8IR8="; }; - propagatedBuildInputs = [ urwid ]; + build-system = [ setuptools ]; + + dependencies = [ urwid ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -29,4 +33,4 @@ buildPythonPackage rec { homepage = "https://hachoir.readthedocs.io/"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/hacking/default.nix b/python/pkgs/hacking/default.nix index 4bf2f0807..bb13789c3 100644 --- a/python/pkgs/hacking/default.nix +++ b/python/pkgs/hacking/default.nix @@ -7,13 +7,13 @@ flake8, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hacking"; version = "8.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PHjOx8Wkq7SQmlJS1mq5PpswayGthmV+LCA8eLUiQx8="; }; @@ -28,8 +28,6 @@ buildPythonPackage rec { dependencies = [ flake8 ]; - doCheck = false; - pythonImportsCheck = [ "hacking" ]; meta = { @@ -37,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/hacking"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/haishoku/default.nix b/python/pkgs/haishoku/default.nix index a449788d1..8c573f8bf 100644 --- a/python/pkgs/haishoku/default.nix +++ b/python/pkgs/haishoku/default.nix @@ -8,7 +8,7 @@ pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "haishoku"; version = "1.1.8"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LanceGin"; repo = "haishoku"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LSoZopCaM5vbknGS9gG13OZIgghgqJvPtktUkBCH04Q="; }; @@ -25,7 +25,6 @@ buildPythonPackage rec { dependencies = [ pillow ]; # no test - doCheck = false; pythonImportsCheck = [ "haishoku" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/LanceGin/haishoku"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hakuin/default.nix b/python/pkgs/hakuin/default.nix index 902a85973..9a2a29e2e 100644 --- a/python/pkgs/hakuin/default.nix +++ b/python/pkgs/hakuin/default.nix @@ -9,7 +9,7 @@ sqlglot, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hakuin"; version = "0.2.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pruzko"; repo = "hakuin"; - tag = version; + tag = finalAttrs.version; hash = "sha256-97nh+woUsCXcoO2i5KprCwJiE24V3mg91qcNgy7bpgg="; }; @@ -31,7 +31,6 @@ buildPythonPackage rec { ]; # Module has no test - doCheck = false; pythonImportsCheck = [ "hakuin" ]; @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/pruzko/hakuin"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/halo/default.nix b/python/pkgs/halo/default.nix index e53c86cc9..bd1bd8bc9 100644 --- a/python/pkgs/halo/default.nix +++ b/python/pkgs/halo/default.nix @@ -10,13 +10,13 @@ spinners, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "halo"; version = "0.0.31"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-e2ejUh7pHVO3FS1O40UoEeHSpjIZdRN3Yus9cAY8ydY="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/manrajgrover/halo"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/handout/default.nix b/python/pkgs/handout/default.nix index c1dbf08af..dc2fe421b 100644 --- a/python/pkgs/handout/default.nix +++ b/python/pkgs/handout/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, imageio, imageio-ffmpeg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "handout"; version = "1.1.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "52daaf1f9a4cb2ceb88c1dedf85d22ef449b9422b424a2534d21f941e57bc915"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ imageio imageio-ffmpeg ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/danijar/handout"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/handy-archives/default.nix b/python/pkgs/handy-archives/default.nix index 682d3d152..c81202e5f 100644 --- a/python/pkgs/handy-archives/default.nix +++ b/python/pkgs/handy-archives/default.nix @@ -7,13 +7,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "handy_archives"; version = "0.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ko0SXNnEJDO5eDhINPSh3xhKnjuraL9EDfGEttrhL/M="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/domdfcoding/handy-archives"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hanna-cloud/default.nix b/python/pkgs/hanna-cloud/default.nix index b1865d164..dfa035be3 100644 --- a/python/pkgs/hanna-cloud/default.nix +++ b/python/pkgs/hanna-cloud/default.nix @@ -27,7 +27,6 @@ buildPythonPackage (finalAttrs: { ]; # upstream has no tests - doCheck = false; pythonImportsCheck = [ "hanna_cloud" ]; diff --git a/python/pkgs/hanzidentifier/default.nix b/python/pkgs/hanzidentifier/default.nix index 069121d70..ecba542be 100644 --- a/python/pkgs/hanzidentifier/default.nix +++ b/python/pkgs/hanzidentifier/default.nix @@ -7,7 +7,7 @@ zhon, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hanzidentifier"; version = "1.3.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tsroten"; repo = "hanzidentifier"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SXIMk5Pr2jqoWOjKfVVhe6fHdbh3j+5Lnlru7St8bgA="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/tsroten/hanzidentifier"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/harlequin-bigquery/default.nix b/python/pkgs/harlequin-bigquery/default.nix index eb11d6aef..7fe3f2afd 100644 --- a/python/pkgs/harlequin-bigquery/default.nix +++ b/python/pkgs/harlequin-bigquery/default.nix @@ -7,14 +7,14 @@ google-cloud-bigquery-storage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "harlequin-bigquery"; version = "1.0.3"; pyproject = true; src = fetchPypi { pname = "harlequin_bigquery"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-jdDwmfiU7x4zl4hg12evrPqLEzPB2M8/1HN4d0N1EJQ="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { # To prevent circular dependency # as harlequin-bigquery requires harlequin which requires harlequin-bigquery - doCheck = false; pythonRemoveDeps = [ "harlequin" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/harlequin-bigquery/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/harlequin-postgres/default.nix b/python/pkgs/harlequin-postgres/default.nix index 102680030..49b83f4ea 100644 --- a/python/pkgs/harlequin-postgres/default.nix +++ b/python/pkgs/harlequin-postgres/default.nix @@ -8,14 +8,14 @@ pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "harlequin-postgres"; version = "1.4.1"; pyproject = true; src = fetchPypi { pname = "harlequin_postgres"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-41LHQxJ1Lyeaozv5coTjIu8UR/GFlbC1gyZa2EPfe6s="; }; @@ -31,7 +31,6 @@ buildPythonPackage rec { # To prevent circular dependency # as harlequin-postgres requires harlequin which requires harlequin-postgres - doCheck = false; pythonRemoveDeps = [ "harlequin" ]; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/harlequin-postgres/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hass-client/default.nix b/python/pkgs/hass-client/default.nix index f40860f65..ff796d11b 100644 --- a/python/pkgs/hass-client/default.nix +++ b/python/pkgs/hass-client/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hass-client"; version = "1.3.1"; pyproject = true; @@ -18,13 +18,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "music-assistant"; repo = "python-hass-client"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WpsdvwRICAllrmpuhOUEAPq2kdtcKK/XgE+0+PY+lUo="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "1.0.0" "${version}" + --replace-fail "1.0.0" "${finalAttrs.version}" ''; build-system = [ @@ -49,11 +49,10 @@ buildPythonPackage rec { ]; # upstream has no tests - doCheck = false; meta = { description = "Basic client for connecting to Home Assistant over websockets and REST"; homepage = "https://github.com/music-assistant/python-hass-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/hass-splunk/default.nix b/python/pkgs/hass-splunk/default.nix index 66e488167..75da43b05 100644 --- a/python/pkgs/hass-splunk/default.nix +++ b/python/pkgs/hass-splunk/default.nix @@ -6,7 +6,7 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hass-splunk"; version = "0.1.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bre77"; repo = "hass_splunk"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PvTmzMYlmZYjs9CnOPbjFneiZPgfDTlVqRtfl53uY78="; }; @@ -25,11 +25,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "hass_splunk" ]; # upstream has no tests - doCheck = false; meta = { description = "Async single threaded connector to Splunk HEC using an asyncio session"; homepage = "https://github.com/Bre77/hass_splunk"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hatasmota/default.nix b/python/pkgs/hatasmota/default.nix index 9737062cb..5a9f3cf2e 100644 --- a/python/pkgs/hatasmota/default.nix +++ b/python/pkgs/hatasmota/default.nix @@ -9,7 +9,7 @@ voluptuous, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hatasmota"; version = "0.10.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "emontnemery"; repo = "hatasmota"; - tag = version; + tag = finalAttrs.version; hash = "sha256-IIOXpgBlXzeOUCvyEYAuEYzvoCKzhWSud1GbgTpa8wU="; }; @@ -32,7 +32,6 @@ buildPythonPackage rec { ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "hatasmota" ]; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/emontnemery/hatasmota"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hatch-autorun/default.nix b/python/pkgs/hatch-autorun/default.nix index 2c6748e39..b24b81b73 100644 --- a/python/pkgs/hatch-autorun/default.nix +++ b/python/pkgs/hatch-autorun/default.nix @@ -8,7 +8,7 @@ build, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hatch-autorun"; version = "1.1.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ofek"; repo = "hatch-autorun"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-79k3KolvmjGf8ubCQMhtOH5+OeqQrmz2Q6r0ZG98424="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/ofek/hatch-autorun"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hatch-babel/default.nix b/python/pkgs/hatch-babel/default.nix index fb0e324b7..18687df0f 100644 --- a/python/pkgs/hatch-babel/default.nix +++ b/python/pkgs/hatch-babel/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hatch-babel"; version = "0.1.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NiklasRosenstein"; repo = "hatch-babel"; - tag = version; + tag = finalAttrs.version; hash = "sha256-qAVuT3NuHAh1ELWzBT3/kvrDdSHqdy/YINCfKgpSk8g="; }; @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "Hatch build-hook to compile Babel *.po files to *.mo files at build time"; homepage = "https://github.com/NiklasRosenstein/hatch-babel"; - # changelog = "https://github.com/NiklasRosenstein/hatch-babel/blob/${src.tag}/.changelog/${src.tag}.toml"; + # changelog = "https://github.com/NiklasRosenstein/hatch-babel/blob/${finalAttrs.src.tag}/.changelog/${finalAttrs.src.tag}.toml"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hatch-deps-selector/default.nix b/python/pkgs/hatch-deps-selector/default.nix index c80f19c72..b5f454058 100644 --- a/python/pkgs/hatch-deps-selector/default.nix +++ b/python/pkgs/hatch-deps-selector/default.nix @@ -7,7 +7,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hatch-deps-selector"; version = "0.1.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter-book"; repo = "hatch-deps-selector"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AaHVBUDENF3d+yzDt5mvMnfqO+DSYQafMdHNDyEtz2s="; }; @@ -26,11 +26,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "hatch_deps_selector" ]; # No tests - doCheck = false; meta = { description = "Select additional dependencies for pyproject.toml from the environment"; homepage = "https://github.com/jupyter-book/hatch-deps-selector"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hatch-docstring-description/default.nix b/python/pkgs/hatch-docstring-description/default.nix index 23a5ad0d2..de168f3b4 100644 --- a/python/pkgs/hatch-docstring-description/default.nix +++ b/python/pkgs/hatch-docstring-description/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hatch-docstring-description"; version = "1.1.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "flying-sheep"; repo = "hatch-docstring-description"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ouor0FV3qdXYJx5EWFUWSKp8Cc/EuD1WXrtLvbYG+XI="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/flying-sheep/hatch-docstring-description"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/hatch-fancy-pypi-readme/default.nix b/python/pkgs/hatch-fancy-pypi-readme/default.nix index 3cef7a9b9..619dcc00e 100644 --- a/python/pkgs/hatch-fancy-pypi-readme/default.nix +++ b/python/pkgs/hatch-fancy-pypi-readme/default.nix @@ -5,20 +5,20 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hatch-fancy-pypi-readme"; version = "25.1.0"; pyproject = true; src = fetchPypi { pname = "hatch_fancy_pypi_readme"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-nFjtPf+Q1R9DQUzjcAmtHVsPCP/J/CFpmKBjgPAcAEU="; }; nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ hatchling ]; # Requires network connection @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/hynek/hatch-fancy-pypi-readme"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hatch-min-requirements/default.nix b/python/pkgs/hatch-min-requirements/default.nix index 1fdfaf073..f41cc277c 100644 --- a/python/pkgs/hatch-min-requirements/default.nix +++ b/python/pkgs/hatch-min-requirements/default.nix @@ -33,7 +33,6 @@ buildPythonPackage (finalAttrs: { ]; # As of v0.1.0 all tests attempt to use the network - doCheck = false; pythonImportsCheck = [ "hatch_min_requirements" ]; diff --git a/python/pkgs/hatch-mypyc/default.nix b/python/pkgs/hatch-mypyc/default.nix index 72b430fa4..a245496cb 100644 --- a/python/pkgs/hatch-mypyc/default.nix +++ b/python/pkgs/hatch-mypyc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "ofek"; repo = "hatch-mypyc"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3bIi2tlAcBurWqqPDVTJ1/EU2KTd1XVU97jFOaYtW5U="; }; @@ -32,8 +32,6 @@ buildPythonPackage (finalAttrs: { setuptools ]; - doCheck = false; # network access - pythonImportsCheck = [ "hatch_mypyc" ]; diff --git a/python/pkgs/hatch-nodejs-version/default.nix b/python/pkgs/hatch-nodejs-version/default.nix index e1e0c46ab..3aad57a13 100644 --- a/python/pkgs/hatch-nodejs-version/default.nix +++ b/python/pkgs/hatch-nodejs-version/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hatch-nodejs-version"; version = "0.4.0"; pyproject = true; @@ -13,11 +13,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "agoose77"; repo = "hatch-nodejs-version"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Oe07HFzhhnAGTWM51xSgRmpJgIZg0oMIxkmMxKRPMwI="; }; - propagatedBuildInputs = [ hatchling ]; + dependencies = [ hatchling ]; pythonImportsCheck = [ "hatch_nodejs_version" ]; meta = { @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/agoose77/hatch-nodejs-version"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hatch-regex-commit/default.nix b/python/pkgs/hatch-regex-commit/default.nix index 2ccfb0953..9902a6d7c 100644 --- a/python/pkgs/hatch-regex-commit/default.nix +++ b/python/pkgs/hatch-regex-commit/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hatch-regex-commit"; version = "0.0.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frankie567"; repo = "hatch-regex-commit"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xdt3qszigdCudt2+EpUZPkJzL+XQ6TnVEAMm0sV3zwY="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { dependencies = [ hatchling ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "hatch_regex_commit" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/frankie567/hatch-regex-commit"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hatch-requirements-txt/default.nix b/python/pkgs/hatch-requirements-txt/default.nix index aae35e7ab..4d09853ca 100644 --- a/python/pkgs/hatch-requirements-txt/default.nix +++ b/python/pkgs/hatch-requirements-txt/default.nix @@ -6,14 +6,14 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hatch-requirements-txt"; version = "0.4.1"; pyproject = true; src = fetchPypi { pname = "hatch_requirements_txt"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-LGhuV1j9BbtV+n0MGY/dSB+NOqo8aTJg9cDXTONUfSA="; }; @@ -24,8 +24,6 @@ buildPythonPackage rec { packaging ]; - doCheck = false; - pythonImportsCheck = [ "hatch_requirements_txt" ]; meta = { @@ -33,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/repo-helper/hatch-requirements-txt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hatch-sphinx/default.nix b/python/pkgs/hatch-sphinx/default.nix index a2cb13cdb..2e880c280 100644 --- a/python/pkgs/hatch-sphinx/default.nix +++ b/python/pkgs/hatch-sphinx/default.nix @@ -14,7 +14,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hatch-sphinx"; version = "0.0.4"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "llimeht"; repo = "hatch-sphinx"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8g0UkDMf05CVd2VbnV30pZpQ9chJhCkKfci7zmcIOoQ="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/llimeht/hatch-sphinx"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hatch-vcs/default.nix b/python/pkgs/hatch-vcs/default.nix index c39c5a05a..3e64853d9 100644 --- a/python/pkgs/hatch-vcs/default.nix +++ b/python/pkgs/hatch-vcs/default.nix @@ -6,14 +6,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hatch-vcs"; version = "0.5.0"; pyproject = true; src = fetchPypi { pname = "hatch_vcs"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-A5X6EmlANAIVCQw0Siv04qd7y+faqxb0Gze5jJWAn/k="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/ofek/hatch-vcs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hatchling/default.nix b/python/pkgs/hatchling/default.nix index b8c30957a..fc955be5d 100644 --- a/python/pkgs/hatchling/default.nix +++ b/python/pkgs/hatchling/default.nix @@ -42,7 +42,6 @@ buildPythonPackage (finalAttrs: { ]; # tries to fetch packages from the internet - doCheck = false; # listed in /backend/tests/downstream/requirements.txt checkPhase = '' diff --git a/python/pkgs/haversine/default.nix b/python/pkgs/haversine/default.nix index 73391624a..ea9cf6bb4 100644 --- a/python/pkgs/haversine/default.nix +++ b/python/pkgs/haversine/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "haversine"; version = "2.9.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mapado"; repo = "haversine"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KqcDDQdAOnrmiq+kf8rLHy85rNnhatZTOzCCU91lOrU="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/mapado/haversine"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hawkauthlib/default.nix b/python/pkgs/hawkauthlib/default.nix index fe098ed1e..ade683e65 100644 --- a/python/pkgs/hawkauthlib/default.nix +++ b/python/pkgs/hawkauthlib/default.nix @@ -8,7 +8,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hawkauthlib"; version = "2.0.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mozilla-services"; repo = "hawkauthlib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dFBGrk7vdZMNTuWvXXWXA4iF/vmiUnK9ds8edN2Yt10="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { description = "Hawk Access Authentication protocol"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/hcloud/default.nix b/python/pkgs/hcloud/default.nix index c5680e50d..cb666d374 100644 --- a/python/pkgs/hcloud/default.nix +++ b/python/pkgs/hcloud/default.nix @@ -7,13 +7,13 @@ python-dateutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hcloud"; version = "2.23.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-wS3OPxRATqNC15I2KSoV+8TO63hhckoJ3T/mDO9RPgs="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/hetznercloud/hcloud-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hdate/default.nix b/python/pkgs/hdate/default.nix index 790978609..2af459e39 100644 --- a/python/pkgs/hdate/default.nix +++ b/python/pkgs/hdate/default.nix @@ -12,7 +12,7 @@ syrupy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hdate"; version = "1.2.2"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "py-libhdate"; repo = "py-libhdate"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3MOxDVrEMuMfk/fCCo6IItqR1DMr/0KN7L4hYjMYCGM="; }; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/py-libhdate/py-libhdate"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/hdbscan/default.nix b/python/pkgs/hdbscan/default.nix index 8c50c3124..75f09422d 100644 --- a/python/pkgs/hdbscan/default.nix +++ b/python/pkgs/hdbscan/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, cython, numpy, @@ -11,18 +13,20 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hdbscan"; version = "0.8.44"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "scikit-learn-contrib"; repo = "hdbscan"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-mJz2CGiAgrz1M5w8XwCRjgQFBygQdVKyi2B8wFHWqGI="; }; + build-system = [ setuptools ]; + pythonRemoveDeps = [ "cython" ]; nativeBuildInputs = [ @@ -40,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/scikit-learn-contrib/hdbscan"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/hdfs/default.nix b/python/pkgs/hdfs/default.nix index afc236070..a5d3b8a6f 100644 --- a/python/pkgs/hdfs/default.nix +++ b/python/pkgs/hdfs/default.nix @@ -9,7 +9,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hdfs"; version = "2.7.3"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mtth"; repo = "hdfs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Pm2E8hB0wbu7npi/sLt9D8jQsH69qNOHLji9CYqST/8="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "hdfscli"; }; -} +}) diff --git a/python/pkgs/hdfury/default.nix b/python/pkgs/hdfury/default.nix index 51ace628a..9ecf7bc17 100644 --- a/python/pkgs/hdfury/default.nix +++ b/python/pkgs/hdfury/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "hdfury" ]; # Module no tests - doCheck = false; meta = { description = "Python client for HDFury devices"; diff --git a/python/pkgs/hdmedians/default.nix b/python/pkgs/hdmedians/default.nix index c393cfc26..71e5cdc1e 100644 --- a/python/pkgs/hdmedians/default.nix +++ b/python/pkgs/hdmedians/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.14.2"; pname = "hdmedians"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tHrssWdx4boHNlVyVdgK4CQLCRVr/0NDId5VmzWawtY="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { description = "High-dimensional medians"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/headerparser/default.nix b/python/pkgs/headerparser/default.nix index 24bace7c2..26673f161 100644 --- a/python/pkgs/headerparser/default.nix +++ b/python/pkgs/headerparser/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "headerparser"; version = "0.5.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jwodder"; repo = "headerparser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fn9Nlazte6r5JMmp9ynq0qmkLEoJGv8witgZlD7zJNM="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/jwodder/headerparser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/heapdict/default.nix b/python/pkgs/heapdict/default.nix index ded97c1e7..953428290 100644 --- a/python/pkgs/heapdict/default.nix +++ b/python/pkgs/heapdict/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "heapdict"; version = "1.0.1"; pyproject = true; src = fetchPypi { pname = "HeapDict"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-hJX1ez4D2ORtXxssxiyogayjkv1cwEjcCqLhptI+zbY="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/DanielStutzbach/heapdict"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/heatmiserv3/default.nix b/python/pkgs/heatmiserv3/default.nix index 3b8708e18..700721ba6 100644 --- a/python/pkgs/heatmiserv3/default.nix +++ b/python/pkgs/heatmiserv3/default.nix @@ -10,7 +10,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "heatmiserv3"; version = "2.0.6"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "andylockran"; repo = "heatmiserV3"; - tag = version; + tag = finalAttrs.version; hash = "sha256-mwzW52g3Uz7zxL9R5zePDyxMSramEiaiVm6VPlNyNts="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/andylockran/heatmiserV3"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/heatshrink2/default.nix b/python/pkgs/heatshrink2/default.nix index 7b8def1cf..68873fbe5 100644 --- a/python/pkgs/heatshrink2/default.nix +++ b/python/pkgs/heatshrink2/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "heatshrink2"; version = "0.14.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "eerimoq"; repo = "pyheatshrink"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-2bCk9bS/6hjbBJ30fpTt750A3vAvq4HOXmbpxOLRuj4="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "heatshrink2" ]; meta = { @@ -24,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/eerimoq/pyheatshrink"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/heatzypy/default.nix b/python/pkgs/heatzypy/default.nix index 973f1c2d9..256ee3f6a 100644 --- a/python/pkgs/heatzypy/default.nix +++ b/python/pkgs/heatzypy/default.nix @@ -27,7 +27,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "heatzypy" ]; diff --git a/python/pkgs/hebg/default.nix b/python/pkgs/hebg/default.nix index b3b104aac..b8ef8eaf7 100644 --- a/python/pkgs/hebg/default.nix +++ b/python/pkgs/hebg/default.nix @@ -18,13 +18,13 @@ pytest-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hebg"; version = "0.2.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-11bz+FbnaEVLiXT1eujMw8lvABlzVOeROOsdVgsyfjQ="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/IRLL/HEB_graphs"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/hegel-ip-client/default.nix b/python/pkgs/hegel-ip-client/default.nix index b52d31c6b..416fb2a2d 100644 --- a/python/pkgs/hegel-ip-client/default.nix +++ b/python/pkgs/hegel-ip-client/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # no tests - doCheck = false; pythonImportsCheck = [ "hegel_ip_client" ]; diff --git a/python/pkgs/help2man/default.nix b/python/pkgs/help2man/default.nix index dcbfea35f..3a92c53b8 100644 --- a/python/pkgs/help2man/default.nix +++ b/python/pkgs/help2man/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "help2man"; version = "0.0.9"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Freed-Wu"; repo = "help2man"; - rev = version; + tag = finalAttrs.version; hash = "sha256-BIDn+LQzBtDHUtFvIRL3NMXNouO3cMLibuYBoFtCUxI="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; mainProgram = "help2man"; }; -} +}) diff --git a/python/pkgs/helper/default.nix b/python/pkgs/helper/default.nix index 12cdd3ac1..f2d48ef86 100644 --- a/python/pkgs/helper/default.nix +++ b/python/pkgs/helper/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pyyaml, pytestCheckHook, mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "helper"; version = "2.5.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "gmr"; repo = "helper"; - rev = version; + tag = finalAttrs.version; sha256 = "0zypjv8rncvrsgl200v7d3bn08gs48dwqvgamfqv71h07cj6zngp"; }; - propagatedBuildInputs = [ pyyaml ]; + build-system = [ setuptools ]; + + dependencies = [ pyyaml ]; nativeCheckInputs = [ pytestCheckHook @@ -36,4 +40,4 @@ buildPythonPackage rec { homepage = "https://helper.readthedocs.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/hepdata-validator/default.nix b/python/pkgs/hepdata-validator/default.nix index 2d54be95c..e26e82dbf 100644 --- a/python/pkgs/hepdata-validator/default.nix +++ b/python/pkgs/hepdata-validator/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "hepdata-validator"; version = "0.3.6"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "HEPData"; diff --git a/python/pkgs/hepunits/default.nix b/python/pkgs/hepunits/default.nix index 03642c3d8..1c9010638 100644 --- a/python/pkgs/hepunits/default.nix +++ b/python/pkgs/hepunits/default.nix @@ -6,13 +6,13 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hepunits"; version = "2.4.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vKatqTcUcWbWbp+hUlZvI3iGjXmCEcrWmQCAOZVg+jQ="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/scikit-hep/hepunits"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/herepy/default.nix b/python/pkgs/herepy/default.nix index 63853bfa9..e8571978b 100644 --- a/python/pkgs/herepy/default.nix +++ b/python/pkgs/herepy/default.nix @@ -8,7 +8,7 @@ responses, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "herepy"; version = "3.6.5"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "abdullahselek"; repo = "HerePy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8DwzzC0sTrGnMpuADc55HCIeH/KyWacv8X+Ubh+n7ZM="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/abdullahselek/HerePy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hexbytes/default.nix b/python/pkgs/hexbytes/default.nix index 21cb48ace..8d14a2a1e 100644 --- a/python/pkgs/hexbytes/default.nix +++ b/python/pkgs/hexbytes/default.nix @@ -9,7 +9,7 @@ pydantic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hexbytes"; version = "2.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "hexbytes"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-R0Ucrq/E+g5IaiGTNllslwQOQxgNcSGLcyt6+t14uPM="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/hexbytes"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hexdump/default.nix b/python/pkgs/hexdump/default.nix index 5cd385a5a..716b345aa 100644 --- a/python/pkgs/hexdump/default.nix +++ b/python/pkgs/hexdump/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hexdump"; version = "3.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-14GkOwwWrOP5Nmqt5z6K06e9UTfVjwtFqy0/VIdvINs="; extension = "zip"; }; + build-system = [ setuptools ]; + # the source zip has no prefix, so everything gets unpacked to /build otherwise unpackPhase = '' runHook preUnpack @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/hexdump/"; # BitBucket site returns 404 license = lib.licenses.publicDomain; }; -} +}) diff --git a/python/pkgs/hf-transfer/default.nix b/python/pkgs/hf-transfer/default.nix index aec8b1e36..9098112a9 100644 --- a/python/pkgs/hf-transfer/default.nix +++ b/python/pkgs/hf-transfer/default.nix @@ -15,7 +15,7 @@ libiconv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hf-transfer"; version = "0.1.9"; pyproject = true; @@ -23,12 +23,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "huggingface"; repo = "hf_transfer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mcU3YuJVfuwBvtLfqceV3glcJcpjSX7M3VjvbvLCxZg="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-O4aKqVSShFpt8mdZkY3WV55j9CIczRSRkIMC7dJoGv0="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://github.com/huggingface/hf_transfer"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/hg-evolve/default.nix b/python/pkgs/hg-evolve/default.nix index e901dfd2f..01dfdcf32 100644 --- a/python/pkgs/hg-evolve/default.nix +++ b/python/pkgs/hg-evolve/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hg-evolve"; version = "12.0.0"; pyproject = true; src = fetchPypi { pname = "hg_evolve"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-WQp1raCE+hpmjutvXVWDh5dUNy+fEI6vXJsthLiY9dA="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://www.mercurial-scm.org/doc/evolution/"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/hg-git/default.nix b/python/pkgs/hg-git/default.nix index 64022dbbf..63cda573b 100644 --- a/python/pkgs/hg-git/default.nix +++ b/python/pkgs/hg-git/default.nix @@ -8,14 +8,14 @@ mercurial, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hg-git"; version = "1.2.0"; pyproject = true; src = fetchPypi { pname = "hg_git"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Pr+rNkqBubVlsQCyqd5mdr8D357FzSd3Kuz5EWeez8M="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://hg-git.github.io/"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/hibpwned/default.nix b/python/pkgs/hibpwned/default.nix index 75cb51010..5177e4962 100644 --- a/python/pkgs/hibpwned/default.nix +++ b/python/pkgs/hibpwned/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ requests ]; # Test require network access - doCheck = false; pythonImportsCheck = [ "hibpwned" ]; diff --git a/python/pkgs/hickle/default.nix b/python/pkgs/hickle/default.nix index 3bbe6f09f..fe4dfda0d 100644 --- a/python/pkgs/hickle/default.nix +++ b/python/pkgs/hickle/default.nix @@ -14,13 +14,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hickle"; version = "5.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-An5RzK0nnRaBI6JEUl5shLrA22RgWzEbC9NJiRvgxT4="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/telegraphic/hickle"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hid-parser/default.nix b/python/pkgs/hid-parser/default.nix index 59a1387cc..a2e206ce0 100644 --- a/python/pkgs/hid-parser/default.nix +++ b/python/pkgs/hid-parser/default.nix @@ -7,7 +7,7 @@ hypothesis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hid-parser"; version = "0.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "usb-tools"; repo = "python-hid-parser"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8aGyLTsBK5etwbqFkNinbLHCt20fsQEmuBvu3RrwCDA="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/usb-tools/python-hid-parser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hieroglyph/default.nix b/python/pkgs/hieroglyph/default.nix index 752ff01c0..24b121d5b 100644 --- a/python/pkgs/hieroglyph/default.nix +++ b/python/pkgs/hieroglyph/default.nix @@ -11,14 +11,14 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hieroglyph"; version = "2.1.0"; src = fetchFromGitHub { owner = "nyergler"; repo = "hieroglyph"; - tag = "hieroglyph-${version}"; + tag = "hieroglyph-${finalAttrs.version}"; hash = "sha256-nr5cHF0Lg2mjQvnOoM5HCmMUiGh1QOeTD0nc8BvCBOE="; }; @@ -56,11 +56,10 @@ buildPythonPackage rec { # all tests fail; don't know why: # test_absolute_paths_made_relative (hieroglyph.tests.test_path_fixing.PostProcessImageTests) ... ERROR - doCheck = false; meta = { description = "Generate HTML presentations from plain text sources"; homepage = "https://github.com/nyergler/hieroglyph/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/hightime/default.nix b/python/pkgs/hightime/default.nix index 78f99c3a0..18f7c3d59 100644 --- a/python/pkgs/hightime/default.nix +++ b/python/pkgs/hightime/default.nix @@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "ni"; repo = "hightime"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5WEr2tOxQap+otV8DCdIi3MkfHol4TU4qZXf4u2EQhY="; }; diff --git a/python/pkgs/hijridate/default.nix b/python/pkgs/hijridate/default.nix index e374f81db..52ad61866 100644 --- a/python/pkgs/hijridate/default.nix +++ b/python/pkgs/hijridate/default.nix @@ -6,7 +6,7 @@ hatch-fancy-pypi-readme, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hijridate"; version = "2.6.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dralshehri"; repo = "hijridate"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xnFF81l1ZqtH91NzYvjzXpXpN/zeHdARJYx6L5VNBSo="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/dralshehri/hijridate"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hikari/default.nix b/python/pkgs/hikari/default.nix index 2560e9f05..de2a51652 100644 --- a/python/pkgs/hikari/default.nix +++ b/python/pkgs/hikari/default.nix @@ -39,7 +39,7 @@ buildPythonPackage (finalAttrs: { build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp attrs multidict diff --git a/python/pkgs/hikvision/default.nix b/python/pkgs/hikvision/default.nix index 0db520e36..0c626bdaa 100644 --- a/python/pkgs/hikvision/default.nix +++ b/python/pkgs/hikvision/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hikvision"; version = "2.0.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fbradyirl"; repo = "hikvision"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tiJUqr5WtRvnKll1OymJ9Uva1tUT5so4Zzc4SHLcH9A="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/fbradyirl/hikvision"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hiredis/default.nix b/python/pkgs/hiredis/default.nix index a07df958a..41f83a904 100644 --- a/python/pkgs/hiredis/default.nix +++ b/python/pkgs/hiredis/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hiredis"; version = "3.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2hkzE1RDOvaixUwh8tcLoISTPA19LENXjsXFtEZnStU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/redis/hiredis-py"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/hiro/default.nix b/python/pkgs/hiro/default.nix index 2a2df8f22..7dbdcf896 100644 --- a/python/pkgs/hiro/default.nix +++ b/python/pkgs/hiro/default.nix @@ -11,13 +11,13 @@ mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hiro"; version = "1.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2jM5rx3JpZTMqdycccclJysuMGYE5F0OBXXNE8X5XWg="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://hiro.readthedocs.io/en/latest/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hishel/default.nix b/python/pkgs/hishel/default.nix index 4167bfc1d..b89c5c6ac 100644 --- a/python/pkgs/hishel/default.nix +++ b/python/pkgs/hishel/default.nix @@ -14,7 +14,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hishel"; version = "1.3.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "karpetrosyan"; repo = "hishel"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KVfbWhGpbLGzK3fQOuT+KtBi13z5ZZBP8NOsIIfObMc="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/karpetrosyan/hishel"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/histoprint/default.nix b/python/pkgs/histoprint/default.nix index 86353542f..cc171354a 100644 --- a/python/pkgs/histoprint/default.nix +++ b/python/pkgs/histoprint/default.nix @@ -9,7 +9,7 @@ uhi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "histoprint"; version = "2.7.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-hep"; repo = "histoprint"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yYPFGFrw4JV5Abu2kbNcwsnVtCNvnqhCl4cbX95wzQ8="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/scikit-hep/histoprint"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hive-metastore-client/default.nix b/python/pkgs/hive-metastore-client/default.nix index df3274135..e488739b7 100644 --- a/python/pkgs/hive-metastore-client/default.nix +++ b/python/pkgs/hive-metastore-client/default.nix @@ -13,7 +13,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hive-metastore-client"; version = "1.0.9"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "quintoandar"; repo = "hive-metastore-client"; - tag = version; + tag = finalAttrs.version; hash = "sha256-IejsiC1eDNa6fjpQPhLNkMvZpyr9QsQdGBfhev1jEyg="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/quintoandar/hive-metastore-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/hiyapyco/default.nix b/python/pkgs/hiyapyco/default.nix index 6593a9fa7..5625f3540 100644 --- a/python/pkgs/hiyapyco/default.nix +++ b/python/pkgs/hiyapyco/default.nix @@ -7,7 +7,7 @@ jinja2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hiyapyco"; version = "0.7.0"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zerwes"; repo = "hiyapyco"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-uF5DblAg4q8L1tZKopcjJ14NIQVQF5flNHdZ/jnw71M="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyyaml jinja2 ]; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/zerwes/hiyapyco"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/hjson/default.nix b/python/pkgs/hjson/default.nix index e2070d060..f5ff940ed 100644 --- a/python/pkgs/hjson/default.nix +++ b/python/pkgs/hjson/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hjson"; version = "3.0.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hjson"; repo = "hjson-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VrCLHfXShF45IEhGVQpryBzjxreQEunyghazDNKRh8k="; }; @@ -35,8 +35,8 @@ buildPythonPackage rec { meta = { description = "User interface for JSON"; homepage = "https://github.com/hjson/hjson-py"; - changelog = "https://github.com/hjson/hjson-py/releases/tag/v${version}"; + changelog = "https://github.com/hjson/hjson-py/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "hjson"; }; -} +}) diff --git a/python/pkgs/hkavr/default.nix b/python/pkgs/hkavr/default.nix index 16adf298a..d8518b277 100644 --- a/python/pkgs/hkavr/default.nix +++ b/python/pkgs/hkavr/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hkavr"; version = "0.0.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-wa0yS0KPdrQUuxxViweESD6Itn2rFlTwwrPQ0COWIPc="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "hkavr" ]; @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/Devqon/hkavr"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hko/default.nix b/python/pkgs/hko/default.nix index 6fe41102e..e1e7c7e8c 100644 --- a/python/pkgs/hko/default.nix +++ b/python/pkgs/hko/default.nix @@ -6,13 +6,13 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hko"; version = "0.3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6FzdaSaw7sX52wM8HbHFGtKdR2JBg3B2cMZnP7RfQzs="; }; @@ -21,7 +21,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; # Tests require network access - doCheck = false; pythonImportsCheck = [ "hko" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/MisterCommand/python-hko"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hlk-sw16/default.nix b/python/pkgs/hlk-sw16/default.nix index ca9708eb9..a8952d4b4 100644 --- a/python/pkgs/hlk-sw16/default.nix +++ b/python/pkgs/hlk-sw16/default.nix @@ -2,22 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hlk-sw16"; version = "0.0.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jameshilliard"; repo = "hlk-sw16"; - rev = version; + tag = finalAttrs.version; sha256 = "010s85nr6xn89i8yvdagg72a97dh1v2pyfqa33v76p9p8xbgh8dz"; }; + build-system = [ setuptools ]; + # no tests implemented - doCheck = false; pythonImportsCheck = [ "hlk_sw16" ]; @@ -26,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/jameshilliard/hlk-sw16"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hmmlearn/default.nix b/python/pkgs/hmmlearn/default.nix index 2f6679486..b1a96d9fa 100644 --- a/python/pkgs/hmmlearn/default.nix +++ b/python/pkgs/hmmlearn/default.nix @@ -1,6 +1,8 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, numpy, scikit-learn, @@ -10,23 +12,25 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hmmlearn"; version = "0.3.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-HTxdxMUlfgwjjcH+U4dwC4y5h+q4CO2z4Mc4KfHMROw="; }; + build-system = [ setuptools ]; + buildInputs = [ setuptools-scm cython pybind11 ]; - propagatedBuildInputs = [ + dependencies = [ numpy scikit-learn ]; @@ -45,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/hmmlearn/hmmlearn"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/hocr-tools/default.nix b/python/pkgs/hocr-tools/default.nix index 45182acb0..379c292c9 100644 --- a/python/pkgs/hocr-tools/default.nix +++ b/python/pkgs/hocr-tools/default.nix @@ -1,27 +1,30 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lxml, pillow, reportlab, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hocr-tools"; version = "1.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ocropus"; repo = "hocr-tools"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "14f9hkp7pr677085w8iidwd0la9cjzy3pyj3rdg9b03nz9pc0w6p"; }; + build-system = [ setuptools ]; + # hocr-tools uses a test framework that requires internet access - doCheck = false; - propagatedBuildInputs = [ + dependencies = [ pillow lxml reportlab @@ -32,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/ocropus/hocr-tools"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/holoviews/default.nix b/python/pkgs/holoviews/default.nix index 5c0904e41..860747490 100644 --- a/python/pkgs/holoviews/default.nix +++ b/python/pkgs/holoviews/default.nix @@ -22,7 +22,7 @@ flaky, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "holoviews"; version = "1.22.1"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "holoviz"; repo = "holoviews"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rZZQgM8gchWTsgA47BVWblzWiWMuHK2vAZD/1Z8BHAk="; }; @@ -91,4 +91,4 @@ buildPythonPackage rec { homepage = "https://www.holoviews.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/homeconnect/default.nix b/python/pkgs/homeconnect/default.nix index 8731e18ae..6081b669b 100644 --- a/python/pkgs/homeconnect/default.nix +++ b/python/pkgs/homeconnect/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "homeconnect"; version = "0.8.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-W475a+TlGiKRR1EDYiFVmApmQfmft85iBQLRnbEmcuA="; }; @@ -25,7 +25,6 @@ buildPythonPackage rec { ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "homeconnect" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/DavidMStraub/homeconnect"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/homelink-integration-api/default.nix b/python/pkgs/homelink-integration-api/default.nix index f9234768f..f63c9cf23 100644 --- a/python/pkgs/homelink-integration-api/default.nix +++ b/python/pkgs/homelink-integration-api/default.nix @@ -35,7 +35,6 @@ buildPythonPackage (finalAttrs: { ]; # upstream tests require network access and AWS credentials - doCheck = false; pythonImportsCheck = [ "homelink" ]; diff --git a/python/pkgs/homevolt/default.nix b/python/pkgs/homevolt/default.nix index e3d2c97b1..4965702a5 100644 --- a/python/pkgs/homevolt/default.nix +++ b/python/pkgs/homevolt/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; # upstream has no tests - doCheck = false; pythonImportsCheck = [ "homevolt" ]; diff --git a/python/pkgs/hopcroftkarp/default.nix b/python/pkgs/hopcroftkarp/default.nix index b671f2916..45d36457d 100644 --- a/python/pkgs/hopcroftkarp/default.nix +++ b/python/pkgs/hopcroftkarp/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hopcroftkarp"; version = "1.2.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-KKeIfbga2ZXM02obUWSkxUKxbSeB6MSTNNydFBlowOc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/sofiat-olaosebikan/hopcroftkarp"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/horimote/default.nix b/python/pkgs/horimote/default.nix index 5e80b0cba..88a5f00a3 100644 --- a/python/pkgs/horimote/default.nix +++ b/python/pkgs/horimote/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "horimote"; version = "0.4.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "benleb"; repo = "horimote"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rEtE0Z/PV/n9pz2mLbHeREv/sl4SexTSOq2yx4LDnAo="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/benleb/horimote"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/housekeeping/default.nix b/python/pkgs/housekeeping/default.nix index b35b17bba..f96f27a4d 100644 --- a/python/pkgs/housekeeping/default.nix +++ b/python/pkgs/housekeeping/default.nix @@ -6,13 +6,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "housekeeping"; version = "1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-decfHMUBiFQG9r6BQQybBTYYcaPszN44kTNtoekkJrU="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/beanbaginc/housekeeping"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hpack/default.nix b/python/pkgs/hpack/default.nix index ff778f7df..7db507b42 100644 --- a/python/pkgs/hpack/default.nix +++ b/python/pkgs/hpack/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hpack"; version = "4.2.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-hyper"; repo = "hpack"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gZe/ABRLXoBAeH/mp/yIgDj56jalyiYgs4EP2qK17Ig="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-hyper/hpack"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hpccm/default.nix b/python/pkgs/hpccm/default.nix index 4c1aebde3..d36fd4238 100644 --- a/python/pkgs/hpccm/default.nix +++ b/python/pkgs/hpccm/default.nix @@ -10,7 +10,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hpccm"; version = "26.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NVIDIA"; repo = "hpc-container-maker"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ITmq031/I4nKU4te9hio/H03Kz1IAfqTejDWUfsGL+g="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { mainProgram = "hpccm"; platforms = lib.platforms.x86; }; -} +}) diff --git a/python/pkgs/hs-dbus-signature/default.nix b/python/pkgs/hs-dbus-signature/default.nix index c71768159..a5e3270d5 100644 --- a/python/pkgs/hs-dbus-signature/default.nix +++ b/python/pkgs/hs-dbus-signature/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytestCheckHook, hypothesis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hs-dbus-signature"; version = "0.7"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NNnTcSX+K8zU+sj1QBd13h7aEXN9VqltJMNWCuhgZ6I="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook hypothesis @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/stratis-storage/hs-dbus-signature"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/hsaudiotag3k/default.nix b/python/pkgs/hsaudiotag3k/default.nix index bbb078156..004e0bb0e 100644 --- a/python/pkgs/hsaudiotag3k/default.nix +++ b/python/pkgs/hsaudiotag3k/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hsaudiotag3k"; version = "1.1.3.post1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-72DpIQ1HJ+gvAJWmhssHtnbQVZGPDFnFv6hZjaA+WdE="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "http://hg.hardcoded.net/hsaudiotag/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/hsluv/default.nix b/python/pkgs/hsluv/default.nix index a50299a94..cd402fe92 100644 --- a/python/pkgs/hsluv/default.nix +++ b/python/pkgs/hsluv/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hsluv"; version = "5.0.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hsluv"; repo = "hsluv-python"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bjivmPTU3Gp3pcC0ru4GSZANdhPqS1QSTMeiPGN8GCI="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/hsluv/hsluv-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hstspreload/default.nix b/python/pkgs/hstspreload/default.nix index 35c7c696f..7aaccd922 100644 --- a/python/pkgs/hstspreload/default.nix +++ b/python/pkgs/hstspreload/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # Tests require network connection - doCheck = false; pythonImportsCheck = [ "hstspreload" ]; diff --git a/python/pkgs/html-sanitizer/default.nix b/python/pkgs/html-sanitizer/default.nix index 79f123cf4..f73052ad2 100644 --- a/python/pkgs/html-sanitizer/default.nix +++ b/python/pkgs/html-sanitizer/default.nix @@ -15,7 +15,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "html-sanitizer"; version = "2.6"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matthiask"; repo = "html-sanitizer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-egBGhv7vudH32jwh9rAXuXfMzPDxJ60S5WKbc4kzCTU="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/matthiask/html-sanitizer"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/html-table-parser-python3/default.nix b/python/pkgs/html-table-parser-python3/default.nix index f4b9a1825..c369954c6 100644 --- a/python/pkgs/html-table-parser-python3/default.nix +++ b/python/pkgs/html-table-parser-python3/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "html-table-parser-python3"; version = "0.3.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "schmijos"; repo = "html-table-parser-python3"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-okYl0T12wVld7GVbFQH2hgEVKXSScipJN/vYaiRVdGY="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/schmijos/html-table-parser-python3"; license = lib.licenses.agpl3Only; }; -} +}) diff --git a/python/pkgs/html-tag-names/default.nix b/python/pkgs/html-tag-names/default.nix index a8431fb65..68ebbec5f 100644 --- a/python/pkgs/html-tag-names/default.nix +++ b/python/pkgs/html-tag-names/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "html-tag-names"; version = "0.1.2"; pyproject = true; @@ -13,14 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Riverside-Healthcare"; repo = "html-tag-names"; - rev = version; + tag = finalAttrs.version; hash = "sha256-2YywP4/0yocejuJwanC5g9BR7mcy5C+zMhCjNZ9FRH4="; }; nativeBuildInputs = [ poetry-core ]; # has no tests - doCheck = false; pythonImportsCheck = [ "HtmlTagNames" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/Riverside-Healthcare/html-tag-names"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/html-void-elements/default.nix b/python/pkgs/html-void-elements/default.nix index 05f668c2e..d29d9669c 100644 --- a/python/pkgs/html-void-elements/default.nix +++ b/python/pkgs/html-void-elements/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "html-void-elements"; version = "0.1.0"; pyproject = true; @@ -13,14 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Riverside-Healthcare"; repo = "html-void-elements"; - rev = version; + tag = finalAttrs.version; hash = "sha256-Q5OEczTdgCCyoOsKv3MKRE3w4t/qyPG4YKbF19jlC88="; }; nativeBuildInputs = [ poetry-core ]; # has no tests - doCheck = false; pythonImportsCheck = [ "HtmlVoidElements" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/Riverside-Healthcare/html-void-elements"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/html2image/default.nix b/python/pkgs/html2image/default.nix index f95b85e23..8737a8d77 100644 --- a/python/pkgs/html2image/default.nix +++ b/python/pkgs/html2image/default.nix @@ -7,7 +7,7 @@ websocket-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "html2image"; version = "2.0.7"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vgalin"; repo = "html2image"; - tag = version; + tag = finalAttrs.version; hash = "sha256-qGp6i4fNmduTZfdxNvYJTAQV/Ovm3XFNOJ8uSj6Ipic="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/vgalin/html2image"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/html2pdf4doc/default.nix b/python/pkgs/html2pdf4doc/default.nix index d404ab599..cda9a2400 100644 --- a/python/pkgs/html2pdf4doc/default.nix +++ b/python/pkgs/html2pdf4doc/default.nix @@ -10,7 +10,7 @@ webdriver-manager, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "html2pdf4doc"; version = "0.0.34"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mettta"; repo = "html2pdf4doc_python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ABOtpKO7a2MYsM4aBToxouY2JTGKh+vIPzdSMbn4v0s="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/mettta/html2pdf4doc_python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/html2text/default.nix b/python/pkgs/html2text/default.nix index 6ebea39b9..810f2c88a 100644 --- a/python/pkgs/html2text/default.nix +++ b/python/pkgs/html2text/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "html2text"; version = "2025.4.15"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lIpkX48Lw6vn/VhwGaIZehJDbNc9DUkIr5W/yNozdYg="; }; @@ -21,8 +21,6 @@ buildPythonPackage rec { setuptools-scm ]; - doCheck = false; - pythonImportsCheck = [ "html2text" ]; meta = { @@ -31,4 +29,4 @@ buildPythonPackage rec { mainProgram = "html2text"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/html5-parser/default.nix b/python/pkgs/html5-parser/default.nix index a5a044ac2..f9ea7bc83 100644 --- a/python/pkgs/html5-parser/default.nix +++ b/python/pkgs/html5-parser/default.nix @@ -4,29 +4,33 @@ buildPythonPackage, chardet, fetchFromGitHub, + # build-system + setuptools, lxml, pkg-config, pkgs, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "html5-parser"; version = "0.4.12"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "html5-parser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0Qn+To/d3+HMx+KhhgJBEHVYPOfIeBnngBraY7r4uSs="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pkgs.libxml2 ]; - propagatedBuildInputs = [ + dependencies = [ chardet lxml ]; @@ -45,4 +49,4 @@ buildPythonPackage rec { homepage = "https://html5-parser.readthedocs.io"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/html5tagger/default.nix b/python/pkgs/html5tagger/default.nix index e3792b198..b79a5dfba 100644 --- a/python/pkgs/html5tagger/default.nix +++ b/python/pkgs/html5tagger/default.nix @@ -8,13 +8,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "html5tagger"; version = "1.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hPo9+0nlyDt5u9hWq3sd6OIxHDu0aovpJfEZ44gKjak="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/sanic-org/html5tagger"; license = lib.licenses.unlicense; }; -} +}) diff --git a/python/pkgs/htmldate/default.nix b/python/pkgs/htmldate/default.nix index 3550e1db0..18509bbca 100644 --- a/python/pkgs/htmldate/default.nix +++ b/python/pkgs/htmldate/default.nix @@ -11,7 +11,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "htmldate"; version = "1.10.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adbar"; repo = "htmldate"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3qtksgzqcgWtUv81Aqeh0nTWYnH0PjPLG4NuYChbV0g="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "htmldate"; }; -} +}) diff --git a/python/pkgs/htmllistparse/default.nix b/python/pkgs/htmllistparse/default.nix index dc940cba3..0fae65876 100644 --- a/python/pkgs/htmllistparse/default.nix +++ b/python/pkgs/htmllistparse/default.nix @@ -9,18 +9,18 @@ fusepy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "htmllistparse"; version = "0.6.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bcimvwPIQ7nTJYQ6JqI1GnlbVzzZKiybgnFiEBnGQII="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 html5lib requests @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; # upstream has no tests - doCheck = false; pythonImportsCheck = [ "htmllistparse" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { mainProgram = "rehttpfs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/htmlmin/default.nix b/python/pkgs/htmlmin/default.nix index 32075594a..cb7bc3e4c 100644 --- a/python/pkgs/htmlmin/default.nix +++ b/python/pkgs/htmlmin/default.nix @@ -2,16 +2,17 @@ lib, buildPythonPackage, fetchPypi, + legacy-cgi, setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "htmlmin"; version = "0.1.12"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-UMHvRjA3Sl1yOQAJapYc/0Jt/0a0jzTRlKgbvhTsoXg="; }; @@ -19,6 +20,8 @@ buildPythonPackage rec { setuptools ]; + dependencies = [ legacy-cgi ]; + # pypi tarball does not contain tests meta = { @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/mankyd/htmlmin"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/htmltools/default.nix b/python/pkgs/htmltools/default.nix index bd9b99275..4f557ba34 100644 --- a/python/pkgs/htmltools/default.nix +++ b/python/pkgs/htmltools/default.nix @@ -9,7 +9,7 @@ syrupy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "htmltools"; version = "0.7.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "posit-dev"; repo = "py-htmltools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Cs/aft5mghyRnMCeLrCMXRs3c5SmAZ/xPG0s7NBf8Yc="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/posit-dev/py-htmltools"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/httmock/default.nix b/python/pkgs/httmock/default.nix index 5d88aa051..56f937ee7 100644 --- a/python/pkgs/httmock/default.nix +++ b/python/pkgs/httmock/default.nix @@ -6,13 +6,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httmock"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ROr0u1nMZM1vXYv4cAtGqjCXzFZRubyFxSffvHF5L0E="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "Mocking library for requests"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/http-ece/default.nix b/python/pkgs/http-ece/default.nix index 08a1f4ab2..dd299b311 100644 --- a/python/pkgs/http-ece/default.nix +++ b/python/pkgs/http-ece/default.nix @@ -7,7 +7,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "http-ece"; version = "1.2.1"; pyproject = true; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "web-push-libs"; repo = "encrypted-content-encoding"; - rev = version; + tag = finalAttrs.version; hash = "sha256-HjXJWoOvCVOdEto4Ss4HPUuf+uNcQkfvj/cxJGHOhQ8="; }; - sourceRoot = "${src.name}/python"; + sourceRoot = "${finalAttrs.src.name}/python"; build-system = [ setuptools ]; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/web-push-libs/encrypted-content-encoding"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/http-parser/default.nix b/python/pkgs/http-parser/default.nix index 3cbfa801a..dc9a49542 100644 --- a/python/pkgs/http-parser/default.nix +++ b/python/pkgs/http-parser/default.nix @@ -8,7 +8,7 @@ fetchpatch, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "http-parser"; version = "0.9.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "benoitc"; repo = "http-parser"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WHimvSaNcncwzLwwk5+ZNg7BbHF+hPr39SfidEDYfhU="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/benoitc/http-parser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/http-sf/default.nix b/python/pkgs/http-sf/default.nix index 393f01f1c..1cf9f0db5 100644 --- a/python/pkgs/http-sf/default.nix +++ b/python/pkgs/http-sf/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ typing-extensions ]; # Tests require external data (https://github.com/httpwg/structured-field-tests) - doCheck = false; pythonImportsCheck = [ "http_sf" ]; diff --git a/python/pkgs/http-sfv/default.nix b/python/pkgs/http-sfv/default.nix index f83b6b0dd..55283729f 100644 --- a/python/pkgs/http-sfv/default.nix +++ b/python/pkgs/http-sfv/default.nix @@ -6,7 +6,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "http-sfv"; version = "0.9.9"; pyproject = true; @@ -14,16 +14,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mnot"; repo = "http_sfv"; - rev = "http_sfv-${version}"; + tag = "http_sfv-${finalAttrs.version}"; hash = "sha256-xf9bGDfsEcQnFQ2b1bLRGYug+H4e5jeV/LJstQtp6Bw="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ typing-extensions ]; + dependencies = [ typing-extensions ]; # Tests require external data (https://github.com/httpwg/structured-field-tests) - doCheck = false; pythonImportsCheck = [ "http_sfv" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/mnot/http_sfv"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/httpagentparser/default.nix b/python/pkgs/httpagentparser/default.nix index b9dd4d280..c30862db1 100644 --- a/python/pkgs/httpagentparser/default.nix +++ b/python/pkgs/httpagentparser/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpagentparser"; version = "1.9.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-I7yvCTJbF692NCg8pk2iP0hcXYO5SB/22IQTp8W8bek="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/shon/httpagentparser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/httpauth/default.nix b/python/pkgs/httpauth/default.nix index 03ff253fa..208f752a2 100644 --- a/python/pkgs/httpauth/default.nix +++ b/python/pkgs/httpauth/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpauth"; version = "0.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-C6rnFroAd5vOULBMwsLSyeSK5zPXOEgGHDSYt+Pm2dQ="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/jonashaag/httpauth"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/httpbin/default.nix b/python/pkgs/httpbin/default.nix index 0c29ef454..022986672 100644 --- a/python/pkgs/httpbin/default.nix +++ b/python/pkgs/httpbin/default.nix @@ -22,13 +22,13 @@ # tests }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpbin"; version = "0.10.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-YCOlouj7jpGr3W000fH0VQkvl9VnwlYA4bSO4ReKpzg="; }; @@ -38,7 +38,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "greenlet" ]; - propagatedBuildInputs = [ + dependencies = [ brotlicffi decorator flask @@ -61,4 +61,4 @@ buildPythonPackage rec { homepage = "https://github.com/psf/httpbin"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/httpcore/default.nix b/python/pkgs/httpcore/default.nix index 3f50af6d4..d142824e8 100644 --- a/python/pkgs/httpcore/default.nix +++ b/python/pkgs/httpcore/default.nix @@ -12,7 +12,7 @@ trio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpcore"; version = "1.0.9"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; repo = "httpcore"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YtAbx0iXN7u8pMBXQBUydvAH6ilH+veklvxSh5EVFXo="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/encode/httpcore"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/httpcore2/default.nix b/python/pkgs/httpcore2/default.nix index a2ef2b47e..161de9938 100644 --- a/python/pkgs/httpcore2/default.nix +++ b/python/pkgs/httpcore2/default.nix @@ -65,7 +65,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "httpcore2" ]; - __structuredAttrs = true; meta = { description = "A next generation HTTP client for Python"; diff --git a/python/pkgs/httplib2shim/default.nix b/python/pkgs/httplib2shim/default.nix index 52be8e401..019a791db 100644 --- a/python/pkgs/httplib2shim/default.nix +++ b/python/pkgs/httplib2shim/default.nix @@ -15,8 +15,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.2"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "httplib2shim"; @@ -34,7 +32,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests require a network access - doCheck = false; pythonImportsCheck = [ "httplib2shim" ]; diff --git a/python/pkgs/httpretty/default.nix b/python/pkgs/httpretty/default.nix index 1a8d54fa6..71d8568f8 100644 --- a/python/pkgs/httpretty/default.nix +++ b/python/pkgs/httpretty/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpretty"; version = "1.1.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IN4OXdWhgpLTbZKMw9blL4sqxz2uxA1B62Le4VSTO2g="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "httpretty" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { description = "HTTP client request mocking tool"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/httpserver/default.nix b/python/pkgs/httpserver/default.nix index 713015476..de78f5530 100644 --- a/python/pkgs/httpserver/default.nix +++ b/python/pkgs/httpserver/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpserver"; version = "1.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-W8Pa+CUS8vCzEcymjY6no5GMdSDSZs4bhmDtRsR4wuA="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "httpserver"; }; -} +}) diff --git a/python/pkgs/httpsig/default.nix b/python/pkgs/httpsig/default.nix index 05091282a..3672a94c5 100644 --- a/python/pkgs/httpsig/default.nix +++ b/python/pkgs/httpsig/default.nix @@ -9,13 +9,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpsig"; version = "1.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cdbVAkYSnE98/sIPXlfjUdK4SS1jHMKqlnkUrPkfbOY="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/ahknight/httpsig"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/httptools/default.nix b/python/pkgs/httptools/default.nix index cf8ae3590..e3573db6a 100644 --- a/python/pkgs/httptools/default.nix +++ b/python/pkgs/httptools/default.nix @@ -2,20 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httptools"; version = "0.8.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ayoy8Y2X4W6Qgn16gZ/6jb2MwkX8Th+p0QlbVO9L2Zk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools>=80.9.0,<=82.0.1" "setuptools" + ''; + + build-system = [ setuptools ]; + # Tests are not included in pypi tarball - doCheck = false; pythonImportsCheck = [ "httptools" ]; @@ -24,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/MagicStack/httptools"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/httpx-aiohttp/default.nix b/python/pkgs/httpx-aiohttp/default.nix index c8b324c51..413e6b5f6 100644 --- a/python/pkgs/httpx-aiohttp/default.nix +++ b/python/pkgs/httpx-aiohttp/default.nix @@ -7,7 +7,7 @@ httpx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpx-aiohttp"; version = "0.2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "karpetrosyan"; repo = "httpx-aiohttp"; - tag = version; + tag = finalAttrs.version; hash = "sha256-STZyNPPeSaeINjylrT6FCdqnP41syBr2ZjZZ7LAUQ0c="; fetchSubmodules = true; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/karpetrosyan/httpx-aiohttp/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/httpx-auth/default.nix b/python/pkgs/httpx-auth/default.nix index 10a2e0d48..7b934ed01 100644 --- a/python/pkgs/httpx-auth/default.nix +++ b/python/pkgs/httpx-auth/default.nix @@ -11,7 +11,7 @@ time-machine, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpx-auth"; version = "0.23.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Colin-b"; repo = "httpx_auth"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wrPKUAGBzzuWNtwYtTtqOhb1xqYgc83uxn4rjbfDPmo="; }; @@ -28,11 +28,11 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ httpx ]; + dependencies = [ httpx ]; pythonImportsCheck = [ "httpx_auth" ]; meta = { description = "Authentication classes to be used with httpx"; homepage = "https://github.com/Colin-b/httpx_auth"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/httpx-ntlm/default.nix b/python/pkgs/httpx-ntlm/default.nix index 5069a968d..c4bf6f5ed 100644 --- a/python/pkgs/httpx-ntlm/default.nix +++ b/python/pkgs/httpx-ntlm/default.nix @@ -2,28 +2,31 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, httpx, pyspnego, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpx-ntlm"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "httpx_ntlm"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Qb6KK6hRQ0hOYX3LkX1LGeOuEq/caIYipJAQNJk7U+Q="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ httpx pyspnego ]; # https://github.com/ulodciv/httpx-ntlm/issues/5 - doCheck = false; pythonImportsCheck = [ "httpx_ntlm" ]; @@ -32,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/ulodciv/httpx-ntlm"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/httpx-oauth/default.nix b/python/pkgs/httpx-oauth/default.nix index 6476e8090..58bd4802f 100644 --- a/python/pkgs/httpx-oauth/default.nix +++ b/python/pkgs/httpx-oauth/default.nix @@ -13,7 +13,7 @@ respx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpx-oauth"; version = "0.17.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frankie567"; repo = "httpx-oauth"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-I6ffcbmnNjJUGuDctFQo5m1HE6N60wErSJUDcXL9TRw="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/frankie567/httpx-oauth"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/httpx-socks/default.nix b/python/pkgs/httpx-socks/default.nix index 141a4dab9..3e0050a1d 100644 --- a/python/pkgs/httpx-socks/default.nix +++ b/python/pkgs/httpx-socks/default.nix @@ -19,7 +19,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpx-socks"; version = "0.13.1"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "romis2012"; repo = "httpx-socks"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sz7A72nvwy8P0VvVYUT2ZTGXXOe5u1eme7PLC38SIz8="; }; @@ -71,4 +71,4 @@ buildPythonPackage rec { homepage = "https://github.com/romis2012/httpx-socks"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/httpx-sse/default.nix b/python/pkgs/httpx-sse/default.nix index a1d09ef92..e8efbe5ca 100644 --- a/python/pkgs/httpx-sse/default.nix +++ b/python/pkgs/httpx-sse/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpx-sse"; version = "0.4.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "florimondmanca"; repo = "httpx-sse"; - tag = version; + tag = finalAttrs.version; hash = "sha256-6DPbfJlbLmws9GkQ2zePGp4g0at4M32vrIDtmUPDkX4="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/florimondmanca/httpx-sse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/httpx-ws/default.nix b/python/pkgs/httpx-ws/default.nix index 27797c9b3..174173363 100644 --- a/python/pkgs/httpx-ws/default.nix +++ b/python/pkgs/httpx-ws/default.nix @@ -13,7 +13,7 @@ wsproto, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpx-ws"; version = "0.9.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frankie567"; repo = "httpx-ws"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-e6D3sU6eWjsZnURIv1WfkSr54AMdDP9kHd263awzNsI="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/frankie567/httpx-ws"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/httpx/default.nix b/python/pkgs/httpx/default.nix index a85f8c250..95e9bb9a7 100644 --- a/python/pkgs/httpx/default.nix +++ b/python/pkgs/httpx/default.nix @@ -22,7 +22,7 @@ zstandard, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httpx"; version = "0.28.1"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; repo = "httpx"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tB8uZm0kPRnmeOvsDdrkrHcMVIYfGanB4l/xHsTKpgE="; }; @@ -71,4 +71,4 @@ buildPythonPackage rec { homepage = "https://github.com/encode/httpx"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/httpx2/default.nix b/python/pkgs/httpx2/default.nix index e2f36ca2b..264e6fdb6 100644 --- a/python/pkgs/httpx2/default.nix +++ b/python/pkgs/httpx2/default.nix @@ -82,7 +82,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "httpx2" ]; - __structuredAttrs = true; meta = { description = "A next generation HTTP client for Python"; diff --git a/python/pkgs/huawei-lte-api/default.nix b/python/pkgs/huawei-lte-api/default.nix index 537bbbec8..40bdfbaf7 100644 --- a/python/pkgs/huawei-lte-api/default.nix +++ b/python/pkgs/huawei-lte-api/default.nix @@ -9,7 +9,7 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "huawei-lte-api"; version = "2.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Salamek"; repo = "huawei-lte-api"; - tag = version; + tag = finalAttrs.version; hash = "sha256-3EqxZhoMilNa/ffKnER0XabGKMJAzlgipiKLlUN3kFU="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/Salamek/huawei-lte-api"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/huepy/default.nix b/python/pkgs/huepy/default.nix index 3b6154795..45aeb98bb 100644 --- a/python/pkgs/huepy/default.nix +++ b/python/pkgs/huepy/default.nix @@ -5,14 +5,14 @@ buildPythonPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "huepy"; version = "1.2.1"; pyproject = true; src = fetchPypi { pname = "huepy"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Wym+73lzEvt2BhiLxc2Y94q49+AVdkJ6kxLxybILdZ0="; }; @@ -21,7 +21,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "huepy" ]; # no test - doCheck = false; meta = { description = "Print awesomely in terminals"; @@ -29,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/humanfriendly/default.nix b/python/pkgs/humanfriendly/default.nix index db35bf94a..36319fdd4 100644 --- a/python/pkgs/humanfriendly/default.nix +++ b/python/pkgs/humanfriendly/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "humanfriendly"; version = "10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc"; }; @@ -25,12 +25,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; - doCheck = false; - meta = { description = "Human friendly output for text interfaces using Python"; mainProgram = "humanfriendly"; homepage = "https://humanfriendly.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/humanize/default.nix b/python/pkgs/humanize/default.nix index 6026f4a73..dbf4d2cc4 100644 --- a/python/pkgs/humanize/default.nix +++ b/python/pkgs/humanize/default.nix @@ -8,7 +8,7 @@ gettext, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "humanize"; version = "4.16.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-humanize"; repo = "humanize"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Ht4lK+Qd6pU4i6MUycaT3j69ldkTRtQ21QzKuLGgrLY="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-humanize/humanize"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hupper/default.nix b/python/pkgs/hupper/default.nix index a2a2ed658..b54a7bb25 100644 --- a/python/pkgs/hupper/default.nix +++ b/python/pkgs/hupper/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hupper"; version = "1.12.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Br9UFw/07PTIStXxiN7jkBFzq0ScJgitBbm/1rE+Mus="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/Pylons/hupper"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hvac/default.nix b/python/pkgs/hvac/default.nix index b157e2797..09f6a484b 100644 --- a/python/pkgs/hvac/default.nix +++ b/python/pkgs/hvac/default.nix @@ -6,13 +6,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hvac"; version = "2.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4AVq2QZOeSPodOZ2kBWwMlgLY54pJG9asQRPeVnBx+A="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/ianunruh/hvac"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/hvplot/default.nix b/python/pkgs/hvplot/default.nix index 0ca9b9aac..52a3b2226 100644 --- a/python/pkgs/hvplot/default.nix +++ b/python/pkgs/hvplot/default.nix @@ -25,7 +25,7 @@ plotly, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hvplot"; version = "0.12.2"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "holoviz"; repo = "hvplot"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hJ9lgpM3AVyDeFxobUKDNYO39NKEejSDywOgnHPEm2c="; }; @@ -96,4 +96,4 @@ buildPythonPackage rec { homepage = "https://hvplot.pyviz.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/hwdata/default.nix b/python/pkgs/hwdata/default.nix index d04e8a466..413bd7b0c 100644 --- a/python/pkgs/hwdata/default.nix +++ b/python/pkgs/hwdata/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hwdata"; version = "2.4.3-1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "xsuchy"; repo = "python-hwdata"; - tag = "python-hwdata-${version}"; + tag = "python-hwdata-${finalAttrs.version}"; hash = "sha256-5bcdyCGv1sM8HThoSsvJe68LprDq0kI801F/aTH5FVs="; }; @@ -26,11 +26,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "hwdata" ]; - doCheck = false; # no tests - meta = { description = "Python bindings to hwdata"; homepage = "https://github.com/xsuchy/python-hwdata"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/hydra-core/default.nix b/python/pkgs/hydra-core/default.nix index ecbfda2a8..45a268aa2 100644 --- a/python/pkgs/hydra-core/default.nix +++ b/python/pkgs/hydra-core/default.nix @@ -27,7 +27,6 @@ buildPythonPackage (finalAttrs: { pname = "hydra-core"; version = "1.3.6"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "facebookresearch"; diff --git a/python/pkgs/hydrawiser/default.nix b/python/pkgs/hydrawiser/default.nix index cc6d4d2a6..db16415cc 100644 --- a/python/pkgs/hydrawiser/default.nix +++ b/python/pkgs/hydrawiser/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytest-asyncio, pytest-cov-stub, pytestCheckHook, @@ -9,19 +11,21 @@ requests-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hydrawiser"; version = "0.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ptcryan"; repo = "hydrawiser"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "161hazlpvd71xcl2ja86560wm5lnrjv210ki3ji37l6c6gwmhjdj"; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ pytest-asyncio @@ -38,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/ptcryan/hydrawiser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hydrogram/default.nix b/python/pkgs/hydrogram/default.nix index c7d74ec0a..b18938f93 100644 --- a/python/pkgs/hydrogram/default.nix +++ b/python/pkgs/hydrogram/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hydrogram"; version = "0.2.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hydrogram"; repo = "hydrogram"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QpweUDCypTxOOWL08gCUuMgbuE4130iNyxRpUNuSBac="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/hydrogram/hydrogram"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/hydrus-api/default.nix b/python/pkgs/hydrus-api/default.nix index 0626bfbaf..c266b6f53 100644 --- a/python/pkgs/hydrus-api/default.nix +++ b/python/pkgs/hydrus-api/default.nix @@ -6,14 +6,14 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hydrus-api"; version = "5.3.0"; pyproject = true; src = fetchPypi { pname = "hydrus_api"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Xq27pMVj2JkcHLvFzVDKL9KNOjTxZ3yH5+RVcVMzKJc="; }; @@ -24,11 +24,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "hydrus_api" ]; # There are no unit tests - doCheck = false; meta = { description = "Python module implementing the Hydrus API"; homepage = "https://gitlab.com/cryzed/hydrus-api"; license = lib.licenses.agpl3Plus; }; -} +}) diff --git a/python/pkgs/hypercorn/default.nix b/python/pkgs/hypercorn/default.nix index d44610040..57a2d31be 100644 --- a/python/pkgs/hypercorn/default.nix +++ b/python/pkgs/hypercorn/default.nix @@ -15,7 +15,7 @@ pytest-trio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hypercorn"; version = "0.18.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pgjones"; repo = "Hypercorn"; - tag = version; + tag = finalAttrs.version; hash = "sha256-RNurpDq5Z3N9Wv9Hq/l6A3yKUriCCKx9BrbrWGwBsUk="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { mainProgram = "hypercorn"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hyperframe/default.nix b/python/pkgs/hyperframe/default.nix index d06ae569d..d37a74d75 100644 --- a/python/pkgs/hyperframe/default.nix +++ b/python/pkgs/hyperframe/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hyperframe"; version = "6.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-9jCQigCFSnreq9Y4K0OSOkxM1Lgh/LUn5queFTgqOwg="; }; @@ -23,4 +23,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-hyper/hyperframe/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hyperlink/default.nix b/python/pkgs/hyperlink/default.nix index 77a4f821a..479e8dcc1 100644 --- a/python/pkgs/hyperlink/default.nix +++ b/python/pkgs/hyperlink/default.nix @@ -6,13 +6,13 @@ idna, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hyperlink"; version = "21.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Qnr5V9qli8kJRxxsQPdMVFD6Ej3Qk/xT79LpHScFpWs="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { dependencies = [ idna ]; - doCheck = false; - pythonImportsCheck = [ "hyperlink" ]; meta = { @@ -29,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-hyper/hyperlink"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hyperopt/default.nix b/python/pkgs/hyperopt/default.nix index 88884c50c..9b0d32ded 100644 --- a/python/pkgs/hyperopt/default.nix +++ b/python/pkgs/hyperopt/default.nix @@ -11,13 +11,13 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hyperopt"; version = "0.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-15p3Ui/v7BOiWLl6DMvfQIMrMnDeTbCCeLsHubk065o="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/hyperpyyaml/default.nix b/python/pkgs/hyperpyyaml/default.nix index bedcc89d9..9fb60d6f9 100644 --- a/python/pkgs/hyperpyyaml/default.nix +++ b/python/pkgs/hyperpyyaml/default.nix @@ -14,7 +14,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hyperpyyaml"; version = "1.2.3"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "speechbrain"; repo = "hyperpyyaml"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/7OrIR61zQYl2+RjiOOlaqUGWBieon5fe8sgmEvKowo="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/speechbrain/HyperPyYAML"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/hypothesis-auto/default.nix b/python/pkgs/hypothesis-auto/default.nix index 4c9004976..fb26eb3f5 100644 --- a/python/pkgs/hypothesis-auto/default.nix +++ b/python/pkgs/hypothesis-auto/default.nix @@ -9,14 +9,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hypothesis-auto"; version = "1.1.5"; pyproject = true; src = fetchPypi { pname = "hypothesis_auto"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-U0vcOB9jXmUV5v2IwybVu2arY1FpPnKkP7m2kbD1kRw="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/timothycrosley/hypothesis-auto/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/hypothesis-jsonschema/default.nix b/python/pkgs/hypothesis-jsonschema/default.nix index 48b63bbca..2577e368f 100644 --- a/python/pkgs/hypothesis-jsonschema/default.nix +++ b/python/pkgs/hypothesis-jsonschema/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "0.23.1"; pyproject = true; - __structuredAttrs = true; - # no git tags src = fetchPypi { inherit (finalAttrs) pname version; @@ -30,7 +28,6 @@ buildPythonPackage (finalAttrs: { jsonschema ]; - doCheck = false; # sdist does not include everything to run the tests pythonImportsCheck = [ "hypothesis_jsonschema" ]; diff --git a/python/pkgs/hypothesis/default.nix b/python/pkgs/hypothesis/default.nix index cee859b03..d0c6a76bd 100644 --- a/python/pkgs/hypothesis/default.nix +++ b/python/pkgs/hypothesis/default.nix @@ -15,8 +15,6 @@ buildPythonPackage (finalAttrs: { version = "6.156.1"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis"; diff --git a/python/pkgs/hypothesis/hypothesis_6_136.nix b/python/pkgs/hypothesis/hypothesis_6_136.nix index ae03396e1..a32ad68e1 100644 --- a/python/pkgs/hypothesis/hypothesis_6_136.nix +++ b/python/pkgs/hypothesis/hypothesis_6_136.nix @@ -16,7 +16,7 @@ tzdata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hypothesis"; version = "6.136.9"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis"; - tag = "hypothesis-python-${version}"; + tag = "hypothesis-python-${finalAttrs.version}"; hash = "sha256-Q1wxIJwAYKZ0x6c85CJSGgcdKw9a3xFw8YpJROElSNU="; }; @@ -145,4 +145,4 @@ buildPythonPackage rec { }"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/hypothesmith/default.nix b/python/pkgs/hypothesmith/default.nix index 5317f6fb5..d5d276abf 100644 --- a/python/pkgs/hypothesmith/default.nix +++ b/python/pkgs/hypothesmith/default.nix @@ -8,13 +8,13 @@ libcst, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hypothesmith"; version = "0.3.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lsFIAtbI6F2JdSZBdoeNtUso0u2SH9v+3C5rjOPIFxY="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/Zac-HD/hypothesmith"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/hyppo/default.nix b/python/pkgs/hyppo/default.nix index b519d2963..136b7efed 100644 --- a/python/pkgs/hyppo/default.nix +++ b/python/pkgs/hyppo/default.nix @@ -24,7 +24,7 @@ seaborn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hyppo"; version = "0.5.2"; pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "neurodata"; repo = "hyppo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7Y+UhneIGwqjsPCnGAQWF/l4r1gFbYs3fdHhV46ZBjA="; }; @@ -71,4 +71,4 @@ buildPythonPackage rec { description = "Python package for multivariate hypothesis testing"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/i3-py/default.nix b/python/pkgs/i3-py/default.nix index a31c11a2e..5ae0d0613 100644 --- a/python/pkgs/i3-py/default.nix +++ b/python/pkgs/i3-py/default.nix @@ -18,7 +18,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # no tests in tarball - doCheck = false; meta = { description = "Tools for i3 users and developers"; diff --git a/python/pkgs/i3ipc/default.nix b/python/pkgs/i3ipc/default.nix index ce2be449d..88d1a9498 100644 --- a/python/pkgs/i3ipc/default.nix +++ b/python/pkgs/i3ipc/default.nix @@ -6,13 +6,13 @@ python-xlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "i3ipc"; version = "2.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6IDX1xR5WerVyzR2Twi5e0E4WzbrglborxzhY9vMzOg="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { dependencies = [ python-xlib ]; - doCheck = false; - pythonImportsCheck = [ "i3ipc" ]; meta = { @@ -29,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/altdesktop/i3ipc-python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/iammeter/default.nix b/python/pkgs/iammeter/default.nix index 7d243d741..1005b37e8 100644 --- a/python/pkgs/iammeter/default.nix +++ b/python/pkgs/iammeter/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iammeter"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Q0o392Xf3cY5BkX4ic6pE3XKMSgek5cpW4TMqSh+Ew8="; }; + build-system = [ setuptools ]; + # Module has no tests - doCheck = false; pythonImportsCheck = [ "iammeter" ]; @@ -24,4 +27,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/iammeter/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/iapws/default.nix b/python/pkgs/iapws/default.nix index 43ecc257b..9340481ab 100644 --- a/python/pkgs/iapws/default.nix +++ b/python/pkgs/iapws/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iapws"; version = "1.5.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yG4eFxVRh3/pzrA+5BXkpJBtLlJpj/nVZWeEYJc5300="; }; - propagatedBuildInputs = [ scipy ]; + build-system = [ setuptools ]; + + dependencies = [ scipy ]; meta = { description = "Python implementation of standard from IAPWS"; homepage = "https://github.com/jjgomera/iapws"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/ibind/default.nix b/python/pkgs/ibind/default.nix index 8c8ad8035..04dec08c6 100644 --- a/python/pkgs/ibind/default.nix +++ b/python/pkgs/ibind/default.nix @@ -24,7 +24,6 @@ buildPythonPackage (finalAttrs: { pyproject = true; strictDeps = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "Voyz"; diff --git a/python/pkgs/ibis/default.nix b/python/pkgs/ibis/default.nix index 71c028670..670893363 100644 --- a/python/pkgs/ibis/default.nix +++ b/python/pkgs/ibis/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ibis"; version = "3.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "dmulholl"; repo = "ibis"; - rev = version; + tag = finalAttrs.version; hash = "sha256-9ELOAQhD6KXyTN2U0lGmNxxSzx9o2QIt+CNa6i8o5xs="; }; + build-system = [ setuptools ]; + checkPhase = '' ${python.interpreter} test_ibis.py ''; @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/dmulholland/ibis"; license = lib.licenses.publicDomain; }; -} +}) diff --git a/python/pkgs/ibm-cloud-sdk-core/default.nix b/python/pkgs/ibm-cloud-sdk-core/default.nix index 533bfd527..9522829d8 100644 --- a/python/pkgs/ibm-cloud-sdk-core/default.nix +++ b/python/pkgs/ibm-cloud-sdk-core/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ibm-cloud-sdk-core"; version = "3.26.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "IBM"; repo = "python-sdk-core"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8gZrjPlvYY3KCDVDqjQUdGpgGo/XrxHS0Z7PMmHdh5g="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/IBM/python-sdk-core"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ibm-watson/default.nix b/python/pkgs/ibm-watson/default.nix index 489d1db1b..ea6f6cafa 100644 --- a/python/pkgs/ibm-watson/default.nix +++ b/python/pkgs/ibm-watson/default.nix @@ -13,7 +13,7 @@ websocket-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ibm-watson"; version = "11.2.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-z+sGfYbPZcHQh6JGdVC2DDFHd0VIgC2GmvGvN+hrXU0="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/watson-developer-cloud/python-sdk"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/icalendar-searcher/default.nix b/python/pkgs/icalendar-searcher/default.nix index 40d03715b..68bf56f97 100644 --- a/python/pkgs/icalendar-searcher/default.nix +++ b/python/pkgs/icalendar-searcher/default.nix @@ -9,7 +9,7 @@ recurring-ical-events, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "icalendar-searcher"; version = "1.0.6"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-caldav"; repo = "icalendar-searcher"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HkiKy38B5+i6Lb+0Teu/YqvrE1gqy/x3u1GRUWAHNes="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-caldav/icalendar-searcher"; license = lib.licenses.agpl3Only; }; -} +}) diff --git a/python/pkgs/icalendar/default.nix b/python/pkgs/icalendar/default.nix index 546fdd4d9..aee62d016 100644 --- a/python/pkgs/icalendar/default.nix +++ b/python/pkgs/icalendar/default.nix @@ -8,13 +8,13 @@ tzdata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "icalendar"; version = "7.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-e9AByOZIIF4b3lxqW3cJZZjo0Ik9z1d1XGxZdjViATI="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { description = "Parser/generator of iCalendar files"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/icalevents/default.nix b/python/pkgs/icalevents/default.nix index cc555c853..4931747f7 100644 --- a/python/pkgs/icalevents/default.nix +++ b/python/pkgs/icalevents/default.nix @@ -11,7 +11,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "icalevents"; version = "0.3.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "icalevents"; - tag = version; + tag = finalAttrs.version; hash = "sha256-QDqmcZY/UANVKRjk1ZFEFHgrjtD+hXE4qd3tX64sE7c="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/icalevents"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/icdiff/default.nix b/python/pkgs/icdiff/default.nix index 374249055..c9ce673f8 100644 --- a/python/pkgs/icdiff/default.nix +++ b/python/pkgs/icdiff/default.nix @@ -12,7 +12,7 @@ let inherit (pkgs) bash git less; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "icdiff"; version = "2.0.10"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jeffkaufman"; repo = "icdiff"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-7/EvuHNWE9kdb35TFuqT8ShjyciodsRNkBMG0WvTy1c="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/jeffkaufman/icdiff"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/icecream/default.nix b/python/pkgs/icecream/default.nix index 5d213c0c4..cb398cf05 100644 --- a/python/pkgs/icecream/default.nix +++ b/python/pkgs/icecream/default.nix @@ -13,13 +13,13 @@ pygments, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "icecream"; version = "2.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nX8kQYfwChP0rHfRdpkOGH6cJ51srE91SOM4KRrZc0M="; }; @@ -32,8 +32,6 @@ buildPythonPackage rec { pygments ]; - doCheck = false; - pythonImportsCheck = [ "icecream" ]; meta = { @@ -41,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/gruns/icecream"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/iceportal/default.nix b/python/pkgs/iceportal/default.nix index 241e872ef..ffcfe5a08 100644 --- a/python/pkgs/iceportal/default.nix +++ b/python/pkgs/iceportal/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iceportal"; version = "1.2.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-iceportal"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kpAUgGi2fAHzQYuZAaQW9wdrYjwbduRsoTwSuzcjJa8="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-ecosystem/python-iceportal"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/icmplib/default.nix b/python/pkgs/icmplib/default.nix index c3f1b4014..6336ae9e4 100644 --- a/python/pkgs/icmplib/default.nix +++ b/python/pkgs/icmplib/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "icmplib"; version = "3.0.4"; pyproject = true; @@ -13,14 +13,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ValentinBELYN"; repo = "icmplib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PnBcGiUvftz/KYg9Qd2GaIcF3OW4lYH301uI5/M5CBI="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "icmplib" ]; meta = { @@ -28,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/ValentinBELYN/icmplib"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/icnsutil/default.nix b/python/pkgs/icnsutil/default.nix index 41e7e76da..f41640c3a 100644 --- a/python/pkgs/icnsutil/default.nix +++ b/python/pkgs/icnsutil/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, python, pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "icnsutil"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "relikd"; repo = "icnsutil"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tiq8h6s2noWLBIOIWcj8jfSqJFN01ee2uoHN4aFwn7s="; }; + build-system = [ setuptools ]; + dependencies = [ pillow ]; checkPhase = '' @@ -32,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/relikd/icnsutil"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/icontract/default.nix b/python/pkgs/icontract/default.nix index 9a005272e..d50501d30 100644 --- a/python/pkgs/icontract/default.nix +++ b/python/pkgs/icontract/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "icontract"; version = "2.7.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Parquery"; repo = "icontract"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UYBskomnu53A9VCY7y7zAOQm40Y+INOqPK6IqZsk6h0="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Parquery/icontract"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/id/default.nix b/python/pkgs/id/default.nix index 7f9515e4f..5780e0bea 100644 --- a/python/pkgs/id/default.nix +++ b/python/pkgs/id/default.nix @@ -6,13 +6,13 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "id"; version = "1.6.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0HMtYk+0b9TnvE5RUvACFEUJU7nncsGCwcIpZN7xoGk="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/di/id"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ida-netnode/default.nix b/python/pkgs/ida-netnode/default.nix index ac4858cd3..26bc0075d 100644 --- a/python/pkgs/ida-netnode/default.nix +++ b/python/pkgs/ida-netnode/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "3.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "williballenthin"; repo = "ida-netnode"; @@ -26,7 +24,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ six ]; # Module has no test and requires IDA to be installed - doCheck = false; # pythonImportsCheck = [ "netnode"]; diff --git a/python/pkgs/idapro/default.nix b/python/pkgs/idapro/default.nix index 440cd88b2..0b5a8f70a 100644 --- a/python/pkgs/idapro/default.nix +++ b/python/pkgs/idapro/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.10"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-QXwDxGBdGEF+Rw9qdI45eznW1YKevTu97dkv9bkJLRE="; @@ -24,7 +22,6 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ writableTmpDirAsHomeHook ]; # Module has no tests - doCheck = false; # Requires IDE to be installed # pythonImportsCheck = [ "idapro" ]; diff --git a/python/pkgs/idbutils/default.nix b/python/pkgs/idbutils/default.nix index b697b6360..01ea759c6 100644 --- a/python/pkgs/idbutils/default.nix +++ b/python/pkgs/idbutils/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "idbutils"; version = "1.0.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tcgoetz"; repo = "utilities"; - tag = version; + tag = finalAttrs.version; hash = "sha256-niscY7sURrJ7YcPKbI6ByU03po6Hfxm0gHbvmDa6TgM="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Only; homepage = "https://github.com/tcgoetz/utilities"; }; -} +}) diff --git a/python/pkgs/ifaddr/default.nix b/python/pkgs/ifaddr/default.nix index 116498a67..8a63822e8 100644 --- a/python/pkgs/ifaddr/default.nix +++ b/python/pkgs/ifaddr/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ifaddr"; version = "0.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zAy/yqv3ZdRFlYJfuWqZuxLHlxa3O0QzDqOO4rDErtQ="; }; nativeBuildInputs = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "ifaddr" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { description = "Enumerates all IP addresses on all network adapters of the system"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/iglo/default.nix b/python/pkgs/iglo/default.nix index 5da662386..cf7e2f8eb 100644 --- a/python/pkgs/iglo/default.nix +++ b/python/pkgs/iglo/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iglo"; version = "1.2.7"; pyproject = true; @@ -13,16 +13,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jesserockz"; repo = "python-iglo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-torDjfQcQ+ytv/Qab7PNugt1eLQJ0pPPz6p4f4kcFws="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; build-system = [ setuptools ]; # Package has no tests - doCheck = false; pythonImportsCheck = [ "iglo" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/jesserockz/python-iglo"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/igloohome-api/default.nix b/python/pkgs/igloohome-api/default.nix index 60c3b98f3..22231a089 100644 --- a/python/pkgs/igloohome-api/default.nix +++ b/python/pkgs/igloohome-api/default.nix @@ -31,7 +31,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "igloohome_api" ]; # upstream has no tests - doCheck = false; meta = { description = "Python package for using igloohome's API"; diff --git a/python/pkgs/ignorant/default.nix b/python/pkgs/ignorant/default.nix index 0f3ceb6bd..7d5ccec80 100644 --- a/python/pkgs/ignorant/default.nix +++ b/python/pkgs/ignorant/default.nix @@ -10,13 +10,13 @@ trio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ignorant"; version = "1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SLjED08uI+RjX+E0WHTQceReTEaY9WLPhXR3n0fP080="; }; @@ -38,7 +38,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "ignorant" ]; @@ -47,4 +46,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/ignorant/"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/igraph/default.nix b/python/pkgs/igraph/default.nix index 256db739e..f41ee4e47 100644 --- a/python/pkgs/igraph/default.nix +++ b/python/pkgs/igraph/default.nix @@ -15,7 +15,7 @@ let igraph-c = pkgs.igraph; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "igraph"; version = "1.0.0"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "igraph"; repo = "python-igraph"; - tag = version; + tag = finalAttrs.version; postFetch = '' # export-subst prevents reproducability rm $out/.git_archival.json @@ -66,4 +66,4 @@ buildPythonPackage rec { homepage = "https://igraph.org/python/"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/ihcsdk/default.nix b/python/pkgs/ihcsdk/default.nix index 8e291f7db..8ea2af0c2 100644 --- a/python/pkgs/ihcsdk/default.nix +++ b/python/pkgs/ihcsdk/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ihcsdk"; version = "2.8.12"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dingusdk"; repo = "PythonIhcSdk"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-k1WKfW/qweRdcaczqf47iNlqeOe7ULa57kqsTF4W2Zs="; }; @@ -29,11 +29,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "ihcsdk" ]; # upstream has no tests - doCheck = false; meta = { description = "SDK for connection to the LK IHC Controller"; homepage = "https://github.com/dingusdk/PythonIhcSdk"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/iisignature/default.nix b/python/pkgs/iisignature/default.nix index 897a3ced3..72fa8d819 100644 --- a/python/pkgs/iisignature/default.nix +++ b/python/pkgs/iisignature/default.nix @@ -7,13 +7,13 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iisignature"; version = "0.24"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-C5MUxui4BIf68yMZH7NZhq1CJuhrDGfPCjspObaVucY="; }; @@ -22,10 +22,9 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; # PyPI tarball has no tests - doCheck = false; pythonImportsCheck = [ "iisignature" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/iisignature"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ijson/default.nix b/python/pkgs/ijson/default.nix index a9ed54cb7..f7bad7ba2 100644 --- a/python/pkgs/ijson/default.nix +++ b/python/pkgs/ijson/default.nix @@ -7,13 +7,13 @@ yajl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ijson"; version = "3.5.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-r0C9GoX1XbC4swcVyFh2Ewa9ktVZAUhjb3XDMJ5udr0="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/ICRAR/ijson"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/image-diff/default.nix b/python/pkgs/image-diff/default.nix index 16be5c686..780f0b617 100644 --- a/python/pkgs/image-diff/default.nix +++ b/python/pkgs/image-diff/default.nix @@ -2,25 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pillow, click, click-default-group, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "image-diff"; version = "0.2.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "image-diff"; - rev = version; + tag = finalAttrs.version; hash = "sha256-AQykJNvBgVjmPVTwJOX17eKWelqvZZieq/giid8GYAY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pillow click click-default-group @@ -36,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/simonw/image-diff"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/image/default.nix b/python/pkgs/image/default.nix index 643e0c7d4..f0846c991 100644 --- a/python/pkgs/image/default.nix +++ b/python/pkgs/image/default.nix @@ -12,11 +12,11 @@ let pname = "image"; version = "1.5.33"; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { inherit pname version; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uqLgkXgnfapQ8i/W0dUex48ZwSaIkhy5q1gIdD8JcSY="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/francescortiz/image"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/imagecodecs-lite/default.nix b/python/pkgs/imagecodecs-lite/default.nix index 8b9c9bb6a..4f066cc3e 100644 --- a/python/pkgs/imagecodecs-lite/default.nix +++ b/python/pkgs/imagecodecs-lite/default.nix @@ -1,27 +1,31 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, pytest, numpy, cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imagecodecs-lite"; version = "2019.12.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0s4xb17qd7vimc46rafbjnibj4sf0lnv8cwl22k1h6zb7jhqmlcm"; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ cython ]; nativeCheckInputs = [ pytest ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; checkPhase = '' pytest @@ -32,4 +36,4 @@ buildPythonPackage rec { homepage = "https://www.lfd.uci.edu/~gohlke/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/imagecorruptions/default.nix b/python/pkgs/imagecorruptions/default.nix index 8d6f555e8..321a34dab 100644 --- a/python/pkgs/imagecorruptions/default.nix +++ b/python/pkgs/imagecorruptions/default.nix @@ -8,13 +8,13 @@ opencv-python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imagecorruptions"; version = "1.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "044e173f24d5934899bdbf3596bfbec917e8083e507eed583ab217abebbe084d"; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { opencv-python ]; - doCheck = false; pythonImportsCheck = [ "imagecorruptions" ]; meta = { @@ -34,4 +33,4 @@ buildPythonPackage rec { description = "This package provides a set of image corruptions"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/imagehash/default.nix b/python/pkgs/imagehash/default.nix index 52885f6a5..17f6ebd4d 100644 --- a/python/pkgs/imagehash/default.nix +++ b/python/pkgs/imagehash/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imagehash"; version = "4.3.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JohannesBuchner"; repo = "imagehash"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/kYINT26ROlB3fIcyyR79nHKg9FsJRQsXQx0Bvl14ec="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; mainProgram = "find_similar_images.py"; }; -} +}) diff --git a/python/pkgs/imageio-ffmpeg/default.nix b/python/pkgs/imageio-ffmpeg/default.nix index 7bf0d3e06..04ae6cfd0 100644 --- a/python/pkgs/imageio-ffmpeg/default.nix +++ b/python/pkgs/imageio-ffmpeg/default.nix @@ -13,7 +13,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imageio-ffmpeg"; version = "0.6.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "imageio"; repo = "imageio-ffmpeg"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Yy2PTNBGPP/BAR7CZck/9qr2g/s4ntiuydqXz77hR7E="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/imageio/imageio-ffmpeg"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/imageio/default.nix b/python/pkgs/imageio/default.nix index 8f37b3ed7..fd07e0a47 100644 --- a/python/pkgs/imageio/default.nix +++ b/python/pkgs/imageio/default.nix @@ -11,7 +11,7 @@ pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imageio"; version = "2.37.4"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "imageio"; repo = "imageio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7UiKj/PH3eVa8Qa8zz5FJ2RmFHcL19THwSLY51tdy2I="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://imageio.readthedocs.io"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/imagesize/default.nix b/python/pkgs/imagesize/default.nix index 7d6363cc5..e2b9cb28a 100644 --- a/python/pkgs/imagesize/default.nix +++ b/python/pkgs/imagesize/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imagesize"; version = "2.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-srpqTepIen681TJI00dqykSdMNsSot3l4MXKliT9d+U="; }; @@ -22,4 +22,4 @@ buildPythonPackage rec { homepage = "https://github.com/shibukawa/imagesize_py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/imap-tools/default.nix b/python/pkgs/imap-tools/default.nix index 4f9e9e75a..6f11f1775 100644 --- a/python/pkgs/imap-tools/default.nix +++ b/python/pkgs/imap-tools/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imap-tools"; version = "1.15.0"; pyproject = true; @@ -13,14 +13,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AnAplrYjqy9K/GagiDgmExnOL9poEQ7Ksjyv8QdATIE="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "imap_tools" ]; meta = { @@ -28,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/ikvk/imap_tools"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/imapclient/default.nix b/python/pkgs/imapclient/default.nix index 1a4a8f20d..259f31778 100644 --- a/python/pkgs/imapclient/default.nix +++ b/python/pkgs/imapclient/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, six, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imapclient"; version = "3.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mjs"; repo = "imapclient"; - tag = version; + tag = finalAttrs.version; hash = "sha256-J+pB+jXAoZItvaR8o+97sETFYxWj+uslmvsAe/Q0Gzc="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -36,4 +40,4 @@ buildPythonPackage rec { description = "Easy-to-use, Pythonic and complete IMAP client library"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/imaplib2/default.nix b/python/pkgs/imaplib2/default.nix index 9c4144711..1b433b3e8 100644 --- a/python/pkgs/imaplib2/default.nix +++ b/python/pkgs/imaplib2/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imaplib2"; version = "3.6"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "imaplib2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-daQDQZelKzWN/1zdcnKue2vj12BIlknSWIu4bfuIWpE="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/imaplib2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/imbalanced-learn/default.nix b/python/pkgs/imbalanced-learn/default.nix index fad88b97d..af671d920 100644 --- a/python/pkgs/imbalanced-learn/default.nix +++ b/python/pkgs/imbalanced-learn/default.nix @@ -12,7 +12,7 @@ sklearn-compat, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imbalanced-learn"; version = "0.14.2"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-learn-contrib"; repo = "imbalanced-learn"; - tag = version; + tag = finalAttrs.version; hash = "sha256-uWln6+r9QsGnH4I4JQm2/y80zTQkAflVPlIN9KQNzy0="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/imeon-inverter-api/default.nix b/python/pkgs/imeon-inverter-api/default.nix index 04f34c75d..87cb48140 100644 --- a/python/pkgs/imeon-inverter-api/default.nix +++ b/python/pkgs/imeon-inverter-api/default.nix @@ -6,7 +6,7 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imeon-inverter-api"; version = "0.4.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Imeon-Inverters-for-Home-Assistant"; repo = "inverter-api"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8W14q9Q+DcAHI1EiAmkodX6FfMYlD+nuiiY6NyOXI/o="; }; @@ -38,11 +38,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "imeon_inverter_api" ]; # upstream has no tests - doCheck = false; meta = { description = "Standalone API to collect data from the Imeon Energy Inverters that uses HTTP POST/GET"; homepage = "https://github.com/Imeon-Inverters-for-Home-Assistant/inverter-api"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/imgdiff/default.nix b/python/pkgs/imgdiff/default.nix index 1743c9b52..5a2b2e86b 100644 --- a/python/pkgs/imgdiff/default.nix +++ b/python/pkgs/imgdiff/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pillow, mock, unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imgdiff"; version = "1.8.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mgedmin"; repo = "imgdiff"; - rev = version; + tag = finalAttrs.version; hash = "sha256-Ko2m6rLKUmRveHIeIylGWFXyDwlf3E7mkNHKxk7HBbA="; }; - propagatedBuildInputs = [ pillow ]; + build-system = [ setuptools ]; + + dependencies = [ pillow ]; pythonImportsCheck = [ "imgdiff" ]; @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/mgedmin/imgdiff"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/imgsize/default.nix b/python/pkgs/imgsize/default.nix index 38b808d11..c5aa0893d 100644 --- a/python/pkgs/imgsize/default.nix +++ b/python/pkgs/imgsize/default.nix @@ -6,7 +6,7 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imgsize"; version = "4.0.2"; pyproject = true; @@ -14,12 +14,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ojii"; repo = "imgsize"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-pHLYDC3UjrCKOdfgo2OreE5hGyIyWVSIsQR6piJZe6k="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-AXBd6cCpBVEYnU/uqynnO8wsVypV34r023kwzwSsbe4="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/ojii/imgsize"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/imia/default.nix b/python/pkgs/imia/default.nix index 841caf276..e39c6d50a 100644 --- a/python/pkgs/imia/default.nix +++ b/python/pkgs/imia/default.nix @@ -7,25 +7,24 @@ fastapi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imia"; version = "0.5.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4CzevO7xgo8Hb1JHe/eGEtq/KCrJM0hV/7SRV2wmux8="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ starlette fastapi ]; # running the real tests would require sqlalchemy 1.4 and starsessions 1.x - doCheck = false; pythonImportsCheck = [ "imia" ]; meta = { @@ -33,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/alex-oleshkevich/imia"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/iminuit/default.nix b/python/pkgs/iminuit/default.nix index e23858c08..ebf0a1400 100644 --- a/python/pkgs/iminuit/default.nix +++ b/python/pkgs/iminuit/default.nix @@ -18,13 +18,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iminuit"; version = "2.32.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-oys00YZllZvnWta9sd2ARZu5RGbGK0VWMcAFaKzN99I="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { lgpl2Only ]; }; -} +}) diff --git a/python/pkgs/immutabledict/default.nix b/python/pkgs/immutabledict/default.nix index be4a8d483..dd63efba2 100644 --- a/python/pkgs/immutabledict/default.nix +++ b/python/pkgs/immutabledict/default.nix @@ -5,13 +5,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "immutabledict"; version = "4.3.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+ESmaRBs/cc/R7Gp2gA3gvsX3JVaVMgJcuDZPRxjxRQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Fork of frozendict, an immutable wrapper around dictionaries"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/immutables/default.nix b/python/pkgs/immutables/default.nix index 0aa242f9b..3d6084294 100644 --- a/python/pkgs/immutables/default.nix +++ b/python/pkgs/immutables/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "immutables"; version = "0.21"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MagicStack"; repo = "immutables"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wZuCZEVXzycqA/h27RIe59e2QQALem8mfb3EdjwQr9w="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/MagicStack/immutables"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/impacket/default.nix b/python/pkgs/impacket/default.nix index 83f5cd150..3758f797d 100644 --- a/python/pkgs/impacket/default.nix +++ b/python/pkgs/impacket/default.nix @@ -34,13 +34,13 @@ let activate = 1 ''; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "impacket"; version = "0.13.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7ZHIAra+/2VGr9ImKUK8GhiLRnH7kex1HUah1m0ows8="; }; @@ -75,4 +75,4 @@ buildPythonPackage rec { # Modified Apache Software License, Version 1.1 license = lib.licenses.free; }; -} +}) diff --git a/python/pkgs/import-expression/default.nix b/python/pkgs/import-expression/default.nix index 6fcbea1cf..d678b5e81 100644 --- a/python/pkgs/import-expression/default.nix +++ b/python/pkgs/import-expression/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "import-expression"; version = "2.2.1.post1"; pyproject = true; src = fetchPypi { pname = "import_expression"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-HIMb8mvvft82qXs0xoe5Yuer4GEWxm8A4U+aMhhiPU8="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { ]; mainProgram = "import-expression"; }; -} +}) diff --git a/python/pkgs/importlab/default.nix b/python/pkgs/importlab/default.nix index 29923b4e8..39ccf2a1f 100644 --- a/python/pkgs/importlab/default.nix +++ b/python/pkgs/importlab/default.nix @@ -6,13 +6,13 @@ networkx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "importlab"; version = "0.8.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-s4k4U7H26wJ9pQnDtA5nh+ld1mtLZvGzYTqtd1VuFGU="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/importlab"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/importlib-metadata/default.nix b/python/pkgs/importlib-metadata/default.nix index 1d3320dac..f8c6d39a0 100644 --- a/python/pkgs/importlib-metadata/default.nix +++ b/python/pkgs/importlib-metadata/default.nix @@ -8,14 +8,14 @@ zipp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "importlib-metadata"; version = "9.0.1"; pyproject = true; src = fetchPypi { pname = "importlib_metadata"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-q4MFgLwO89thzo+ucWOJ5UYrZ+AzAYurbY+A7xcXL5k="; }; @@ -34,7 +34,6 @@ buildPythonPackage rec { ]; # Cyclic dependencies due to pyflakefs - doCheck = false; pythonImportsCheck = [ "importlib_metadata" ]; meta = { @@ -42,4 +41,4 @@ buildPythonPackage rec { homepage = "https://importlib-metadata.readthedocs.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/importlib-resources/default.nix b/python/pkgs/importlib-resources/default.nix index bf0e9b37b..8c539dda4 100644 --- a/python/pkgs/importlib-resources/default.nix +++ b/python/pkgs/importlib-resources/default.nix @@ -11,14 +11,14 @@ importlib-metadata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "importlib-resources"; version = "6.5.2"; pyproject = true; src = fetchPypi { pname = "importlib_resources"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-GF+Hre9bzCiESdmPtPugfOp4vANkVd1ExfxKL+eP7Sw="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://importlib-resources.readthedocs.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/imread/default.nix b/python/pkgs/imread/default.nix index 56c3cdccc..8ea29a2d5 100644 --- a/python/pkgs/imread/default.nix +++ b/python/pkgs/imread/default.nix @@ -10,13 +10,13 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "imread"; version = "0.7.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ULPXCJyGJQTCKyVu9R/kWFGzRhbbFMDr/FU2AByZYBU="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { pythonImportsCheck = [ "imread" ]; -} +}) diff --git a/python/pkgs/imutils/default.nix b/python/pkgs/imutils/default.nix index 1e37e5e95..6050cb9cd 100644 --- a/python/pkgs/imutils/default.nix +++ b/python/pkgs/imutils/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, opencv4, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.5.4"; - format = "setuptools"; + pyproject = true; pname = "imutils"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "03827a9fca8b5c540305c0844a62591cf35a0caec199cb0f2f0a4a0fb15d8f24"; }; - propagatedBuildInputs = [ opencv4 ]; + build-system = [ setuptools ]; + + dependencies = [ opencv4 ]; # no tests @@ -33,4 +37,4 @@ buildPythonPackage rec { mainProgram = "range-detector"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/in-n-out/default.nix b/python/pkgs/in-n-out/default.nix index b21247226..c32327c4a 100644 --- a/python/pkgs/in-n-out/default.nix +++ b/python/pkgs/in-n-out/default.nix @@ -10,14 +10,14 @@ toolz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "in-n-out"; version = "0.2.1"; pyproject = true; src = fetchPypi { pname = "in_n_out"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Q83it96YHUGm1wYYore9mJSBCVkipT6tTcdfK71d/+o="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyapp-kit/in-n-out"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/in-place/default.nix b/python/pkgs/in-place/default.nix index 11c084575..a2e73f1a6 100644 --- a/python/pkgs/in-place/default.nix +++ b/python/pkgs/in-place/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "in-place"; version = "1.0.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jwodder"; repo = "inplace"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PyOSuHHtftEPwL3mTwWYStZNXYX3EhptKfTu0PJjOZ8="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/jwodder/inplace"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/in-toto-attestation/default.nix b/python/pkgs/in-toto-attestation/default.nix index b9640393a..795031f90 100644 --- a/python/pkgs/in-toto-attestation/default.nix +++ b/python/pkgs/in-toto-attestation/default.nix @@ -10,7 +10,7 @@ protobuf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "in-toto-attestation"; version = "0.9.3"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { # Tags on GitHub do not match the Pypi versions src = fetchPypi { pname = "in_toto_attestation"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-zAz5dBfZSVO5/ubp1BWhHFm01HzuTxN0b/6TWyjj6MQ="; }; @@ -33,11 +33,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "in_toto_attestation" ]; # No tests in the Pypi archive - doCheck = false; meta = { description = "Python implementation of in-toto attestations"; homepage = "https://github.com/in-toto/attestation/tree/main/python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/incremental/default.nix b/python/pkgs/incremental/default.nix index f46257534..02019841c 100644 --- a/python/pkgs/incremental/default.nix +++ b/python/pkgs/incremental/default.nix @@ -6,13 +6,13 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "incremental"; version = "24.11.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-h9NIDbsIPB1zYiJRGozzgAEqgXbCRW0B70gyQqu7z4w="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { dependencies = [ packaging ]; - doCheck = false; - pythonImportsCheck = [ "incremental" ]; meta = { @@ -29,4 +27,4 @@ buildPythonPackage rec { description = "Small library that versions your Python projects"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/indevolt-api/default.nix b/python/pkgs/indevolt-api/default.nix index 6f3c79380..26a6ebaca 100644 --- a/python/pkgs/indevolt-api/default.nix +++ b/python/pkgs/indevolt-api/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; # no tests in upstream repository - doCheck = false; pythonImportsCheck = [ "indevolt_api" ]; diff --git a/python/pkgs/indexed-bzip2/default.nix b/python/pkgs/indexed-bzip2/default.nix index 76726e21e..fcad39a0f 100644 --- a/python/pkgs/indexed-bzip2/default.nix +++ b/python/pkgs/indexed-bzip2/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "indexed_bzip2"; version = "1.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3HUiigZR91/nbOAMOuSHGcPtqkkEaj3VepyMhmKOHpI="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "indexed_bzip2" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/mxmlnkn/indexed_bzip2"; license = lib.licenses.mit; # dual MIT and asl20, https://internals.rust-lang.org/t/rationale-of-apache-dual-licensing/8952 }; -} +}) diff --git a/python/pkgs/indexed-gzip/default.nix b/python/pkgs/indexed-gzip/default.nix index 9cfb6a6d3..9bdd7cd49 100644 --- a/python/pkgs/indexed-gzip/default.nix +++ b/python/pkgs/indexed-gzip/default.nix @@ -8,13 +8,13 @@ zlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "indexed_gzip"; version = "1.10.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-E0fztsVSLFxQ212eKAElfOqGY56HtGxmNfIgBe497SU="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/pauldmccarthy/indexed_gzip"; license = lib.licenses.zlib; }; -} +}) diff --git a/python/pkgs/inference-gym/default.nix b/python/pkgs/inference-gym/default.nix index 546cc4d0d..39a611457 100644 --- a/python/pkgs/inference-gym/default.nix +++ b/python/pkgs/inference-gym/default.nix @@ -4,13 +4,14 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "inference-gym"; version = "0.0.5"; format = "wheel"; src = fetchPypi { - inherit format version; + inherit (finalAttrs) version; + format = "wheel"; pname = "inference_gym"; dist = "py3"; python = "py3"; @@ -20,11 +21,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "inference_gym" ]; # The package does not ship any test. - doCheck = false; meta = { description = "Place to exercise inference methods to help make them faster, leaner and more robust"; homepage = "https://github.com/tensorflow/probability/tree/main/spinoffs/inference_gym"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/infinity/default.nix b/python/pkgs/infinity/default.nix index 7f26a39d9..f48117817 100644 --- a/python/pkgs/infinity/default.nix +++ b/python/pkgs/infinity/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "infinity"; version = "1.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jap8Fc4hAP3M/eISM34M1c8IWGn1TcJjS2ww1hRh7No="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "All-in-one infinity value for Python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/inflate64/default.nix b/python/pkgs/inflate64/default.nix index 93b8ee42a..37f2d0f4f 100644 --- a/python/pkgs/inflate64/default.nix +++ b/python/pkgs/inflate64/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "inflate64"; version = "1.0.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromCodeberg { owner = "miurahr"; repo = "inflate64"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qYTkL37IzvrhYYwj6i6X8WRSQxprNKgBnQEYRnztzjA="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/inflect/default.nix b/python/pkgs/inflect/default.nix index 82f453679..394915862 100644 --- a/python/pkgs/inflect/default.nix +++ b/python/pkgs/inflect/default.nix @@ -12,13 +12,13 @@ typeguard, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "inflect"; version = "7.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+vGYAcN0LtWgWozjiODY/hoH+NCVyCIB65BPXSetVx8="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { description = "Correctly generate plurals, singular nouns, ordinals, indefinite articles"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/inflection/default.nix b/python/pkgs/inflection/default.nix index f8a160bda..d41c2209e 100644 --- a/python/pkgs/inflection/default.nix +++ b/python/pkgs/inflection/default.nix @@ -1,22 +1,26 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "inflection"; version = "0.5.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417"; }; + build-system = [ setuptools ]; + meta = { homepage = "https://github.com/jpvanhal/inflection"; description = "Port of Ruby on Rails inflector to Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/influxdb-client/default.nix b/python/pkgs/influxdb-client/default.nix index 3ed895954..9bf0a2e1c 100644 --- a/python/pkgs/influxdb-client/default.nix +++ b/python/pkgs/influxdb-client/default.nix @@ -14,7 +14,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "influxdb-client"; version = "1.50.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-39ioVlTgvICHArTNhfXZQ+WrUda2B5LxLtMwXWp6krU="; }; @@ -48,7 +48,6 @@ buildPythonPackage rec { }; # Requires influxdb server - doCheck = false; pythonImportsCheck = [ "influxdb_client" ]; @@ -57,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/influxdata/influxdb-client-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/influxdb/default.nix b/python/pkgs/influxdb/default.nix index 1360304de..ba09f2742 100644 --- a/python/pkgs/influxdb/default.nix +++ b/python/pkgs/influxdb/default.nix @@ -13,13 +13,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "influxdb"; version = "5.3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-WMZH9gQ3Et2G6a7hLrTM+7tUFUZ7yZEKSKqMdMEQiXA="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/influxdb/influxdb-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/iniconfig/default.nix b/python/pkgs/iniconfig/default.nix index cab5b43ec..7c98cf64e 100644 --- a/python/pkgs/iniconfig/default.nix +++ b/python/pkgs/iniconfig/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iniconfig"; version = "2.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-x2MVx32waGUNScW1YxR3SngE3xb+5EAsHxnW0V2MRzA="; }; @@ -25,11 +25,10 @@ buildPythonPackage rec { # Requires pytest, which in turn requires this package - causes infinite # recursion. See also: https://github.com/NixOS/nixpkgs/issues/63168 - doCheck = false; meta = { description = "Brain-dead simple parsing of ini files"; homepage = "https://github.com/pytest-dev/iniconfig"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/inifile/default.nix b/python/pkgs/inifile/default.nix index 3a11a0421..1b2e70701 100644 --- a/python/pkgs/inifile/default.nix +++ b/python/pkgs/inifile/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "inifile"; version = "0.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2eXrRwjr8TNTxM/OeYrUeJCovMX7rgRjAiPRXXn1XpY="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/mitsuhiko/python-inifile"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/iniparse/default.nix b/python/pkgs/iniparse/default.nix index eff7c8ed3..f6ddfead1 100644 --- a/python/pkgs/iniparse/default.nix +++ b/python/pkgs/iniparse/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iniparse"; version = "0.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ky5SOdUm56y1BAF7twe+ZwGaxCimkyNo5oUWkQk6qEI="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { dependencies = [ six ]; - doCheck = false; - pythonImportsCheck = [ "iniparse" ]; meta = { @@ -29,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/candlepin/python-iniparse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/injector/default.nix b/python/pkgs/injector/default.nix index 7a74aa093..99f2ccbb4 100644 --- a/python/pkgs/injector/default.nix +++ b/python/pkgs/injector/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "injector"; version = "0.24.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "python-injector"; repo = "injector"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Pv+3D2eyZiposXMsfhVniGNvlNGb3xSZfjIQBLMcbLA="; }; + + build-system = [ setuptools ]; pythonImportsCheck = [ "injector" ]; meta = { @@ -23,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/alecthomas/injector"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/inline-snapshot/default.nix b/python/pkgs/inline-snapshot/default.nix index 9de2c629b..79c19ae43 100644 --- a/python/pkgs/inline-snapshot/default.nix +++ b/python/pkgs/inline-snapshot/default.nix @@ -12,7 +12,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "inline-snapshot"; version = "0.35.4"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "15r10nk"; repo = "inline-snapshot"; - tag = version; + tag = finalAttrs.version; hash = "sha256-IgGnh96Xu6790UyqEv/S8CxSXCt12FeZH8gYAPUTzN4="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/15r10nk/inline-snapshot/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/inotify-simple/default.nix b/python/pkgs/inotify-simple/default.nix index e62b0a837..1aa139ebd 100644 --- a/python/pkgs/inotify-simple/default.nix +++ b/python/pkgs/inotify-simple/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "inotify-simple"; version = "2.0.1"; pyproject = true; src = fetchPypi { pname = "inotify_simple"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-8BC7vYKDvXGp9Ost6UdlgE7eJL1HMgsObvQTblQc3Cw="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/chrisjbillington/inotify_simple"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/inotify/default.nix b/python/pkgs/inotify/default.nix index 116dac14e..5a44ccc44 100644 --- a/python/pkgs/inotify/default.nix +++ b/python/pkgs/inotify/default.nix @@ -6,13 +6,13 @@ build, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "inotify"; version = "0.2.12"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-mu5Af5LH1Ros5Q87eCkakJTjNONL1o6Cv2ACB5X6LJQ="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/inotifyrecursive/default.nix b/python/pkgs/inotifyrecursive/default.nix index 8ca1b2eeb..86eeca7ca 100644 --- a/python/pkgs/inotifyrecursive/default.nix +++ b/python/pkgs/inotifyrecursive/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ inotify-simple ]; # No tests included - doCheck = false; pythonImportsCheck = [ "inotifyrecursive" ]; meta = { diff --git a/python/pkgs/inquirer/default.nix b/python/pkgs/inquirer/default.nix index 2fba2ccea..5cd6c6dd2 100644 --- a/python/pkgs/inquirer/default.nix +++ b/python/pkgs/inquirer/default.nix @@ -6,7 +6,7 @@ # native poetry-core, - # propagated + # dependencies blessed, editor, readchar, @@ -16,7 +16,7 @@ pexpect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "inquirer"; version = "3.4.1"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "magmax"; repo = "python-inquirer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xVHmdJGN5yOxbEkZIiOLqeUwcfdj+o7jTTWBD75szII="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/magmax/python-inquirer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/inquirer3/default.nix b/python/pkgs/inquirer3/default.nix index 7e6702b56..46b7d1e45 100644 --- a/python/pkgs/inquirer3/default.nix +++ b/python/pkgs/inquirer3/default.nix @@ -10,7 +10,7 @@ readchar, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "inquirer3"; version = "0.6.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "guysalt"; repo = "python-inquirer3"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-IReJlwVgjTlTlD0xTVWrzQ0ITvCQvPJ86zCmffaoPk4="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/guysalt/python-inquirer3"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/inquirerpy/default.nix b/python/pkgs/inquirerpy/default.nix index d71862770..81f3be52c 100644 --- a/python/pkgs/inquirerpy/default.nix +++ b/python/pkgs/inquirerpy/default.nix @@ -7,7 +7,7 @@ prompt-toolkit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "inquirerpy"; version = "0.3.4"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kazhala"; repo = "InquirerPy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Ap0xZHEU458tjm6oEN5EtDoSRlnpZ7jvDq1L7fTlQQc="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ pfzy prompt-toolkit ]; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/kazhala/InquirerPy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/inscriptis/default.nix b/python/pkgs/inscriptis/default.nix index a666c2f0c..d5aeda664 100644 --- a/python/pkgs/inscriptis/default.nix +++ b/python/pkgs/inscriptis/default.nix @@ -11,7 +11,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "inscriptis"; version = "2.7.4"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "weblyzard"; repo = "inscriptis"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0EwnbzHEeFtRjsY3QR7LNrPPSPOxCkMzFbFy26umZvI="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/weblyzard/inscriptis"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/insegel/default.nix b/python/pkgs/insegel/default.nix index 752f6d474..04a616137 100644 --- a/python/pkgs/insegel/default.nix +++ b/python/pkgs/insegel/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pygments, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "insegel"; version = "1.3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1d055dd64f6eb335580a485271511ba2f4e3b5e315f48f827f58da3cace4b4ae"; }; - propagatedBuildInputs = [ pygments ]; + build-system = [ setuptools ]; + + dependencies = [ pygments ]; # No tests included - doCheck = false; pythonImportsCheck = [ "insegel" ]; @@ -27,4 +30,4 @@ buildPythonPackage rec { description = "Monochrome 2 column Sphinx theme"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/installer/default.nix b/python/pkgs/installer/default.nix index 57db8e0d1..f27eef501 100644 --- a/python/pkgs/installer/default.nix +++ b/python/pkgs/installer/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "installer"; version = "1.0.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pypa"; repo = "installer"; - rev = version; + tag = finalAttrs.version; hash = "sha256-GkHLZfzHfTcBL8wQmIGlNkVodEw9Pih4i1SS36mSfBo="; }; @@ -23,11 +23,9 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - doCheck = false; - meta = { description = "Low-level library for installing a Python package from a wheel distribution"; homepage = "https://github.com/pypa/installer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/insteon-frontend-home-assistant/default.nix b/python/pkgs/insteon-frontend-home-assistant/default.nix index 5367210c9..8ad9cd372 100644 --- a/python/pkgs/insteon-frontend-home-assistant/default.nix +++ b/python/pkgs/insteon-frontend-home-assistant/default.nix @@ -5,21 +5,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "insteon-frontend-home-assistant"; version = "0.6.2"; pyproject = true; src = fetchPypi { pname = "insteon_frontend_home_assistant"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-p5hL8LE8h/4ytHft/v23uzv7YwR9UBDVru8n7WeY99Q="; }; nativeBuildInputs = [ setuptools ]; # upstream has no tests - doCheck = false; pythonImportsCheck = [ "insteon_frontend" ]; @@ -28,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyinsteon/insteon-panel"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/intake-parquet/default.nix b/python/pkgs/intake-parquet/default.nix index 6e94b72bd..91fc75023 100644 --- a/python/pkgs/intake-parquet/default.nix +++ b/python/pkgs/intake-parquet/default.nix @@ -10,7 +10,7 @@ versioneer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "intake-parquet"; version = "0.3.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "intake"; repo = "intake-parquet"; - tag = version; + tag = finalAttrs.version; hash = "sha256-6OZPevpa3T/7p7X77Dib4My07oqksw9m0ELTLXwYJ70="; }; @@ -42,8 +42,6 @@ buildPythonPackage rec { pyarrow ]; - doCheck = false; - #pythonImportsCheck = [ "intake_parquet" ]; meta = { @@ -51,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/intake/intake-parquet"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/intelhex/default.nix b/python/pkgs/intelhex/default.nix index 8c90f2033..13d6fe007 100644 --- a/python/pkgs/intelhex/default.nix +++ b/python/pkgs/intelhex/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "intelhex"; version = "2.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iStzYacZ9JRSN9qMz3VOlRPbMvViiFJ4WuoQjc0lAJM="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/bialix/intelhex"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/interegular/default.nix b/python/pkgs/interegular/default.nix index 6611a2883..da68e6772 100644 --- a/python/pkgs/interegular/default.nix +++ b/python/pkgs/interegular/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "interegular"; version = "0.3.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2baXshs0iEcROZug8DdpFLgYmc5nADJIbQ0Eg0SnZgA="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/MegaIng/interegular"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/interface-meta/default.nix b/python/pkgs/interface-meta/default.nix index 7afb5fb36..c50c05db9 100644 --- a/python/pkgs/interface-meta/default.nix +++ b/python/pkgs/interface-meta/default.nix @@ -6,7 +6,7 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "interface-meta"; version = "2.0.1"; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matthewwardrop"; repo = "interface_meta"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-1of84/Y/efGlz33FD06M2A7b4cJCKJTKYm+tWHPJzak="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; build-system = [ hatchling @@ -32,4 +32,4 @@ buildPythonPackage rec { description = "Convenient way to expose an extensible API with enforced method signatures and consistent documentation"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/interruptingcow/default.nix b/python/pkgs/interruptingcow/default.nix index b089766f2..c76f42487 100644 --- a/python/pkgs/interruptingcow/default.nix +++ b/python/pkgs/interruptingcow/default.nix @@ -9,8 +9,6 @@ buildPythonPackage (finalAttrs: { version = "0.8"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; sha256 = "3e8cd5058b651e625702cba53e3b1fb76d7a5ec07ab69c52a167a9f784e3306c"; diff --git a/python/pkgs/intersphinx-registry/default.nix b/python/pkgs/intersphinx-registry/default.nix index cbfe83fdc..4e43a07b1 100644 --- a/python/pkgs/intersphinx-registry/default.nix +++ b/python/pkgs/intersphinx-registry/default.nix @@ -19,7 +19,6 @@ buildPythonPackage (finalAttrs: { pname = "intersphinx-registry"; version = "0.2705.27"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "Quansight-labs"; diff --git a/python/pkgs/intervals/default.nix b/python/pkgs/intervals/default.nix index 5d26b982d..18f3c877d 100644 --- a/python/pkgs/intervals/default.nix +++ b/python/pkgs/intervals/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "intervals"; version = "0.9.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kvesteri"; repo = "intervals"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5SwbGF7RU+2wgGnqhhFCdV89tsEIum4w7RwPU7+3MRQ="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/kvesteri/intervals"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/intervaltree/default.nix b/python/pkgs/intervaltree/default.nix index fdf757802..8286d53fa 100644 --- a/python/pkgs/intervaltree/default.nix +++ b/python/pkgs/intervaltree/default.nix @@ -6,20 +6,20 @@ sortedcontainers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "intervaltree"; version = "3.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8/fouut911ufem0zzz7BACWYSo5m4wFtU35SEwxzz+I="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail ', "uv-dynamic-versioning"' "" \ - --replace-fail "dynamic = ['version']" 'version = "${version}"' \ + --replace-fail "dynamic = ['version']" 'version = "${finalAttrs.version}"' \ --replace-fail 'source = "uv-dynamic-versioning"' "" ''; @@ -29,11 +29,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "intervaltree" ]; - doCheck = false; - meta = { description = "Editable interval tree data structure for Python 2 and 3"; homepage = "https://github.com/chaimleib/intervaltree"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/inventree/default.nix b/python/pkgs/inventree/default.nix index b75d8d363..f5f0d40f6 100644 --- a/python/pkgs/inventree/default.nix +++ b/python/pkgs/inventree/default.nix @@ -18,7 +18,6 @@ buildPythonPackage (finalAttrs: { pname = "inventree"; version = "0.23.2"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "inventree"; diff --git a/python/pkgs/invocations/default.nix b/python/pkgs/invocations/default.nix index 8e86554f9..5a2ffe84e 100644 --- a/python/pkgs/invocations/default.nix +++ b/python/pkgs/invocations/default.nix @@ -13,7 +13,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "invocations"; version = "4.0.2"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyinvoke"; repo = "invocations"; - tag = version; + tag = finalAttrs.version; hash = "sha256-G6EKypqP2/coPChLwwEKZ2WIEay0qfyM8M5jKb0oS2c="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://invocations.readthedocs.io/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/invoke/default.nix b/python/pkgs/invoke/default.nix index 98462d99f..0892d1b36 100644 --- a/python/pkgs/invoke/default.nix +++ b/python/pkgs/invoke/default.nix @@ -7,7 +7,7 @@ stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "invoke"; version = "3.0.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Q3tqYiIjgkOAv7TmT2EnEaa2SMeV9WXvyGJa9m+1fww="; }; @@ -24,7 +24,6 @@ buildPythonPackage rec { ''; # errors with vendored libs - doCheck = false; pythonImportsCheck = [ "invoke" ]; @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://www.pyinvoke.org/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/inwx-domrobot/default.nix b/python/pkgs/inwx-domrobot/default.nix index 5a586802a..61f3894a6 100644 --- a/python/pkgs/inwx-domrobot/default.nix +++ b/python/pkgs/inwx-domrobot/default.nix @@ -6,7 +6,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "inwx-domrobot"; version = "3.2.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "inwx"; repo = "python-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Nbs3xroJD61NbpaiTdjA3VFxzXIlnqmB1d7SJDj8VN8="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ requests ]; # No tests - doCheck = false; pythonImportsCheck = [ "INWX" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/inwx/python-client"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/iocapture/default.nix b/python/pkgs/iocapture/default.nix index 9712bb454..c82b9e350 100644 --- a/python/pkgs/iocapture/default.nix +++ b/python/pkgs/iocapture/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iocapture"; version = "0.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hmcOGAi83NT3ARL0Pacq52bwTNgxHRBxzm4OCnLjfug="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/oinume/iocapture"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/iocextract/default.nix b/python/pkgs/iocextract/default.nix index e77539798..464212200 100644 --- a/python/pkgs/iocextract/default.nix +++ b/python/pkgs/iocextract/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, regex, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iocextract"; version = "1.16.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "InQuest"; repo = "iocextract"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cCp9ug/TuVY1zL+kiDlFGBmfFJyAmVwxLD36WT0oRAE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ regex requests ]; @@ -41,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/InQuest/iocextract"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/ioctl-opt/default.nix b/python/pkgs/ioctl-opt/default.nix index 7fe874089..1beefd087 100644 --- a/python/pkgs/ioctl-opt/default.nix +++ b/python/pkgs/ioctl-opt/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ioctl-opt"; version = "1.3.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vpelletier"; repo = "python-ioctl-opt"; - tag = version; + tag = finalAttrs.version; hash = "sha256-IdE1HZ0fj1Cv4bJRQOEv23O3bCiPUP4R10oGhSWjEXA="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/vpelletier/python-ioctl-opt"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/iodata/default.nix b/python/pkgs/iodata/default.nix index 32ed8098a..09bf274b9 100644 --- a/python/pkgs/iodata/default.nix +++ b/python/pkgs/iodata/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iodata"; version = "1.0.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "theochem"; repo = "iodata"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ly5nEqgxCt5uU+UNQx/7zgrh+w1Plngarw29+Ns68ts="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/theochem/iodata"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/ionoscloud/default.nix b/python/pkgs/ionoscloud/default.nix index 0207f3185..314449c6a 100644 --- a/python/pkgs/ionoscloud/default.nix +++ b/python/pkgs/ionoscloud/default.nix @@ -10,19 +10,19 @@ asn1crypto, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ionoscloud"; version = "6.1.13"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8QgweGXPWcvGQcp22yo4KovkVXrDI2eSWNMUnGhDWEI="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ urllib3 six certifi @@ -31,7 +31,6 @@ buildPythonPackage rec { ]; # upstream only has codecoverage tests, but no actual tests to go with them - doCheck = false; pythonImportsCheck = [ "ionoscloud" ]; @@ -40,4 +39,4 @@ buildPythonPackage rec { description = "Python API client for ionoscloud"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/iopath/default.nix b/python/pkgs/iopath/default.nix index 3298dc19c..efa2a40fc 100644 --- a/python/pkgs/iopath/default.nix +++ b/python/pkgs/iopath/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, # build inputs tqdm, portalocker, @@ -13,7 +15,7 @@ let in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "facebookresearch"; @@ -22,7 +24,9 @@ buildPythonPackage { hash = "sha256-vJV0c+dCFO0wOHahKJ8DbwT2Thx3YjkNLVSpQv9H69g="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ tqdm portalocker ]; diff --git a/python/pkgs/iottycloud/default.nix b/python/pkgs/iottycloud/default.nix index ca47a5d15..9eb890fee 100644 --- a/python/pkgs/iottycloud/default.nix +++ b/python/pkgs/iottycloud/default.nix @@ -8,7 +8,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iottycloud"; version = "0.3.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pburgio"; repo = "iottyCloud"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tsCa87BdwKumsv5N0lAPZmMIfm2W6Pw0LS3sF9c/oRA="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/pburgio/iottyCloud"; license = lib.licenses.agpl3Only; }; -} +}) diff --git a/python/pkgs/iowait/default.nix b/python/pkgs/iowait/default.nix index c60571547..1b2cfb2dd 100644 --- a/python/pkgs/iowait/default.nix +++ b/python/pkgs/iowait/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iowait"; version = "0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-qxvC64TCLM9h8XoAJPn7bfeBs58YUnZKZqd2nVrfspk="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://launchpad.net/python-iowait"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/ipaddr/default.nix b/python/pkgs/ipaddr/default.nix index 6d9b14ac8..90bfc64e0 100644 --- a/python/pkgs/ipaddr/default.nix +++ b/python/pkgs/ipaddr/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipaddr"; version = "2.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QJLf5mdYjRaqErWay3yKQCTl3LI6aBzQsLYCNz7KiNY="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/ipaddr-py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ipdb/default.nix b/python/pkgs/ipdb/default.nix index fbfc6258c..c98ad1798 100644 --- a/python/pkgs/ipdb/default.nix +++ b/python/pkgs/ipdb/default.nix @@ -11,13 +11,13 @@ ipython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipdb"; version = "0.13.13"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-46xgGO8FEm1EKvaAqthjAG7BnQIpBWGsiLixwLDPxyY="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/gotcha/ipdb"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/iptools/default.nix b/python/pkgs/iptools/default.nix index a93620615..84de72671 100644 --- a/python/pkgs/iptools/default.nix +++ b/python/pkgs/iptools/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.7.0"; pname = "iptools"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bd808"; repo = "python-iptools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-340Wc4QGwUqEEANM5EQzFaXxIWVf2fDr4qfCuxNEVBQ="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/bd808/python-iptools"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/ipv8-rust-tunnels/default.nix b/python/pkgs/ipv8-rust-tunnels/default.nix index 901e7e7d4..998a86650 100644 --- a/python/pkgs/ipv8-rust-tunnels/default.nix +++ b/python/pkgs/ipv8-rust-tunnels/default.nix @@ -5,19 +5,19 @@ buildPythonPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipv8-rust-tunnels"; version = "0.1.44"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "ipv8_rust_tunnels"; hash = "sha256-eHk8aCrcnyVGd3JRGQ950Bwryqt+TYx84MHAM2kWTis="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-axWG5cJtNaoZl7cG+Zyo1k+eA8pXHDWFgHqpTmQNHlo="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/Tribler/ipv8-rust-tunnels"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/ipwhois/default.nix b/python/pkgs/ipwhois/default.nix index d42be9848..8d533d039 100644 --- a/python/pkgs/ipwhois/default.nix +++ b/python/pkgs/ipwhois/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipwhois"; version = "1.3.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "secynic"; repo = "ipwhois"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PY3SUPELcCvS/o5kfko4OD1BlTc9DnyqfkSFuzcAOSY="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/secynic/ipwhois"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/ipy/default.nix b/python/pkgs/ipy/default.nix index 7b129b8bd..3748c1bbb 100644 --- a/python/pkgs/ipy/default.nix +++ b/python/pkgs/ipy/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipy"; version = "1.01"; pyproject = true; src = fetchPypi { pname = "IPy"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-7eynQd6i1UrKVo+iN0AojD/obA8+pwA0RXHp7xSnzBo="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { description = "Class and tools for handling of IPv4 and IPv6 addresses and networks"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/ipycanvas/default.nix b/python/pkgs/ipycanvas/default.nix index 244f7ba94..cc2df7b0f 100644 --- a/python/pkgs/ipycanvas/default.nix +++ b/python/pkgs/ipycanvas/default.nix @@ -49,7 +49,6 @@ buildPythonPackage (finalAttrs: { pillow ]; - doCheck = false; # tests are in Typescript and require `npx` and `chromium` pythonImportsCheck = [ "ipycanvas" ]; meta = { diff --git a/python/pkgs/ipydatawidgets/default.nix b/python/pkgs/ipydatawidgets/default.nix index 22bb598cb..bf106d6ee 100644 --- a/python/pkgs/ipydatawidgets/default.nix +++ b/python/pkgs/ipydatawidgets/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, jupyter-packaging, ipywidgets, numpy, @@ -9,23 +11,24 @@ traittypes, }: -buildPythonPackage rec { - __structuredAttrs = true; +buildPythonPackage (finalAttrs: { pname = "ipydatawidgets"; version = "4.3.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OU8kiVdlh8/XVTd6CaBn9GytIggZZQkgIf0avL54Uqg="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ jupyter-packaging ]; setupPyBuildFlags = [ "--skip-npm" ]; - propagatedBuildInputs = [ + dependencies = [ ipywidgets numpy six @@ -37,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/vidartf/ipydatawidgets"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ipykernel/default.nix b/python/pkgs/ipykernel/default.nix index 2cf4cfb2a..bc1e69c23 100644 --- a/python/pkgs/ipykernel/default.nix +++ b/python/pkgs/ipykernel/default.nix @@ -19,13 +19,13 @@ traitlets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipykernel"; version = "7.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-WKP8iFM9WTDDVG3H6sZsbSiKzeT4AeIAHmXtxdyc8Ns="; }; @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ comm ipython jupyter-client @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://ipython.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ipylab/default.nix b/python/pkgs/ipylab/default.nix index fd1328b48..e72d9bae5 100644 --- a/python/pkgs/ipylab/default.nix +++ b/python/pkgs/ipylab/default.nix @@ -9,7 +9,7 @@ jupyterlab, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipylab"; version = "1.1.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { # This needs to be fetched from Pypi, as we rely on the nodejs build to be skipped, # which only happens if ipylab/labextension/style.js is present. src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-85hYpNnvbsuC+O/uufa1oBo6ZNTzxPKl/i1YrllN4hI="; }; @@ -35,11 +35,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "ipylab" ]; # There are no tests - doCheck = false; meta = { description = "Control JupyterLab from Python notebooks"; homepage = "https://github.com/jtpio/ipylab"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ipymarkup/default.nix b/python/pkgs/ipymarkup/default.nix index 39d7bc9ff..f4f908708 100644 --- a/python/pkgs/ipymarkup/default.nix +++ b/python/pkgs/ipymarkup/default.nix @@ -2,28 +2,31 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, intervaltree, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipymarkup"; version = "0.9.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-P0v6EP1mKTIBr4SEp+a8tyO/LjPZpqoAiCZxr5yiaRE="; }; - propagatedBuildInputs = [ intervaltree ]; + build-system = [ setuptools ]; + + dependencies = [ intervaltree ]; pythonImportsCheck = [ "ipymarkup" ]; # Upstream has no tests: - doCheck = false; meta = { description = "Collection of NLP visualizations for NER and syntax tree markup"; homepage = "https://github.com/natasha/ipymarkup"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ipynbname/default.nix b/python/pkgs/ipynbname/default.nix index 6267cdbac..dc88c271b 100644 --- a/python/pkgs/ipynbname/default.nix +++ b/python/pkgs/ipynbname/default.nix @@ -6,13 +6,13 @@ ipykernel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipynbname"; version = "2025.8.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3Mg2fGTEqfC6pqzqPlCf1mlr9dgcmrzrOG4q1u/KyTU="; }; @@ -23,11 +23,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "ipynbname" ]; # upstream has no tests - doCheck = false; meta = { description = "Simply returns either notebook filename or the full path to the notebook"; homepage = "https://github.com/msm1089/ipynbname"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ipyparallel/default.nix b/python/pkgs/ipyparallel/default.nix index 3528871ff..25db03f36 100644 --- a/python/pkgs/ipyparallel/default.nix +++ b/python/pkgs/ipyparallel/default.nix @@ -15,13 +15,13 @@ traitlets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipyparallel"; version = "9.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-KzG7TpRwjn/7TuZQHX9fZk334cTFcukeng0SSExqaRA="; }; @@ -49,7 +49,6 @@ buildPythonPackage rec { ]; # Requires access to cluster - doCheck = false; pythonImportsCheck = [ "ipyparallel" ]; @@ -58,4 +57,4 @@ buildPythonPackage rec { homepage = "https://ipyparallel.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ipytablewidgets/default.nix b/python/pkgs/ipytablewidgets/default.nix index faebe5449..f2db50114 100644 --- a/python/pkgs/ipytablewidgets/default.nix +++ b/python/pkgs/ipytablewidgets/default.nix @@ -13,13 +13,13 @@ traitlets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipytablewidgets"; version = "0.3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CGkb//mLUmkyv+hmVJX5+04JGCfw+TtfBxMTXW0bhsw="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/progressivis/ipytablewidgets"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ipython-genutils/default.nix b/python/pkgs/ipython-genutils/default.nix index c0a930616..05826275f 100644 --- a/python/pkgs/ipython-genutils/default.nix +++ b/python/pkgs/ipython-genutils/default.nix @@ -5,21 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipython-genutils"; version = "0.2.0"; pyproject = true; src = fetchPypi { pname = "ipython_genutils"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-6y4RbnXs751NIo/cZq9UJpr6JqtEYwQuM3hbiHxii6g="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "ipython_genutils" ]; meta = { @@ -27,4 +25,4 @@ buildPythonPackage rec { homepage = "https://ipython.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ipython-pygments-lexers/default.nix b/python/pkgs/ipython-pygments-lexers/default.nix index f9e21061a..13fb315fe 100644 --- a/python/pkgs/ipython-pygments-lexers/default.nix +++ b/python/pkgs/ipython-pygments-lexers/default.nix @@ -6,7 +6,7 @@ pygments, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipython-pygments-lexers"; version = "1.1.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ipython"; repo = "ipython-pygments-lexers"; - tag = version; + tag = finalAttrs.version; hash = "sha256-p2WrFvCzHOuxPec9Wc1/xT6+fEUdcdDC1HTNmu5dm5Q="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/ipython/ipython-pygments-lexers"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ipython-sql/default.nix b/python/pkgs/ipython-sql/default.nix index 4710443d2..65b112007 100644 --- a/python/pkgs/ipython-sql/default.nix +++ b/python/pkgs/ipython-sql/default.nix @@ -11,14 +11,14 @@ sqlparse, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipython-sql"; version = "0.5.0"; pyproject = true; src = fetchPypi { pname = "ipython-sql"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-PbPOf5qV369Dh2+oCxa9u5oE3guhIELKsT6fWW/P/b4="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/catherinedevlin/ipython-sql"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ipython/default.nix b/python/pkgs/ipython/default.nix index 5b7cd254e..5a0f63ad6 100644 --- a/python/pkgs/ipython/default.nix +++ b/python/pkgs/ipython/default.nix @@ -18,7 +18,7 @@ psutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipython"; version = "9.17.1"; outputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iRm+jCfyCm9EIxRQKAY/Zje0KgPOV2ZbsSAV7h8HNSk="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://ipython.readthedocs.io/en/stable/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ipyvue/default.nix b/python/pkgs/ipyvue/default.nix index 08ec95469..250739b4f 100644 --- a/python/pkgs/ipyvue/default.nix +++ b/python/pkgs/ipyvue/default.nix @@ -7,13 +7,13 @@ ipywidgets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipyvue"; version = "1.12.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QIteamTiA/xnn0R6Bx49vBeKspBpgvJIrfci/IR3P/o="; }; @@ -21,7 +21,6 @@ buildPythonPackage rec { dependencies = [ ipywidgets ]; - doCheck = false; # No tests in package or GitHub pythonImportsCheck = [ "ipyvue" ]; meta = { @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/mariobuikhuizen/ipyvue"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ipyvuetify/default.nix b/python/pkgs/ipyvuetify/default.nix index cf36129e0..bb58c6f10 100644 --- a/python/pkgs/ipyvuetify/default.nix +++ b/python/pkgs/ipyvuetify/default.nix @@ -7,14 +7,14 @@ ipyvue, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipyvuetify"; version = "1.11.3"; pyproject = true; # GitHub version tries to run npm (Node JS) src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NYCvp22a3UrgTMt/1X1KDPA6JhcFdC5xN97z67Zaxx0="; }; @@ -32,7 +32,6 @@ buildPythonPackage rec { setuptools ]; - doCheck = false; # no tests on PyPi/GitHub pythonImportsCheck = [ "ipyvuetify" ]; meta = { @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/mariobuikhuizen/ipyvuetify"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ipywidgets/default.nix b/python/pkgs/ipywidgets/default.nix index d9c244375..866c763a6 100644 --- a/python/pkgs/ipywidgets/default.nix +++ b/python/pkgs/ipywidgets/default.nix @@ -13,13 +13,13 @@ widgetsnbextension, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipywidgets"; version = "8.1.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-YflpMGuV+F+6a2mGt/5F1zEk0dnjAjqAaHENR6Iupmg="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter-widgets/ipywidgets"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ipyxact/default.nix b/python/pkgs/ipyxact/default.nix index f9bbc64d9..2c9a627cf 100644 --- a/python/pkgs/ipyxact/default.nix +++ b/python/pkgs/ipyxact/default.nix @@ -1,19 +1,21 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lib, pyyaml, six, lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipyxact"; version = "0.3.2"; - format = "setuptools"; + pyproject = true; - propagatedBuildInputs = [ pyyaml ]; - checkInputs = [ + dependencies = [ pyyaml ]; + nativeCheckInputs = [ six lxml ]; @@ -21,10 +23,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "olofk"; repo = "ipyxact"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-myD+NnqcxxaSAV7qZa8xqeciaiFqFePqIzd7sb/2GXA="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "ipyxact" ]; meta = { @@ -33,4 +37,4 @@ buildPythonPackage rec { mainProgram = "ipxact2v"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/irc/default.nix b/python/pkgs/irc/default.nix index 35d7b2ddc..c181bc2ad 100644 --- a/python/pkgs/irc/default.nix +++ b/python/pkgs/irc/default.nix @@ -13,13 +13,13 @@ tempora, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "irc"; version = "20.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jdv9GfcSBM7Ount8cnJLFbP6h7q16B5Fp1vvc2oaPHY="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/irc"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/irctokens/default.nix b/python/pkgs/irctokens/default.nix index fba03ff95..d8e1a22b3 100644 --- a/python/pkgs/irctokens/default.nix +++ b/python/pkgs/irctokens/default.nix @@ -7,7 +7,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "irctokens"; version = "2.0.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jesopo"; repo = "irctokens"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Y9NBqxGUkt48hnXxsmfydHkJmWWb+sRrElV8C7l9bpw="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.mit; homepage = "https://github.com/jesopo/irctokens"; }; -} +}) diff --git a/python/pkgs/irisclient/default.nix b/python/pkgs/irisclient/default.nix index 8e85b3310..6fba8614c 100644 --- a/python/pkgs/irisclient/default.nix +++ b/python/pkgs/irisclient/default.nix @@ -9,7 +9,7 @@ pytest-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "irisclient"; version = "1.2.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "houqp"; repo = "iris-python-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fXMw2BopkEqjklR6jr7QQIZyxLq6NHKm2rHwTCbtxR0="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { dependencies = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ httmock pytestCheckHook pytest-mock @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/houqp/iris-python-client"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/irm-kmi-api/default.nix b/python/pkgs/irm-kmi-api/default.nix index dcebd8bc9..065251dfb 100644 --- a/python/pkgs/irm-kmi-api/default.nix +++ b/python/pkgs/irm-kmi-api/default.nix @@ -10,7 +10,7 @@ svgwrite, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "irm-kmi-api"; version = "1.1.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jdejaegh"; repo = "irm-kmi-api"; - tag = version; + tag = finalAttrs.version; hash = "sha256-RJMIXisgG4ybynsm7kCrN8zOU0EJv7a1Q74l+edxH/E="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/jdejaegh/irm-kmi-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/iso-639/default.nix b/python/pkgs/iso-639/default.nix index 6fae4b61f..41d829163 100644 --- a/python/pkgs/iso-639/default.nix +++ b/python/pkgs/iso-639/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iso-639"; version = "0.4.5"; pyproject = true; src = fetchPypi { pname = "iso-639"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-3JzUuIC4mNd0xH/pd1FnQEr4qF3YidWPkAgDUQmszkk="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/noumar/iso639"; license = lib.licenses.agpl3Only; }; -} +}) diff --git a/python/pkgs/iso3166/default.nix b/python/pkgs/iso3166/default.nix index 6ab1d99f5..1f8f1b08f 100644 --- a/python/pkgs/iso3166/default.nix +++ b/python/pkgs/iso3166/default.nix @@ -1,20 +1,24 @@ { lib, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iso3166"; version = "2.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "deactivated"; repo = "python-iso3166"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qJYw1FlhQD9EI3xCRv3U6fkKxHoAqNfO8myItki1C0g="; }; + + build-system = [ setuptools ]; pythonImportsCheck = [ "iso3166" ]; meta = { @@ -22,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/deactivated/python-iso3166"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/iso4217/default.nix b/python/pkgs/iso4217/default.nix index 9c13cc2d9..bdcbcdbe4 100644 --- a/python/pkgs/iso4217/default.nix +++ b/python/pkgs/iso4217/default.nix @@ -14,7 +14,7 @@ let hash = "sha256-r1mRvI/qcOYOGKVzXHJGFdYxc+YlzpcdnWJExaF0Mp0="; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iso4217"; version = "1.16"; pyproject = true; @@ -22,14 +22,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dahlia"; repo = "iso4217"; - tag = version; + tag = finalAttrs.version; hash = "sha256-C7TwGlbTwpcJ0rE7notWzZHthWzXKMPbHq00zMhfHeA="; }; postPatch = '' # get_version() appends a date to the version prefix substituteInPlace setup.py \ - --replace-fail 'version=get_version()' 'version="${version}"' + --replace-fail 'version=get_version()' 'version="${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/dahlia/iso4217"; license = lib.licenses.publicDomain; }; -} +}) diff --git a/python/pkgs/iso8601/default.nix b/python/pkgs/iso8601/default.nix index d2f521f41..f7374b3db 100644 --- a/python/pkgs/iso8601/default.nix +++ b/python/pkgs/iso8601/default.nix @@ -5,13 +5,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iso8601"; version = "2.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ax04Ke6JIcQwGZjJCfeCn6ntPL2sDTsWry10Ou0bqN8="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://pyiso8601.readthedocs.io/"; license = with lib.licenses; [ mit ]; }; -} +}) diff --git a/python/pkgs/isodate/default.nix b/python/pkgs/isodate/default.nix index eb4d5a06d..04a67c07e 100644 --- a/python/pkgs/isodate/default.nix +++ b/python/pkgs/isodate/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "isodate"; version = "0.7.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-TNGqD0PKdvSmxsApKoX0CzXsLkPjFbWfBubTIXGpU+Y="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/gweis/isodate/"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/isoduration/default.nix b/python/pkgs/isoduration/default.nix index 4c85b6125..ea0a796be 100644 --- a/python/pkgs/isoduration/default.nix +++ b/python/pkgs/isoduration/default.nix @@ -3,21 +3,25 @@ arrow, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "isoduration"; version = "20.11.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "bolsote"; repo = "isoduration"; - rev = version; + tag = finalAttrs.version; hash = "sha256-6LqsH+3V/K0s2YD1gvmelo+cCH+yCAmmyTYGhUegVdk="; }; - propagatedBuildInputs = [ arrow ]; + build-system = [ setuptools ]; + + dependencies = [ arrow ]; pythonImportsCheck = [ "isoduration" ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/bolsote/isoduration"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/isort/default.nix b/python/pkgs/isort/default.nix index 7af7b3bc3..c8be68e9d 100644 --- a/python/pkgs/isort/default.nix +++ b/python/pkgs/isort/default.nix @@ -6,7 +6,7 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "isort"; version = "8.0.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; - tag = version; + tag = finalAttrs.version; hash = "sha256-adEAWbRY+bCji4TfnS8W5p5KvuSjmLQrqhi+n8mSQPA="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "isort"; }; -} +}) diff --git a/python/pkgs/isosurfaces/default.nix b/python/pkgs/isosurfaces/default.nix index 7b78c1954..62e765d83 100644 --- a/python/pkgs/isosurfaces/default.nix +++ b/python/pkgs/isosurfaces/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "isosurfaces"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+lHr6GTqk1WyaDDif91qQdWli0GfqNS0fjuLgHGNbiE="; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; # no tests defined upstream - doCheck = false; pythonImportsCheck = [ "isosurfaces" ]; @@ -34,4 +37,4 @@ buildPythonPackage rec { ''; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/isounidecode/default.nix b/python/pkgs/isounidecode/default.nix index 0ea95caf4..09b7c46a2 100644 --- a/python/pkgs/isounidecode/default.nix +++ b/python/pkgs/isounidecode/default.nix @@ -2,26 +2,29 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "isounidecode"; version = "0.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-TbCpYsY0GCbJpprKq8L5I6WxJNU6M1voku8pFzvDHFs="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "isounidecode" ]; # no real tests included, fails to run - doCheck = false; meta = { description = "Python package for conversion and transliteration of unicode into ascii or iso-8859-1"; homepage = "https://github.com/redvasily/isounidecode"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/isoweek/default.nix b/python/pkgs/isoweek/default.nix index ae2ac8f9f..b8de90b0e 100644 --- a/python/pkgs/isoweek/default.nix +++ b/python/pkgs/isoweek/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "isoweek"; version = "1.3.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-c/P3usRD4Fo6tFwypyBIsMTybVPYFGLsSxQsdYHT/+g="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/gisle/isoweek"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/israel-rail-api/default.nix b/python/pkgs/israel-rail-api/default.nix index 8e740cfc0..b8a232481 100644 --- a/python/pkgs/israel-rail-api/default.nix +++ b/python/pkgs/israel-rail-api/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "israel-rail-api"; version = "0.1.5"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sh0oki"; repo = "israel-rail-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kcux4IBA3FoNnsqNGHsEta9OAkvjYB40234VlidrNzM="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/sh0oki/israel-rail-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/issubclass/default.nix b/python/pkgs/issubclass/default.nix index 03fe3dd5f..220e4663a 100644 --- a/python/pkgs/issubclass/default.nix +++ b/python/pkgs/issubclass/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "issubclass"; version = "0.1.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zmievsa"; repo = "issubclass"; - tag = version; + tag = finalAttrs.version; hash = "sha256-a4EUbQY5duicnxuwtpBQ/7UBmtmeU+ZaySEnT4lmgLs="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/issubclass"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/itanium-demangler/default.nix b/python/pkgs/itanium-demangler/default.nix index d15817136..da33622f3 100644 --- a/python/pkgs/itanium-demangler/default.nix +++ b/python/pkgs/itanium-demangler/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "itanium_demangler"; version = "1.1"; format = "wheel"; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/whitequark/python-itanium_demangler"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/item-synchronizer/default.nix b/python/pkgs/item-synchronizer/default.nix index b4828db11..382003ab7 100644 --- a/python/pkgs/item-synchronizer/default.nix +++ b/python/pkgs/item-synchronizer/default.nix @@ -7,7 +7,7 @@ bubop, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "item-synchronizer"; version = "1.1.5"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bergercookie"; repo = "item_synchronizer"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+mviKtCLlJhYV576Q07kcFJvtls5qohKSrqZtBqE/s4="; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { "bubop" ]; - propagatedBuildInputs = [ + dependencies = [ bidict bubop ]; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/bergercookie/item_synchronizer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/itemadapter/default.nix b/python/pkgs/itemadapter/default.nix index b46695db0..acd7b4467 100644 --- a/python/pkgs/itemadapter/default.nix +++ b/python/pkgs/itemadapter/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "itemadapter"; version = "0.13.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+hOce+KqgPiHSy8j0WXV1KpHxLhcVKtTC1Z/1faE8bQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/scrapy/itemadapter"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/itemdb/default.nix b/python/pkgs/itemdb/default.nix index deda65d27..ce7ce4a13 100644 --- a/python/pkgs/itemdb/default.nix +++ b/python/pkgs/itemdb/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "itemdb"; version = "1.3.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "almarklein"; repo = "itemdb"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-HXdOERq2td6CME8zWN0DRVkSlmdqTg2po7aJrOuITHE="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; homepage = "https://itemdb.readthedocs.io"; }; -} +}) diff --git a/python/pkgs/itemloaders/default.nix b/python/pkgs/itemloaders/default.nix index 2028745fc..40c3520ad 100644 --- a/python/pkgs/itemloaders/default.nix +++ b/python/pkgs/itemloaders/default.nix @@ -9,7 +9,7 @@ itemadapter, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "itemloaders"; version = "1.4.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scrapy"; repo = "itemloaders"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pHCvtiBtTgO2y3GUPFc0o9CcCtIMqluRXEJ2tl/tcwA="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/scrapy/itemloaders"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/iteration-utilities/default.nix b/python/pkgs/iteration-utilities/default.nix index f71e429a3..4a523a806 100644 --- a/python/pkgs/iteration-utilities/default.nix +++ b/python/pkgs/iteration-utilities/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iteration-utilities"; version = "0.13.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MSeifert04"; repo = "iteration_utilities"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SiqNUyuvsD5m5qz5ByYyVln3SSa4/D4EHpmM+pf8ngM="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/MSeifert04/iteration_utilities"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/iterative-telemetry/default.nix b/python/pkgs/iterative-telemetry/default.nix index 52e75dfa8..57b8fe030 100644 --- a/python/pkgs/iterative-telemetry/default.nix +++ b/python/pkgs/iterative-telemetry/default.nix @@ -10,7 +10,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iterative-telemetry"; version = "0.0.10"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = "telemetry-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+l9JH9MbN+Pai3MIcKZJObzoPGhQipfMd7T8v4SoSws="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/iterative/iterative-telemetry"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/itsdangerous/default.nix b/python/pkgs/itsdangerous/default.nix index c89405ed5..f2c00004d 100644 --- a/python/pkgs/itsdangerous/default.nix +++ b/python/pkgs/itsdangerous/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "itsdangerous"; version = "2.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4AUMC32h7qU/+vFJwM+7XG4uK2nEvvIsgfputz5fYXM="; }; @@ -22,4 +22,4 @@ buildPythonPackage rec { homepage = "https://itsdangerous.palletsprojects.com"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/itunespy/default.nix b/python/pkgs/itunespy/default.nix index 100036ecf..90123d072 100644 --- a/python/pkgs/itunespy/default.nix +++ b/python/pkgs/itunespy/default.nix @@ -7,7 +7,7 @@ pycountry, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "itunespy"; version = "1.6.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sleepyfran"; repo = "itunespy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QvSKJAZa8v0tGURXwo4Dwo73JqsYs1xsBHW0lcaM7bk="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/sleepyfran/itunespy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/itypes/default.nix b/python/pkgs/itypes/default.nix index 33f04198e..fed483dcf 100644 --- a/python/pkgs/itypes/default.nix +++ b/python/pkgs/itypes/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "itypes"; version = "1.2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tomchristie"; repo = "itypes"; - tag = version; + tag = finalAttrs.version; hash = "sha256-omQmXzO0rk2Zh26idAPosdMW/r0bFQ2v2HkxddOVUNI="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/tomchristie/itypes"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/j2lint/default.nix b/python/pkgs/j2lint/default.nix index e14cbc637..eae98430e 100644 --- a/python/pkgs/j2lint/default.nix +++ b/python/pkgs/j2lint/default.nix @@ -10,14 +10,14 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "j2lint"; version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "aristanetworks"; repo = "j2lint"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aT25Yq5GkQpZBgVNjYdV/afyqFanJkmqkDGMz2Yf+Ps="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { description = "Jinja2 Linter CLI"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jaconv/default.nix b/python/pkgs/jaconv/default.nix index f2e2e727d..a4f7e1300 100644 --- a/python/pkgs/jaconv/default.nix +++ b/python/pkgs/jaconv/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jaconv"; version = "0.5.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ikegami-yukino"; repo = "jaconv"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-W8vQsMcpsozPdYGFXZyka/8f9XXF3r+yR7qHkNZOhVI="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/ikegami-yukino/jaconv"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jalali-core/default.nix b/python/pkgs/jalali-core/default.nix index fababf304..9845436bc 100644 --- a/python/pkgs/jalali-core/default.nix +++ b/python/pkgs/jalali-core/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jalali-core"; version = "1.0.0"; pyproject = true; src = fetchPypi { pname = "jalali_core"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-9Ch8cMYwMj3PCjqybfkFuk1FHiMKwfZbO7L3d5eJSis="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/jalali-core/"; license = lib.licenses.lgpl2Only; }; -} +}) diff --git a/python/pkgs/jamo/default.nix b/python/pkgs/jamo/default.nix index 5c2292239..f1a75d045 100644 --- a/python/pkgs/jamo/default.nix +++ b/python/pkgs/jamo/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jamo"; version = "0.4.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JDongian"; repo = "python-jamo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QHI3Rqf1aQOsW49A/qnIwRnPuerbtyerf+eWIiEvyho="; }; @@ -22,9 +22,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "jamo" ]; meta = { - changelog = "https://github.com/JDongian/python-jamo/releases/tag/v${version}"; + changelog = "https://github.com/JDongian/python-jamo/releases/tag/v${finalAttrs.version}"; description = "Hangul syllable decomposition and synthesis using jamo"; homepage = "https://github.com/JDongian/python-jamo"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/janus/default.nix b/python/pkgs/janus/default.nix index 67ed1e4bf..c55f3e25c 100644 --- a/python/pkgs/janus/default.nix +++ b/python/pkgs/janus/default.nix @@ -6,13 +6,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "janus"; version = "2.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CXDzjg5yVABJbINKNopn7lUdw7WtCiV+Ey9bRvLnd3A="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/janus"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/jaraco-classes/default.nix b/python/pkgs/jaraco-classes/default.nix index 7af384699..571caf457 100644 --- a/python/pkgs/jaraco-classes/default.nix +++ b/python/pkgs/jaraco-classes/default.nix @@ -6,7 +6,7 @@ more-itertools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jaraco-classes"; version = "3.4.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.classes"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-pXDsLKiEru+UXcEBT4/cP1u8s9vSn1Zhf7Qnwy9Zr0I="; }; @@ -22,10 +22,10 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ more-itertools ]; + dependencies = [ more-itertools ]; meta = { description = "Utility functions for Python class constructs"; homepage = "https://github.com/jaraco/jaraco.classes"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jaraco-collections/default.nix b/python/pkgs/jaraco-collections/default.nix index b2d7078d4..af3bff43c 100644 --- a/python/pkgs/jaraco-collections/default.nix +++ b/python/pkgs/jaraco-collections/default.nix @@ -12,14 +12,14 @@ jaraco-text, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jaraco-collections"; version = "5.2.1"; pyproject = true; src = fetchPypi { pname = "jaraco_collections"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-2rgZcLrW8KtTsgdF8bAdo3km5MD81CUEaqReDY76GO0="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { description = "Models and classes to supplement the stdlib 'collections' module"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jaraco-context/default.nix b/python/pkgs/jaraco-context/default.nix index aba81e14b..c2d5b2496 100644 --- a/python/pkgs/jaraco-context/default.nix +++ b/python/pkgs/jaraco-context/default.nix @@ -7,7 +7,7 @@ backports-tarfile, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jaraco-context"; version = "6.1.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.context"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gkFRBgVu79o2wCZqVdqChND+763uR6lAuWFwYHxHIq8="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { dependencies = lib.optionals (pythonOlder "3.12") [ backports-tarfile ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "jaraco.context" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/jaraco.context"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jaraco-email/default.nix b/python/pkgs/jaraco-email/default.nix index 1b3e9ac91..95cfe0e14 100644 --- a/python/pkgs/jaraco-email/default.nix +++ b/python/pkgs/jaraco-email/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jaraco-email"; version = "3.1.1"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.email"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2dU+tbrP86Oy8ej1Xa0+fNRB83tGBTUsOWbZyQsMKu8="; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ aiosmtpd jaraco-text jaraco-collections @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/jaraco.email"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jaraco-envs/default.nix b/python/pkgs/jaraco-envs/default.nix index 44793b712..f53c110ce 100644 --- a/python/pkgs/jaraco-envs/default.nix +++ b/python/pkgs/jaraco-envs/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jaraco-envs"; version = "2.6.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.envs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yRMX0H6yWN8TiO/LGAr4HyrVS8ZhBjuR885/+UQscP0="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/jaraco.envs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jaraco-functools/default.nix b/python/pkgs/jaraco-functools/default.nix index b4579a824..e0340c837 100644 --- a/python/pkgs/jaraco-functools/default.nix +++ b/python/pkgs/jaraco-functools/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jaraco-functools"; version = "4.6.0"; pyproject = true; src = fetchPypi { pname = "jaraco_functools"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-iAxXfslyCzoFLVvGEfufImmz2HkC70JEDfRDuI5EMoA="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/jaraco.functools"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jaraco-itertools/default.nix b/python/pkgs/jaraco-itertools/default.nix index d138cb2f8..fdb043795 100644 --- a/python/pkgs/jaraco-itertools/default.nix +++ b/python/pkgs/jaraco-itertools/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jaraco-itertools"; version = "6.4.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.itertools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LjWkyY9I8BBYpFm8TT3kq4vk63pNQrnZ15haJCQ5xlk="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/jaraco.itertools"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jaraco-logging/default.nix b/python/pkgs/jaraco-logging/default.nix index 85ec550d2..bdbe94573 100644 --- a/python/pkgs/jaraco-logging/default.nix +++ b/python/pkgs/jaraco-logging/default.nix @@ -7,14 +7,14 @@ tempora, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jaraco-logging"; version = "3.4.0"; pyproject = true; src = fetchPypi { pname = "jaraco_logging"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-59bcg2hHfOaesdbthR2AWJahypQs4/0Xc1gDEbC3dfs="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/jaraco.logging"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jaraco-path/default.nix b/python/pkgs/jaraco-path/default.nix index 2b5950d47..5774991c7 100644 --- a/python/pkgs/jaraco-path/default.nix +++ b/python/pkgs/jaraco-path/default.nix @@ -7,7 +7,7 @@ stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jaraco-path"; version = "3.7.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.path"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uLkNMhB7aeDJ3fF0Ynjd8MD6+CTKKH8vsB5cH9RPcok="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.mit; broken = stdenv.hostPlatform.isDarwin; # pyobjc is missing }; -} +}) diff --git a/python/pkgs/jaraco-stream/default.nix b/python/pkgs/jaraco-stream/default.nix index 90ba60631..900bd3a52 100644 --- a/python/pkgs/jaraco-stream/default.nix +++ b/python/pkgs/jaraco-stream/default.nix @@ -6,14 +6,14 @@ more-itertools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jaraco-stream"; version = "3.0.4"; pyproject = true; src = fetchPypi { pname = "jaraco_stream"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-4rxQKOch7SzIUrluyaM/K3Zk6bLb+H7vvmF9EmZBk0s="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/jaraco.stream"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jaraco-text/default.nix b/python/pkgs/jaraco-text/default.nix index e3c3a7351..56757e0c6 100644 --- a/python/pkgs/jaraco-text/default.nix +++ b/python/pkgs/jaraco-text/default.nix @@ -13,14 +13,14 @@ inflect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jaraco-text"; version = "4.0.0"; pyproject = true; src = fetchPypi { pname = "jaraco_text"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-W3H+zqaatvk51MkGwE/uHtp2UA0WQRF99uxFuGXxDbA="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { description = "Module for text manipulation"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jarowinkler/default.nix b/python/pkgs/jarowinkler/default.nix index c0ba4a61a..4ae87e836 100644 --- a/python/pkgs/jarowinkler/default.nix +++ b/python/pkgs/jarowinkler/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jarowinkler"; version = "2.0.1"; @@ -17,13 +17,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "maxbachmann"; repo = "JaroWinkler"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-B3upTBNqMyi+CH7Zx04wceEXjGJnr6S3BIl87AQkfbo="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ rapidfuzz ]; + dependencies = [ rapidfuzz ]; nativeCheckInputs = [ hypothesis @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/maxbachmann/JaroWinkler"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/javaobj-py3/default.nix b/python/pkgs/javaobj-py3/default.nix index c8e27aea1..a02a20c93 100644 --- a/python/pkgs/javaobj-py3/default.nix +++ b/python/pkgs/javaobj-py3/default.nix @@ -1,24 +1,27 @@ { buildPythonPackage, fetchPypi, + # build-system + setuptools, lib, numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "javaobj-py3"; version = "0.4.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5OMlfvLPgaMzl4ek1c+STlTJHwlacj9tJYTa5h1Dlu0="; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; # Tests assume network connectivity - doCheck = false; pythonImportsCheck = [ "javaobj" ]; @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/tcalmant/python-javaobj"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/javaproperties/default.nix b/python/pkgs/javaproperties/default.nix index 4f65e03e1..9de6b23eb 100644 --- a/python/pkgs/javaproperties/default.nix +++ b/python/pkgs/javaproperties/default.nix @@ -6,7 +6,7 @@ python-dateutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.8.2"; pname = "javaproperties"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jwodder"; repo = "javaproperties"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-8Deo6icInp7QpTqa+Ou6l36/23skxKOYRef2GbumDqo="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/jwodder/javaproperties"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jax-jumpy/default.nix b/python/pkgs/jax-jumpy/default.nix index 48f4ef059..4b66adcd5 100644 --- a/python/pkgs/jax-jumpy/default.nix +++ b/python/pkgs/jax-jumpy/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jumpy"; version = "1.0.0"; src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "jumpy"; - rev = version; + tag = finalAttrs.version; hash = "sha256-tPQ/v2AVnAEC+08BVAvvgJ8Pj89nXZSn2tQ6nxXuSfA="; }; @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; pythonImportsCheck = [ "jumpy" ]; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/Farama-Foundation/Jumpy"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/jax-tap/default.nix b/python/pkgs/jax-tap/default.nix index 3a203b344..e6c329651 100644 --- a/python/pkgs/jax-tap/default.nix +++ b/python/pkgs/jax-tap/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { pname = "jax-tap"; version = "0.3.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "arcueil"; diff --git a/python/pkgs/jax/default.nix b/python/pkgs/jax/default.nix index 4db42825e..327cc507f 100644 --- a/python/pkgs/jax/default.nix +++ b/python/pkgs/jax/default.nix @@ -24,7 +24,6 @@ buildPythonPackage { pname = "jax"; version = "0.11.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "google"; diff --git a/python/pkgs/jaxlib/default.nix b/python/pkgs/jaxlib/default.nix index c123f48a4..0833f7968 100644 --- a/python/pkgs/jaxlib/default.nix +++ b/python/pkgs/jaxlib/default.nix @@ -91,8 +91,6 @@ buildPythonPackage { inherit version; format = "wheel"; - __structuredAttrs = true; - src = ( srcs."${pythonVersion}-${stdenv.hostPlatform.system}" or (throw "jaxlib-bin is not supported on ${stdenv.hostPlatform.system}") diff --git a/python/pkgs/jaxtyping/default.nix b/python/pkgs/jaxtyping/default.nix index 40c2b9844..da1cf1b1c 100644 --- a/python/pkgs/jaxtyping/default.nix +++ b/python/pkgs/jaxtyping/default.nix @@ -14,7 +14,6 @@ buildPythonPackage (finalAttrs: { pname = "jaxtyping"; version = "0.3.11"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "patrick-kidger"; @@ -31,8 +30,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "jaxtyping" ]; - doCheck = false; - meta = { description = "Type annotations and runtime checking for JAX arrays and PyTrees"; homepage = "https://github.com/patrick-kidger/jaxtyping"; diff --git a/python/pkgs/jaydebeapi/default.nix b/python/pkgs/jaydebeapi/default.nix index a8f1b072c..be3cc2177 100644 --- a/python/pkgs/jaydebeapi/default.nix +++ b/python/pkgs/jaydebeapi/default.nix @@ -2,25 +2,29 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, jpype1, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jaydebeapi"; version = "1.2.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "JayDeBeApi"; - inherit version; + inherit (finalAttrs) version; sha256 = "f25e9307fbb5960cb035394c26e37731b64cc465b197c4344cee85ec450ab92f"; }; - propagatedBuildInputs = [ jpype1 ]; + build-system = [ setuptools ]; + + dependencies = [ jpype1 ]; meta = { homepage = "https://github.com/baztian/jaydebeapi"; license = lib.licenses.lgpl2; description = "Use JDBC database drivers from Python 2/3 or Jython with a DB-API"; }; -} +}) diff --git a/python/pkgs/jc/default.nix b/python/pkgs/jc/default.nix index fd7981879..ce217d409 100644 --- a/python/pkgs/jc/default.nix +++ b/python/pkgs/jc/default.nix @@ -4,6 +4,8 @@ buildPackages, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, installShellFiles, ruamel-yaml, xmltodict, @@ -11,19 +13,21 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jc"; version = "1.25.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aufAR+Y5ocJNWSr8CLIb0TZM6a3B6jqS3Ji1WIOLzBU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ ruamel-yaml xmltodict pygments @@ -46,7 +50,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "jc" ]; # tests require timezone to set America/Los_Angeles - doCheck = false; meta = { description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output"; @@ -54,4 +57,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "jc"; }; -} +}) diff --git a/python/pkgs/jdatetime/default.nix b/python/pkgs/jdatetime/default.nix index c8c02174e..faf0233f9 100644 --- a/python/pkgs/jdatetime/default.nix +++ b/python/pkgs/jdatetime/default.nix @@ -6,13 +6,13 @@ jalali-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jdatetime"; version = "6.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5YEtfr9MZgmlVCMMwH3vyJ2cETQkNQ/i1bftfcUNMJc="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/slashmili/python-jalali"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/jdcal/default.nix b/python/pkgs/jdcal/default.nix index ca862199e..a677e2e6c 100644 --- a/python/pkgs/jdcal/default.nix +++ b/python/pkgs/jdcal/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jdcal"; version = "1.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ryhy4JbrjfIZwj8mifwzZmi9tD0ZQJS1zBcH4WQKz8g="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Module containing functions for converting between Julian dates and calendar dates"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/jeepney/default.nix b/python/pkgs/jeepney/default.nix index 525175e2a..1f2a457ad 100644 --- a/python/pkgs/jeepney/default.nix +++ b/python/pkgs/jeepney/default.nix @@ -9,7 +9,7 @@ trio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jeepney"; version = "0.9"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "takluyver"; repo = "jeepney"; - tag = version; + tag = finalAttrs.version; hash = "sha256-d8w/4PtDviTYDHO4EwaVbxlYk7CXtlv7vuR+o4LhfRs="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { description = "Pure Python DBus interface"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jello/default.nix b/python/pkgs/jello/default.nix index 03d49e55d..7e4aeb3e7 100644 --- a/python/pkgs/jello/default.nix +++ b/python/pkgs/jello/default.nix @@ -2,26 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, installShellFiles, pygments, unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jello"; version = "1.6.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jello"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RAQ04R1zDL9hk1q19GSFvdkxse5rJZXpboAondOoHEc="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ pygments ]; + dependencies = [ pygments ]; nativeCheckInputs = [ unittestCheckHook ]; @@ -37,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/kellyjonbrazil/jello"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jellyfin-apiclient-python/default.nix b/python/pkgs/jellyfin-apiclient-python/default.nix index 7168a031e..c8989ab78 100644 --- a/python/pkgs/jellyfin-apiclient-python/default.nix +++ b/python/pkgs/jellyfin-apiclient-python/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jellyfin-apiclient-python"; version = "1.15.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-apiclient-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+ZlJK1wbu/taOydgSOF7JNKcsLzqXph6m8PHww04QjI="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/jellyfin/jellyfin-apiclient-python"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/jellyfish/default.nix b/python/pkgs/jellyfish/default.nix index 7b3bee81e..9b2802a23 100644 --- a/python/pkgs/jellyfish/default.nix +++ b/python/pkgs/jellyfish/default.nix @@ -5,7 +5,7 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jellyfish"; version = "1.2.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jamesturk"; repo = "jellyfish"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jKz7FYzV66TUkJZfWDTy8GXmTZ6SU5jEdtkjYLDfS/8="; }; @@ -32,11 +32,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "jellyfish" ]; - doCheck = false; - meta = { description = "Python library for doing approximate and phonetic matching of strings"; homepage = "https://github.com/jamesturk/jellyfish"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jenkinsapi/default.nix b/python/pkgs/jenkinsapi/default.nix index 8f0e3929c..05ca32802 100644 --- a/python/pkgs/jenkinsapi/default.nix +++ b/python/pkgs/jenkinsapi/default.nix @@ -11,7 +11,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jenkinsapi"; version = "0.3.23"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pycontribs"; repo = "jenkinsapi"; - tag = version; + tag = finalAttrs.version; hash = "sha256-NtILbbXu4dtYda28WaFiGkICf0bOmVMKOOnnrHptxsg="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/salimfadhley/jenkinsapi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jieba/default.nix b/python/pkgs/jieba/default.nix index 96666456c..aa7156ea1 100644 --- a/python/pkgs/jieba/default.nix +++ b/python/pkgs/jieba/default.nix @@ -2,23 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, python, isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jieba"; version = "0.42.1"; - format = "setuptools"; + pyproject = true; # no tests in PyPI tarball src = fetchFromGitHub { owner = "fxsjy"; repo = "jieba"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "028vmd6sj6wn9l1ilw7qfmlpyiysnlzdgdlhwxs6j4fvq0gyrwxk"; }; + build-system = [ setuptools ]; + # UnicodeEncodeError doCheck = isPy3k; @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/fxsjy/jieba"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jinja2-ansible-filters/default.nix b/python/pkgs/jinja2-ansible-filters/default.nix index d267e61fe..a118380ae 100644 --- a/python/pkgs/jinja2-ansible-filters/default.nix +++ b/python/pkgs/jinja2-ansible-filters/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, jinja2, pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jinja2-ansible-filters"; version = "1.3.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-B8EM9E1wc/TwEQLKEtmi3DG0HUfkxh7ZLvam0mabNWs="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ jinja2 pyyaml ]; # no tests include in sdist, and source not available - doCheck = false; pythonImportsCheck = [ "jinja2_ansible_filters" ]; @@ -31,4 +34,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/jinja2-ansible-filters/"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/jinja2-git/default.nix b/python/pkgs/jinja2-git/default.nix index 803237162..5b08f00d3 100644 --- a/python/pkgs/jinja2-git/default.nix +++ b/python/pkgs/jinja2-git/default.nix @@ -6,7 +6,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jinja2-git"; version = "1.4.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wemake-services"; repo = "jinja2-git"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ZcKRLHcZ/rpiUyYK4ifDJaZriN+YyRF1RKCjIKum98U="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ jinja2 ]; # the tests need to be run on the git repository - doCheck = false; pythonImportsCheck = [ "jinja2_git" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { description = "Jinja2 extension to handle git-specific things"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jinja2-humanize-extension/default.nix b/python/pkgs/jinja2-humanize-extension/default.nix index bceaa981e..f8320716d 100644 --- a/python/pkgs/jinja2-humanize-extension/default.nix +++ b/python/pkgs/jinja2-humanize-extension/default.nix @@ -7,7 +7,7 @@ jinja2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jinja2-humanize-extension"; version = "0.4.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "metwork-framework"; repo = "jinja2_humanize_extension"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bSSwPCPLIWIRhIgaSwHnVTj5mpvwn259GXYeGr5NHBQ="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/metwork-framework/jinja2_humanize_extension"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jinja2-pluralize/default.nix b/python/pkgs/jinja2-pluralize/default.nix index 15cd35d2d..164c16dcc 100644 --- a/python/pkgs/jinja2-pluralize/default.nix +++ b/python/pkgs/jinja2-pluralize/default.nix @@ -7,14 +7,14 @@ inflect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jinja2-pluralize"; version = "0.3.0"; pyproject = true; src = fetchPypi { pname = "jinja2_pluralize"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-31wtUBe5tUwKZst5DMqfwIlFg3w9v8MjWJID8f+3PBw="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/audreyr/jinja2_pluralize"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jinja2-strcase/default.nix b/python/pkgs/jinja2-strcase/default.nix index 44c186f86..4a930d5ad 100644 --- a/python/pkgs/jinja2-strcase/default.nix +++ b/python/pkgs/jinja2-strcase/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jinja2-strcase"; version = "0.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2Qw3971A00WqzI94sIf2bmxapMloqyOnkVc/z3VsM3k="; }; @@ -29,11 +29,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "jinja2_strcase" ]; - doCheck = false; # no tests - meta = { homepage = "https://github.com/marchmiel/jinja2-strcase"; description = "Library for converting string case in Jinja2 templates"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jinja2-time/default.nix b/python/pkgs/jinja2-time/default.nix index 4f64c4af2..4883f5916 100644 --- a/python/pkgs/jinja2-time/default.nix +++ b/python/pkgs/jinja2-time/default.nix @@ -3,21 +3,25 @@ buildPythonPackage, fetchpatch, fetchPypi, + # build-system + setuptools, arrow, freezegun, jinja2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jinja2-time"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0h0dr7cfpjnjj8bgl2vk9063a53649pn37wnlkd8hxjy656slkni"; }; + build-system = [ setuptools ]; + patches = [ # fix usage of arrow in tests (fetchpatch { @@ -26,7 +30,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + dependencies = [ arrow jinja2 ]; @@ -37,4 +41,4 @@ buildPythonPackage rec { description = "Jinja2 Extension for Dates and Times"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jinja2/default.nix b/python/pkgs/jinja2/default.nix index f9fe89bf4..c44eaaaeb 100644 --- a/python/pkgs/jinja2/default.nix +++ b/python/pkgs/jinja2/default.nix @@ -13,13 +13,13 @@ sphinx-issues, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jinja2"; version = "3.1.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ATf7BZkNNfEnWlh+mu5tVtqCH8g0kaD7g4GDvkP2bW0="; }; @@ -48,8 +48,8 @@ buildPythonPackage rec { # Forge look and feel of multi-output derivation as best as we can. # # Using 'outputs = [ "doc" ];' breaks a lot of assumptions. - pname = "${pname}-doc"; - inherit src version; + pname = "${finalAttrs.pname}-doc"; + inherit (finalAttrs) src version meta; patches = [ # Fix import of "sphinxcontrib-log-cabinet" @@ -68,7 +68,6 @@ buildPythonPackage rec { ]; inherit (python) pythonVersion; - inherit meta; }; meta = { description = "Very fast and expressive template engine"; @@ -81,4 +80,4 @@ buildPythonPackage rec { syntax. Then the template is passed data to render the final document. ''; }; -} +}) diff --git a/python/pkgs/jira/default.nix b/python/pkgs/jira/default.nix index 1da5da887..e72d9df15 100644 --- a/python/pkgs/jira/default.nix +++ b/python/pkgs/jira/default.nix @@ -17,7 +17,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jira"; version = "3.10.5"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pycontribs"; repo = "jira"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Gj9RmNJwmYQviXeNLL6WWFIO91jy6zY/s29Gy18lzyA="; }; @@ -60,7 +60,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "jira" ]; # impure tests because of connectivity attempts to jira servers - doCheck = false; meta = { description = "Library to interact with the JIRA REST API"; @@ -68,4 +67,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; mainProgram = "jirashell"; }; -} +}) diff --git a/python/pkgs/jiter/default.nix b/python/pkgs/jiter/default.nix index 9776babe3..1e63d9774 100644 --- a/python/pkgs/jiter/default.nix +++ b/python/pkgs/jiter/default.nix @@ -6,7 +6,7 @@ libiconv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jiter"; version = "0.12.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pydantic"; repo = "jiter"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-d87RUXKEmZXxVQZnAvjwRKSP6F3Z+kXxg/LdY2l9B+k="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydantic/jiter/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jiwer/default.nix b/python/pkgs/jiwer/default.nix index 6c6e80172..2fe5f355c 100644 --- a/python/pkgs/jiwer/default.nix +++ b/python/pkgs/jiwer/default.nix @@ -7,7 +7,7 @@ click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jiwer"; version = "4.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jitsi"; repo = "jiwer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iyFcxZGYMeQXSZBHJg7kBWyOciZyEV7gSzSy4SvBGzw="; }; @@ -32,7 +32,7 @@ buildPythonPackage rec { description = "Simple and fast python package to evaluate an automatic speech recognition system"; mainProgram = "jiwer"; homepage = "https://github.com/jitsi/jiwer"; - changelog = "https://github.com/jitsi/jiwer/releases/tag/v${version}"; + changelog = "https://github.com/jitsi/jiwer/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/jmp/default.nix b/python/pkgs/jmp/default.nix index 480a001ca..ae9e05d2a 100644 --- a/python/pkgs/jmp/default.nix +++ b/python/pkgs/jmp/default.nix @@ -1,26 +1,30 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, jax, jaxlib, lib, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jmp"; version = "0.0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "deepmind"; repo = "jmp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+PefZU1209vvf1SfF8DXiTvKYEnZ4y8iiIr8yKikx9Y="; }; + build-system = [ setuptools ]; + # Wheel requires only `numpy`, but the import needs `jax`. - propagatedBuildInputs = [ jax ]; + dependencies = [ jax ]; pythonImportsCheck = [ "jmp" ]; @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/deepmind/jmp"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/joblib/default.nix b/python/pkgs/joblib/default.nix index e19a6eca5..7c8f93deb 100644 --- a/python/pkgs/joblib/default.nix +++ b/python/pkgs/joblib/default.nix @@ -12,19 +12,19 @@ psutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "joblib"; version = "1.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LMyWeFsSBGwI/W1Vg5wShXgxtUo8FnP/rdLwS/xO2gM="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cloudpickle lz4 psutil @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://joblib.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/josepy/default.nix b/python/pkgs/josepy/default.nix index 31e3656fd..bfd0fbaaf 100644 --- a/python/pkgs/josepy/default.nix +++ b/python/pkgs/josepy/default.nix @@ -7,13 +7,13 @@ pyopenssl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "josepy"; version = "2.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dMAzFRM3yFT4Pv5TBaKRaGzvcjtLlwxDz+cnDPSmd6k="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { description = "JOSE protocol implementation in Python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/joserfc/default.nix b/python/pkgs/joserfc/default.nix index c72915c64..f07f6873c 100644 --- a/python/pkgs/joserfc/default.nix +++ b/python/pkgs/joserfc/default.nix @@ -11,7 +11,7 @@ pycryptodome, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "joserfc"; version = "1.7.5"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "authlib"; repo = "joserfc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xwCUn8Hy9xWG5QRt3MYuUvq56PI+HBNLBNf1brOnDDY="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/authlib/joserfc"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jplephem/default.nix b/python/pkgs/jplephem/default.nix index 476e622e9..0aad9d750 100644 --- a/python/pkgs/jplephem/default.nix +++ b/python/pkgs/jplephem/default.nix @@ -2,26 +2,29 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jplephem"; version = "2.24"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NU/hra4CImSrRvGK+2ryYhEnfP17PvkEAHVfyr6TvBE="; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; # Weird import error, only happens in testing: # File "/build/jplephem-2.17/jplephem/daf.py", line 10, in # from numpy import array as numpy_array, ndarray # ImportError: cannot import name 'array' from 'sys' (unknown location) - doCheck = false; pythonImportsCheck = [ "jplephem" ]; @@ -30,4 +33,4 @@ buildPythonPackage rec { description = "Python version of NASA DE4xx ephemerides, the basis for the Astronomical Alamanac"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jproperties/default.nix b/python/pkgs/jproperties/default.nix index 7c9fc8702..f16c9d3e1 100644 --- a/python/pkgs/jproperties/default.nix +++ b/python/pkgs/jproperties/default.nix @@ -9,7 +9,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jproperties"; version = "2.1.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Tblue"; repo = "python-jproperties"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wnhEcPWAFUXR741/LZT3TXqxrU70JZe+90AkVEA3A+k="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "propconv"; }; -} +}) diff --git a/python/pkgs/jpype1/default.nix b/python/pkgs/jpype1/default.nix index 16e95a90d..bd51d8d2f 100644 --- a/python/pkgs/jpype1/default.nix +++ b/python/pkgs/jpype1/default.nix @@ -11,7 +11,7 @@ pyinstaller, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jpype1"; version = "1.7.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "originell"; repo = "jpype"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6QKX43XyyBCwOxunQz8lFV1Svh/IXjLtpElbWEx37QQ="; }; @@ -42,7 +42,6 @@ buildPythonPackage rec { # Cannot find various classes. If you want to fix this # take a look at the opensuse packaging: # https://build.opensuse.org/projects/openSUSE:Factory/packages/python-JPype1/files/python-JPype1.spec?expand=1 - doCheck = false; pythonImportsCheck = [ "jpype" "jpype.imports" @@ -58,4 +57,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; description = "Python to Java bridge"; }; -} +}) diff --git a/python/pkgs/jq/default.nix b/python/pkgs/jq/default.nix index c459cb065..aee70fbf8 100644 --- a/python/pkgs/jq/default.nix +++ b/python/pkgs/jq/default.nix @@ -3,6 +3,8 @@ buildPythonPackage, cython, fetchFromGitHub, + # build-system + setuptools, oniguruma, pkgs, }: @@ -10,18 +12,20 @@ let jq-c = pkgs.jq; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jq"; version = "1.12.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mwilliamson"; repo = "jq.py"; - tag = version; + tag = finalAttrs.version; hash = "sha256-glWEqoS+QaoIiBJu9DXd+VvhPnWOgRT4VaYfMpjbR5g="; }; + build-system = [ setuptools ]; + env.JQPY_USE_SYSTEM_LIBS = 1; nativeBuildInputs = [ cython ]; @@ -42,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/mwilliamson/jq.py"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/jschema-to-python/default.nix b/python/pkgs/jschema-to-python/default.nix index 3934d2839..5017c9689 100644 --- a/python/pkgs/jschema-to-python/default.nix +++ b/python/pkgs/jschema-to-python/default.nix @@ -12,14 +12,14 @@ jsonpickle, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jschema-to-python"; version = "1.2.3"; pyproject = true; src = fetchPypi { pname = "jschema_to_python"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-dv8U/l0wRwjMrRKE5LEflqZYlJox7n+u2eCZUnlUm5E="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/microsoft/jschema-to-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jschon/default.nix b/python/pkgs/jschon/default.nix index 6a4c3cfff..64319fa30 100644 --- a/python/pkgs/jschon/default.nix +++ b/python/pkgs/jschon/default.nix @@ -12,7 +12,7 @@ pytest-xdist, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jschon"; version = "0.11.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "marksparkza"; repo = "jschon"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uOvEIEUEILsoLuV5U9AJCQAlT4iHQhsnSt65gfCiW0k="; fetchSubmodules = true; }; @@ -76,4 +76,4 @@ buildPythonPackage rec { homepage = "https://github.com/marksparkza/jschon"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jsmin/default.nix b/python/pkgs/jsmin/default.nix index 67af7c403..0c3d15bd6 100644 --- a/python/pkgs/jsmin/default.nix +++ b/python/pkgs/jsmin/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsmin"; version = "3.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-wJWaEh75RULoB6Z0FCYG9+kCFKKz0esXMAJEu7XMK/w="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; enabledTestPaths = [ "jsmin/test.py" ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/tikitu/jsmin/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/json-api-doc/default.nix b/python/pkgs/json-api-doc/default.nix index 7ca3463c1..ecd9ede14 100644 --- a/python/pkgs/json-api-doc/default.nix +++ b/python/pkgs/json-api-doc/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "json-api-doc"; version = "0.15.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "julien-duponchelle"; repo = "json-api-doc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-r6XduJ2GIr2hGen6hoNIdE3yqPzHJ9xAFOSbMgErsNA="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/julien-duponchelle/json-api-doc"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/json-flatten/default.nix b/python/pkgs/json-flatten/default.nix index 1a4d3c8dd..dc89a99a2 100644 --- a/python/pkgs/json-flatten/default.nix +++ b/python/pkgs/json-flatten/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "json-flatten"; version = "0.3.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = "json-flatten"; - tag = version; + tag = finalAttrs.version; hash = "sha256-zAaunWuFAokC16FwHRHgyvq27pNUEGXJfSqTQ1wvXE8="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; homepage = "https://github.com/simonw/json-flatten"; }; -} +}) diff --git a/python/pkgs/json-logging/default.nix b/python/pkgs/json-logging/default.nix index a49c04f81..31e15478b 100644 --- a/python/pkgs/json-logging/default.nix +++ b/python/pkgs/json-logging/default.nix @@ -14,7 +14,7 @@ uvicorn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "json-logging"; version = "1.5.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bobbui"; repo = "json-logging-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-r2ttPFvlN+hqMxBLPkr5hOz0UKNX4NRoXmLMXhTZ/VY="; }; @@ -66,4 +66,4 @@ buildPythonPackage rec { homepage = "https://github.com/bobbui/json-logging-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/json-merge-patch/default.nix b/python/pkgs/json-merge-patch/default.nix index 7cbf38aff..828c39d20 100644 --- a/python/pkgs/json-merge-patch/default.nix +++ b/python/pkgs/json-merge-patch/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "json-merge-patch"; version = "0.3.0"; pyproject = true; src = fetchPypi { pname = "json_merge_patch"; - inherit version; + inherit (finalAttrs) version; sha256 = "sha256-SgItePwvCctJ2Wxkbvw4DTterStcfaviLDkowsLpxOA="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/open-contracting/json-merge-patch"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/json-repair/default.nix b/python/pkgs/json-repair/default.nix index 5f060bed6..6b6b48fc3 100644 --- a/python/pkgs/json-repair/default.nix +++ b/python/pkgs/json-repair/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "json-repair"; version = "0.63.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mangiucugna"; repo = "json_repair"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VRRtL8X9egdqdz6Celw1CGGTuWd9YMVbq/uHwHtmv64="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "json_repair"; }; -} +}) diff --git a/python/pkgs/json-rpc/default.nix b/python/pkgs/json-rpc/default.nix index c44410ef3..ced784391 100644 --- a/python/pkgs/json-rpc/default.nix +++ b/python/pkgs/json-rpc/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "json-rpc"; version = "1.15.0"; pyproject = true; src = fetchPypi { pname = "json-rpc"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-5kQdVsHc1UJByTfQotzRk73wvcU5tTFlJHE/VUt/hbk="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/pavlov99/json-rpc"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/json-tricks/default.nix b/python/pkgs/json-tricks/default.nix index 7b360dbae..1aa40cabb 100644 --- a/python/pkgs/json-tricks/default.nix +++ b/python/pkgs/json-tricks/default.nix @@ -1,21 +1,25 @@ { lib, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "json-tricks"; version = "3.17.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mverleg"; repo = "pyjson_tricks"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xddMc4PvVI+mqB3eeVqECZmdeSKAURsdbOnUAXahqM0="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "json_tricks" ]; meta = { @@ -23,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/mverleg/pyjson_tricks"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/json2html/default.nix b/python/pkgs/json2html/default.nix index ba044fc89..6cd7a932b 100644 --- a/python/pkgs/json2html/default.nix +++ b/python/pkgs/json2html/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "json2html"; version = "1.3.0"; pyproject = true; @@ -13,14 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "softvar"; repo = "json2html"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Y+mwJ0p4Q2TKMU8qQvuvo08RiMdsReO7psgXaiW9ntk="; }; build-system = [ setuptools ]; # no proper test available - doCheck = false; pythonImportsCheck = [ "json2html" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/softvar/json2html"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/json5/default.nix b/python/pkgs/json5/default.nix index dda3e165c..0b1b83fc4 100644 --- a/python/pkgs/json5/default.nix +++ b/python/pkgs/json5/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "json5"; version = "0.13.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dpranke"; repo = "pyjson5"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KL5YsWSHS8xI+lQB+ZtdEKUHGKICOduZsBd51z4jItw="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "pyjson5"; }; -} +}) diff --git a/python/pkgs/jsonable/default.nix b/python/pkgs/jsonable/default.nix index 1472e8f48..130c95b2b 100644 --- a/python/pkgs/jsonable/default.nix +++ b/python/pkgs/jsonable/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonable"; version = "0.3.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "halfak"; repo = "python-jsonable"; - tag = version; + tag = finalAttrs.version; hash = "sha256-3FIzG2djSZOPDdoYeKqs3obQjgHrFtyp0sdBwZakkHA="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/halfak/python-jsonable"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jsonalias/default.nix b/python/pkgs/jsonalias/default.nix index 48a2d4703..20a683531 100644 --- a/python/pkgs/jsonalias/default.nix +++ b/python/pkgs/jsonalias/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "jsonalias" ]; # Module has no tests - doCheck = false; meta = { description = "Library that defines a Json type alias for Python"; diff --git a/python/pkgs/jsonconversion/default.nix b/python/pkgs/jsonconversion/default.nix index 2af4079d9..d8cf633d5 100644 --- a/python/pkgs/jsonconversion/default.nix +++ b/python/pkgs/jsonconversion/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonconversion"; version = "1.2.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DLR-RM"; repo = "python-jsonconversion"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yWRpILAkwCvgh5bMiN9/XmS6U9zIQdDS8KVeTYxzDDw="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/DLR-RM/python-jsonconversion"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/jsondiff/default.nix b/python/pkgs/jsondiff/default.nix index 8fe7fa792..4318bbdd5 100644 --- a/python/pkgs/jsondiff/default.nix +++ b/python/pkgs/jsondiff/default.nix @@ -7,13 +7,13 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsondiff"; version = "2.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZY0WLIqGuobeJjA82Gp7N+GyweyYtWmmDiymGAVF9/4="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { description = "Diff JSON and JSON-like structures in Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jsonfeed/default.nix b/python/pkgs/jsonfeed/default.nix index 89c8c8513..68e34dec0 100644 --- a/python/pkgs/jsonfeed/default.nix +++ b/python/pkgs/jsonfeed/default.nix @@ -6,13 +6,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonfeed"; version = "0.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Etfi59oOCrLHavLRMQo3HASFnydrBnsyEtGUgcsv1aQ="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { dependencies = [ requests ]; # Module has no tests, only a placeholder - doCheck = false; pythonImportsCheck = [ "jsonfeed" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/jsonfeed/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/jsonformatter/default.nix b/python/pkgs/jsonformatter/default.nix index d7a7932ce..2330a09f6 100644 --- a/python/pkgs/jsonformatter/default.nix +++ b/python/pkgs/jsonformatter/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonformatter"; version = "0.3.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-r3GuFTSoDW9g+NXue/pwwuRTie2APtlCOfQwW3xoEF0="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/MyColorfulDays/jsonformatter"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/jsonlines/default.nix b/python/pkgs/jsonlines/default.nix index 8c60adeb9..22d736485 100644 --- a/python/pkgs/jsonlines/default.nix +++ b/python/pkgs/jsonlines/default.nix @@ -2,22 +2,26 @@ lib, attrs, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonlines"; version = "4.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "wbolster"; repo = "jsonlines"; - rev = version; + tag = finalAttrs.version; hash = "sha256-KNEJdAxEgd0NGPnk9J51C3yUN2e6Cvvevth0iKOMlhE="; }; - propagatedBuildInputs = [ attrs ]; + build-system = [ setuptools ]; + + dependencies = [ attrs ]; pythonImportsCheck = [ "jsonlines" ]; meta = { @@ -25,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/wbolster/jsonlines"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jsonmerge/default.nix b/python/pkgs/jsonmerge/default.nix index 5f8d2213a..61f9daf60 100644 --- a/python/pkgs/jsonmerge/default.nix +++ b/python/pkgs/jsonmerge/default.nix @@ -6,13 +6,13 @@ jsonschema, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonmerge"; version = "1.9.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xDdX4BgLDhm3rkwTCtQqB8xYDDGRL2H0gj6Ory+jlKM="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/avian2/jsonmerge"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jsonpatch/default.nix b/python/pkgs/jsonpatch/default.nix index 63b3dd5a3..1adbba6af 100644 --- a/python/pkgs/jsonpatch/default.nix +++ b/python/pkgs/jsonpatch/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, jsonpointer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonpatch"; version = "1.33"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "stefankoegl"; repo = "python-json-patch"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JHBB64LExzHQVoFF2xcsqGlNWX/YeEBa1M/TmfeQLWI="; }; - propagatedBuildInputs = [ jsonpointer ]; + build-system = [ setuptools ]; + + dependencies = [ jsonpointer ]; pythonImportsCheck = [ "jsonpatch" ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/stefankoegl/python-json-patch"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jsonpath-ng/default.nix b/python/pkgs/jsonpath-ng/default.nix index aae9d19ff..0967326eb 100644 --- a/python/pkgs/jsonpath-ng/default.nix +++ b/python/pkgs/jsonpath-ng/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonpath-ng"; version = "1.7.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "h2non"; repo = "jsonpath-ng"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sfIqEc5SsNQYxK+Ur00fFdVoC0ysOkHrx4Cq/3SpGHw="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "jsonpath_ng"; }; -} +}) diff --git a/python/pkgs/jsonpath-python/default.nix b/python/pkgs/jsonpath-python/default.nix index 3fa1f65ac..fa7d5ab19 100644 --- a/python/pkgs/jsonpath-python/default.nix +++ b/python/pkgs/jsonpath-python/default.nix @@ -5,12 +5,12 @@ lib, pytest-benchmark, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonpath-python"; version = "1.1.6"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "jsonpath_python"; hash = "sha256-3e2ZMrTsQfuHJuCcg6+k5r5hj5OMLbKHzCqBcjxjlnE="; }; @@ -22,4 +22,4 @@ buildPythonPackage rec { description = "More powerful JSONPath implementations in modern python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jsonpath-rw/default.nix b/python/pkgs/jsonpath-rw/default.nix index d4b5ecd8a..c4efc7ebc 100644 --- a/python/pkgs/jsonpath-rw/default.nix +++ b/python/pkgs/jsonpath-rw/default.nix @@ -8,13 +8,13 @@ decorator, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonpath-rw"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BcRxKBxFrhE/YQPRJo7HpIMaLpaqgN5F7cibEfrE++w="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/kennknowles/python-jsonpath-rw"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/jsonpath/default.nix b/python/pkgs/jsonpath/default.nix index f1fc4a5a7..f841d6d02 100644 --- a/python/pkgs/jsonpath/default.nix +++ b/python/pkgs/jsonpath/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonpath"; version = "0.82.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2H7yvLze1o7pa8NMGAm2lFfs7JsMTdRxZYoSvTkQAtE="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://www.ultimate.com/phil/python/#jsonpath"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jsonpickle/default.nix b/python/pkgs/jsonpickle/default.nix index a9d7ec762..bc9afe0d1 100644 --- a/python/pkgs/jsonpickle/default.nix +++ b/python/pkgs/jsonpickle/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonpickle"; version = "4.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iv7RiqGJ/YHi6DO0JrtK9IVZSSHwsdNsIAH8Vjei8hA="; }; @@ -21,8 +21,6 @@ buildPythonPackage rec { setuptools-scm ]; - doCheck = false; - pythonImportsCheck = [ "jsonpickle" ]; meta = { @@ -30,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/jsonpickle/jsonpickle"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jsonpointer/default.nix b/python/pkgs/jsonpointer/default.nix index 220c58e95..ce04fb742 100644 --- a/python/pkgs/jsonpointer/default.nix +++ b/python/pkgs/jsonpointer/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonpointer"; version = "3.1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-C4AcfbM6kEAk9gBNUm3MU7u4pKD04yv9EL6t9grfGQA="; }; + build-system = [ setuptools ]; + meta = { description = "Resolve JSON Pointers in Python"; mainProgram = "jsonpointer"; homepage = "https://github.com/stefankoegl/python-json-pointer"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/jsonref/default.nix b/python/pkgs/jsonref/default.nix index cfba22725..f5324cd5a 100644 --- a/python/pkgs/jsonref/default.nix +++ b/python/pkgs/jsonref/default.nix @@ -6,7 +6,7 @@ pdm-pep517, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonref"; version = "1.1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gazpachoking"; repo = "jsonref"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tOhabmqCkktJUZjCrzjOjUGgA/X6EVz0KqehyLtigfc="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/gazpachoking/jsonref"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jsonrpc-async/default.nix b/python/pkgs/jsonrpc-async/default.nix index 0e1cc69a2..25a0568e4 100644 --- a/python/pkgs/jsonrpc-async/default.nix +++ b/python/pkgs/jsonrpc-async/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonrpc-async"; version = "2.1.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "emlove"; repo = "jsonrpc-async"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WcO2mj5QYZTMnFTNo1ABgpJPxM+GREVIf+z9viFDJHM="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/emlove/jsonrpc-async"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jsonrpc-base/default.nix b/python/pkgs/jsonrpc-base/default.nix index 7a77d234e..675dd9bd7 100644 --- a/python/pkgs/jsonrpc-base/default.nix +++ b/python/pkgs/jsonrpc-base/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonrpc-base"; version = "2.2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "emlove"; repo = "jsonrpc-base"; - tag = version; + tag = finalAttrs.version; hash = "sha256-AbpuAW+wuGc+Vj4FDFlyB2YbiwDxPLuyAGiNcmGU+Ss="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/emlove/jsonrpc-base"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jsonrpclib-pelix/default.nix b/python/pkgs/jsonrpclib-pelix/default.nix index c776317ca..613c24b59 100644 --- a/python/pkgs/jsonrpclib-pelix/default.nix +++ b/python/pkgs/jsonrpclib-pelix/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonrpclib-pelix"; version = "1.2.0"; pyproject = true; src = fetchPypi { pname = "jsonrpclib_pelix"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-NTtmcHwPxCY+3I/Wu9Rxt67egjqD5NvxYUsMg67iDxg="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { description = "JSON RPC client library - Pelix compatible fork"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/jsonschema-path/default.nix b/python/pkgs/jsonschema-path/default.nix index c0941be48..0e976cc9d 100644 --- a/python/pkgs/jsonschema-path/default.nix +++ b/python/pkgs/jsonschema-path/default.nix @@ -8,7 +8,7 @@ referencing, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonschema-path"; version = "0.5.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "p1c2u"; repo = "jsonschema-path"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CDDwhIlwytUPVwq/+0T5kVzl8viJfSalSIxC5VrQdgs="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/p1c2u/jsonschema-path"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/jsonschema-rs/default.nix b/python/pkgs/jsonschema-rs/default.nix index 96d7ea5f1..c89813a1d 100644 --- a/python/pkgs/jsonschema-rs/default.nix +++ b/python/pkgs/jsonschema-rs/default.nix @@ -8,7 +8,7 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonschema-rs"; version = "0.46.5"; @@ -16,13 +16,13 @@ buildPythonPackage rec { # Fetching from Pypi, because there is no Cargo.lock in the GitHub repo. src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "jsonschema_rs"; hash = "sha256-hX434HWi2fbyPepYpVmlW2Y9OHmiUhcABLVpBz2rHvM="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-HnrbyfuKIaYKs3ux8Du/PabPNpNu1v37Qm/5gJM6arw="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/Stranger6667/jsonschema/tree/master/crates/jsonschema-py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jsonschema-specifications/default.nix b/python/pkgs/jsonschema-specifications/default.nix index b849713e8..bbd21a057 100644 --- a/python/pkgs/jsonschema-specifications/default.nix +++ b/python/pkgs/jsonschema-specifications/default.nix @@ -7,14 +7,14 @@ referencing, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonschema-specifications"; version = "2025.9.1"; pyproject = true; src = fetchPypi { pname = "jsonschema_specifications"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-tUCYfyOedFYTx6kXbz7bcrgypKxGXPAnEiiDl4MrXo0="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-jsonschema/jsonschema-specifications"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jsonschema/default.nix b/python/pkgs/jsonschema/default.nix index 08b5309be..43e8d96c1 100644 --- a/python/pkgs/jsonschema/default.nix +++ b/python/pkgs/jsonschema/default.nix @@ -23,13 +23,13 @@ webcolors, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonschema"; version = "4.26.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-DCZwfi762Kob/Ft84XDz/MwuSRj/hZibqf+p+ssr4yY="; }; @@ -81,4 +81,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "jsonschema"; }; -} +}) diff --git a/python/pkgs/jsonslicer/default.nix b/python/pkgs/jsonslicer/default.nix index 66e92fbec..f1b8a175a 100644 --- a/python/pkgs/jsonslicer/default.nix +++ b/python/pkgs/jsonslicer/default.nix @@ -8,7 +8,7 @@ yajl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonslicer"; version = "0.1.8"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AMDmi3"; repo = "jsonslicer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-nPifyqr+MaFqoCYFbFSSBDjvifpX0CFnHCdMCvhwYTA="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/AMDmi3/jsonslicer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jsonstreams/default.nix b/python/pkgs/jsonstreams/default.nix index 0d4fc5bd9..085dcb10d 100644 --- a/python/pkgs/jsonstreams/default.nix +++ b/python/pkgs/jsonstreams/default.nix @@ -3,23 +3,27 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonstreams"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "dcbaker"; repo = "jsonstreams"; - rev = version; + tag = finalAttrs.version; sha256 = "0qw74wz9ngz9wiv89vmilbifsbvgs457yn1bxnzhrh7g4vs2wcav"; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -36,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/dcbaker/jsonstreams"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jsonxs/default.nix b/python/pkgs/jsonxs/default.nix index c1ea24900..f8c76bef6 100644 --- a/python/pkgs/jsonxs/default.nix +++ b/python/pkgs/jsonxs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "fboender"; repo = "jsonxs"; - rev = "v0.6"; + tag = "v0.6"; hash = "sha256-CmKK+qStb9xjmEACY41tQnffD4cMUUQPb74Cni5FTEk="; }; diff --git a/python/pkgs/jstyleson/default.nix b/python/pkgs/jstyleson/default.nix index ca7001f6b..76589397e 100644 --- a/python/pkgs/jstyleson/default.nix +++ b/python/pkgs/jstyleson/default.nix @@ -2,13 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, }: buildPythonPackage { pname = "jstyleson"; version = "0.0.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "linjackson78"; @@ -17,6 +19,8 @@ buildPythonPackage { hash = "sha256-s/0DDfy+07TuUNjHPqKRT3xMMQl6spZCacB7Dweof7A="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "jstyleson" ]; diff --git a/python/pkgs/jug/default.nix b/python/pkgs/jug/default.nix index a9993c339..a83d5b015 100644 --- a/python/pkgs/jug/default.nix +++ b/python/pkgs/jug/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jug"; version = "2.5.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "luispedro"; repo = "jug"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YjBhA+yEdMQ/4yYf25kkXwbvw+ta9Nb4CX8Rnr0du6k="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://jug.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/juliandate/default.nix b/python/pkgs/juliandate/default.nix index 47a326473..a9f0732e3 100644 --- a/python/pkgs/juliandate/default.nix +++ b/python/pkgs/juliandate/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "juliandate"; version = "1.0.5"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "seanredmond"; repo = "juliandate"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pOWyrPBFqKmG9oKbXY/L14LblIcc8KfZSqZAEQP29V8="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/seanredmond/juliandate"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/july/default.nix b/python/pkgs/july/default.nix index e893d443f..a6a5a27ab 100644 --- a/python/pkgs/july/default.nix +++ b/python/pkgs/july/default.nix @@ -10,14 +10,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "july"; version = "0.1.3"; pyproject = true; # No tags on GitHub src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0xXCSSEKf2COJ9IHfuy+vpC/Zieg+q6TTabEFmUspCM="; }; @@ -41,11 +41,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "july" ]; # No tests - doCheck = false; meta = { description = "Small library for creating pretty heatmaps of daily data"; homepage = "https://github.com/e-hulten/july"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/junit-xml/default.nix b/python/pkgs/junit-xml/default.nix index 7de09c2d0..95444c705 100644 --- a/python/pkgs/junit-xml/default.nix +++ b/python/pkgs/junit-xml/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "junit-xml"; version = "1.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3hagUZkNTiWjmCst2eidZxBnVIcYhmQW+uwU2d5W258="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { dependencies = [ six ]; - doCheck = false; - pythonImportsCheck = [ "junit_xml" ]; meta = { @@ -29,4 +27,4 @@ buildPythonPackage rec { description = "Creates JUnit XML test result documents that can be read by tools such as Jenkins"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/junitparser/default.nix b/python/pkgs/junitparser/default.nix index fea8811e7..5081b4e43 100644 --- a/python/pkgs/junitparser/default.nix +++ b/python/pkgs/junitparser/default.nix @@ -7,7 +7,7 @@ lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "junitparser"; version = "5.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "weiwei"; repo = "junitparser"; - tag = version; + tag = finalAttrs.version; hash = "sha256-I/bQQPT6b6PTZ9bIlWCQmN/gUWnVIO42xtJh/g7L79A="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; homepage = "https://github.com/weiwei/junitparser"; }; -} +}) diff --git a/python/pkgs/jupyter-cache/default.nix b/python/pkgs/jupyter-cache/default.nix index 0545e3acf..f78569e0a 100644 --- a/python/pkgs/jupyter-cache/default.nix +++ b/python/pkgs/jupyter-cache/default.nix @@ -13,20 +13,20 @@ tabulate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-cache"; version = "1.0.1"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "jupyter_cache"; hash = "sha256-FugI6xnj+2eiI9uQbhMepuAfA6on9JpyFM5qX+wYb7k="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ attrs click importlib-metadata @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/jupyter-cache"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jupyter-client/default.nix b/python/pkgs/jupyter-client/default.nix index 695d0b288..2eb538ff4 100644 --- a/python/pkgs/jupyter-client/default.nix +++ b/python/pkgs/jupyter-client/default.nix @@ -11,14 +11,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-client"; version = "8.10.0"; pyproject = true; src = fetchPypi { pname = "jupyter_client"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-n3EWKU3KVfF4W+iABX1EVE25sVZ3GNksszxYiGr7lJc="; }; @@ -36,11 +36,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyter_client" ]; # Circular dependency with ipykernel - doCheck = false; meta = { description = "Jupyter protocol implementation and client libraries"; homepage = "https://github.com/jupyter/jupyter_client"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyter-console/default.nix b/python/pkgs/jupyter-console/default.nix index 6ba36c993..955c28253 100644 --- a/python/pkgs/jupyter-console/default.nix +++ b/python/pkgs/jupyter-console/default.nix @@ -17,7 +17,7 @@ traitlets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-console"; version = "6.6.3"; pyproject = true; @@ -25,14 +25,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_console"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jdSeZCspcjEQVBpJyxVnwJ5SAq+SS1bW9kqp/F/zwCQ="; }; postPatch = # Use wrapped executable in tests let - binPath = "${placeholder "out"}/bin/jupyter-console"; + binPath = "$(out)/bin/jupyter-console"; in '' substituteInPlace jupyter_console/tests/test_console.py \ @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/jupyter_console"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyter-contrib-core/default.nix b/python/pkgs/jupyter-contrib-core/default.nix index dce45f83c..93fd60d86 100644 --- a/python/pkgs/jupyter-contrib-core/default.nix +++ b/python/pkgs/jupyter-contrib-core/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, jupyter-core, notebook, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-contrib-core"; version = "0.4.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jupyter-contrib"; repo = "jupyter_contrib_core"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UTtK+aKxBFkqKuHrt1ox8vdHyFz/9HiKFl7U4UQcG88="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ jupyter-core notebook ]; @@ -39,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter-contrib/jupyter_contrib_core"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyter-core/default.nix b/python/pkgs/jupyter-core/default.nix index 6b2138085..68231e057 100644 --- a/python/pkgs/jupyter-core/default.nix +++ b/python/pkgs/jupyter-core/default.nix @@ -7,7 +7,7 @@ traitlets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-core"; version = "5.9.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_core"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mAvfyiN8Fdm9U3Ar7xicwOinKfTqk9qrfq/SGiaxNvU="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyter-events/default.nix b/python/pkgs/jupyter-events/default.nix index d201f76ff..5466d8043 100644 --- a/python/pkgs/jupyter-events/default.nix +++ b/python/pkgs/jupyter-events/default.nix @@ -25,7 +25,7 @@ pytest-console-scripts, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-events"; version = "0.12.1"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_events"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OTZW3Ax5y4cO/q9UA6k6an2E+HfYctuNNDvKmch8Etg="; }; @@ -63,4 +63,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/jupyter_events"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyter-highlight-selected-word/default.nix b/python/pkgs/jupyter-highlight-selected-word/default.nix index 076781ef7..2454841c5 100644 --- a/python/pkgs/jupyter-highlight-selected-word/default.nix +++ b/python/pkgs/jupyter-highlight-selected-word/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-highlight-selected-word"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jcb91"; repo = "jupyter_highlight_selected_word"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KgM//SIfES46uZySwNR4ZOcolnJORltvThsmEvxXoIs="; }; + build-system = [ setuptools ]; + # This package does not have tests doChecks = false; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/jcb91/jupyter_highlight_selected_word"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyter-lsp/default.nix b/python/pkgs/jupyter-lsp/default.nix index cfb98d965..b1a1a3022 100644 --- a/python/pkgs/jupyter-lsp/default.nix +++ b/python/pkgs/jupyter-lsp/default.nix @@ -6,20 +6,20 @@ jupyter-server, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-lsp"; version = "2.3.1"; pyproject = true; src = fetchPypi { pname = "jupyter_lsp"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-/fikqn2FgTl21uKeleaiyPdScB+SbycVMFJJo4KYBaY="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ jupyter-server ]; + dependencies = [ jupyter-server ]; pythonImportsCheck = [ "jupyter_lsp" ]; @@ -29,4 +29,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/jupyter-nbextensions-configurator/default.nix b/python/pkgs/jupyter-nbextensions-configurator/default.nix index ab7be1efc..f047678d3 100644 --- a/python/pkgs/jupyter-nbextensions-configurator/default.nix +++ b/python/pkgs/jupyter-nbextensions-configurator/default.nix @@ -12,7 +12,7 @@ selenium, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-nbextensions-configurator"; version = "0.6.4"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter-contrib"; repo = "jupyter_nbextensions_configurator"; - tag = version; + tag = finalAttrs.version; hash = "sha256-U4M6pGV/DdE+DOVMVaoBXOhfRERt+yUa+gADgqRRLn4="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter-contrib/jupyter_nbextensions_configurator"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyter-packaging/default.nix b/python/pkgs/jupyter-packaging/default.nix index e0f8dbe56..7fb183856 100644 --- a/python/pkgs/jupyter-packaging/default.nix +++ b/python/pkgs/jupyter-packaging/default.nix @@ -11,14 +11,14 @@ tomlkit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-packaging"; version = "0.12.3"; pyproject = true; src = fetchPypi { pname = "jupyter_packaging"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-nZsrY7l//WeovFORwypCG8QVsmSjLJnk2NjdMdqunPQ="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/jupyter-packaging"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyter-server-fileid/default.nix b/python/pkgs/jupyter-server-fileid/default.nix index 919dd6eab..9bc4e96f8 100644 --- a/python/pkgs/jupyter-server-fileid/default.nix +++ b/python/pkgs/jupyter-server-fileid/default.nix @@ -7,7 +7,7 @@ click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-server-fileid"; version = "0.9.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter-server"; repo = "jupyter_server_fileid"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ob7hnqU7GdaDHEPF7+gwkmsboKZgiiLzzwxbBUwYHYo="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyter_server_fileid" ]; -} +}) diff --git a/python/pkgs/jupyter-server-mathjax/default.nix b/python/pkgs/jupyter-server-mathjax/default.nix index 8f22182f5..ea95e0a42 100644 --- a/python/pkgs/jupyter-server-mathjax/default.nix +++ b/python/pkgs/jupyter-server-mathjax/default.nix @@ -7,13 +7,13 @@ jupyter-server, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-server-mathjax"; version = "0.2.6"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "jupyter_server_mathjax"; hash = "sha256-ux5rbcBobB/jhqIrWIYWPbVIiTqZwoEMNjmenEyiOUM="; }; @@ -23,7 +23,7 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ jupyter-server ]; + dependencies = [ jupyter-server ]; pythonImportsCheck = [ "jupyter_server_mathjax" ]; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter-server/jupyter_server_mathjax"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyter-server-terminals/default.nix b/python/pkgs/jupyter-server-terminals/default.nix index bde19f9f8..e1d405821 100644 --- a/python/pkgs/jupyter-server-terminals/default.nix +++ b/python/pkgs/jupyter-server-terminals/default.nix @@ -10,7 +10,7 @@ terminado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-server-terminals"; version = "0.5.4"; pyproject = true; @@ -18,17 +18,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter-server"; repo = "jupyter_server_terminals"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gVR34Ajfv567isVmbP7Zx4AiptrdNqd032QxdMBpsTE="; }; nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ terminado ]; + dependencies = [ terminado ]; meta = { description = "Jupyter Server Extension Providing Support for Terminals"; homepage = "https://github.com/jupyter-server/jupyter_server_terminals"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyter-server/default.nix b/python/pkgs/jupyter-server/default.nix index b4ffbf936..8a7a7779b 100644 --- a/python/pkgs/jupyter-server/default.nix +++ b/python/pkgs/jupyter-server/default.nix @@ -25,14 +25,14 @@ overrides, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-server"; version = "2.21.0"; pyproject = true; src = fetchPypi { pname = "jupyter_server"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-cNmhiD9X01duoX9M4GHsGnqtfvOI0AQoz7f15PACInE="; }; @@ -73,4 +73,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter-server/jupyter_server"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/jupyter-sphinx/default.nix b/python/pkgs/jupyter-sphinx/default.nix index b385d48d1..54a329a77 100644 --- a/python/pkgs/jupyter-sphinx/default.nix +++ b/python/pkgs/jupyter-sphinx/default.nix @@ -12,7 +12,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-sphinx"; version = "0.5.3"; pyproject = true; @@ -20,13 +20,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter-sphinx"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-o/i3WravKZPf7uw2H4SVYfAyaZGf19ZJlkmeHCWcGtE="; }; nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ ipykernel ipython ipywidgets @@ -62,4 +62,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/jupyter-sphinx/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyter-telemetry/default.nix b/python/pkgs/jupyter-telemetry/default.nix index 7e5af0380..59f7690cc 100644 --- a/python/pkgs/jupyter-telemetry/default.nix +++ b/python/pkgs/jupyter-telemetry/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-telemetry"; version = "0.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter"; repo = "telemetry"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WxTlTs6gE9pa0hbl29Zvwikobz1/2JQ3agYO7WxyZ2E="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://jupyter-telemetry.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyter-ui-poll/default.nix b/python/pkgs/jupyter-ui-poll/default.nix index 21f4fd932..6b90e82ca 100644 --- a/python/pkgs/jupyter-ui-poll/default.nix +++ b/python/pkgs/jupyter-ui-poll/default.nix @@ -6,7 +6,7 @@ ipython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-ui-poll"; version = "1.1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Kirill888"; repo = "jupyter-ui-poll"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Q+y0Xr7wuo8ZwCHEELSi0QSXa8DLtfZ8XQc48eOk4bw="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { dependencies = [ ipython ]; - doCheck = false; # no tests in package :( pythonImportsCheck = [ "jupyter_ui_poll" ]; meta = { @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/Kirill888/jupyter-ui-poll"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jupyter-ydoc/default.nix b/python/pkgs/jupyter-ydoc/default.nix index 217576dc8..ce9b3ff3e 100644 --- a/python/pkgs/jupyter-ydoc/default.nix +++ b/python/pkgs/jupyter-ydoc/default.nix @@ -14,7 +14,6 @@ buildPythonPackage (finalAttrs: { pname = "jupyter-ydoc"; version = "3.4.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "jupyter-server"; diff --git a/python/pkgs/jupyter/default.nix b/python/pkgs/jupyter/default.nix index 447f63e24..b3549d635 100644 --- a/python/pkgs/jupyter/default.nix +++ b/python/pkgs/jupyter/default.nix @@ -11,13 +11,13 @@ notebook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter"; version = "1.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1VRnvOq96knX42JK9+M9WcN//1PtOjUOGslXvtcx3no="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; priority = 100; # This is a metapackage which is unimportant }; -} +}) diff --git a/python/pkgs/jupyterlab-lsp/default.nix b/python/pkgs/jupyterlab-lsp/default.nix index d8272f9cc..7b2a9236f 100644 --- a/python/pkgs/jupyterlab-lsp/default.nix +++ b/python/pkgs/jupyterlab-lsp/default.nix @@ -7,25 +7,24 @@ jupyter-lsp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyterlab-lsp"; version = "5.3.0"; pyproject = true; src = fetchPypi { pname = "jupyterlab_lsp"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-vfAU/rwOwpf/aQh+lXVJ1yTrDCnfPyTU9MQHWKca/D8="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ jupyterlab jupyter-lsp ]; # No tests - doCheck = false; pythonImportsCheck = [ "jupyterlab_lsp" ]; meta = { @@ -34,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/jupyterlab-pygments/default.nix b/python/pkgs/jupyterlab-pygments/default.nix index f1e5b66dd..fca544172 100644 --- a/python/pkgs/jupyterlab-pygments/default.nix +++ b/python/pkgs/jupyterlab-pygments/default.nix @@ -8,14 +8,14 @@ pygments, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyterlab-pygments"; version = "0.3.0"; pyproject = true; src = fetchPypi { pname = "jupyterlab_pygments"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-chrKTZApJSsRz6nRheW1r01Udyu4By+bcDb0FwBU010="; }; @@ -32,9 +32,8 @@ buildPythonPackage rec { ]; # no tests exist on upstream repo - doCheck = false; - propagatedBuildInputs = [ pygments ]; + dependencies = [ pygments ]; pythonImportsCheck = [ "jupyterlab_pygments" ]; @@ -43,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyterlab/jupyterlab_pygments"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyterlab-vim/default.nix b/python/pkgs/jupyterlab-vim/default.nix index 1543f43ec..f7e902bc1 100644 --- a/python/pkgs/jupyterlab-vim/default.nix +++ b/python/pkgs/jupyterlab-vim/default.nix @@ -8,14 +8,14 @@ jupyterlab, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyterlab-vim"; version = "4.1.4"; pyproject = true; src = fetchPypi { pname = "jupyterlab_vim"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-q/KJGq+zLwy5StmDIa5+vL4Mq+Uj042A1WnApQuFIlo="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyterlab_vim" ]; # has no tests - doCheck = false; meta = { description = "Vim notebook cell bindings for JupyterLab"; @@ -37,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/jupyterlab-widgets/default.nix b/python/pkgs/jupyterlab-widgets/default.nix index cc4e679c9..65177c8cc 100644 --- a/python/pkgs/jupyterlab-widgets/default.nix +++ b/python/pkgs/jupyterlab-widgets/default.nix @@ -6,14 +6,14 @@ hatch-jupyter-builder, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyterlab-widgets"; version = "3.0.16"; pyproject = true; src = fetchPypi { pname = "jupyterlab_widgets"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Qj2gUHHVXPJ6nmAiFtNaOmWj5BzfnF07ZDuBTOOMGeA="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "jupyterlab_widgets" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter-widgets/ipywidgets"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/jupyterlab/default.nix b/python/pkgs/jupyterlab/default.nix index 169b0c700..db2e6976e 100644 --- a/python/pkgs/jupyterlab/default.nix +++ b/python/pkgs/jupyterlab/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { pname = "jupyterlab"; version = "4.5.8"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "jupyterlab"; diff --git a/python/pkgs/jupytext/default.nix b/python/pkgs/jupytext/default.nix index 78561c510..adf61a50b 100644 --- a/python/pkgs/jupytext/default.nix +++ b/python/pkgs/jupytext/default.nix @@ -19,7 +19,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupytext"; version = "1.18.1"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mwouts"; repo = "jupytext"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-D7Ps/lHF3F/7Jm4ozcjO8YsTPA1GQPqZVpPod/riGvA="; }; @@ -43,11 +43,11 @@ buildPythonPackage rec { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_3.fetchYarnBerryDeps { - inherit src missingHashes; + inherit (finalAttrs) src missingHashes; patches = [ ./fix-yarn-lock-typescript-offline-cache.patch ]; - sourceRoot = "${src.name}/jupyterlab"; + sourceRoot = "${finalAttrs.src.name}/jupyterlab"; hash = "sha256-k2lQnlSmCghIkp6VwNmq5KpSHS5tEbnFnsM+xqo3Ebw="; }; @@ -85,4 +85,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "jupytext"; }; -} +}) diff --git a/python/pkgs/justbackoff/default.nix b/python/pkgs/justbackoff/default.nix index dd3379ace..ae40f85eb 100644 --- a/python/pkgs/justbackoff/default.nix +++ b/python/pkgs/justbackoff/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "justbackoff"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "alexferl"; repo = "justbackoff"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "097j6jxgl4b3z46x9y9z10643vnr9v831vhagrxzrq6nviil2z6l"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' @@ -31,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/alexferl/justbackoff"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/justbases/default.nix b/python/pkgs/justbases/default.nix index d1d66c516..bed4a5823 100644 --- a/python/pkgs/justbases/default.nix +++ b/python/pkgs/justbases/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, unittestCheckHook, hypothesis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "justbases"; version = "0.15.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mulkieran"; repo = "justbases"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XraUh3beI2JqKPRHYN5W3Tn3gg0GJCwhnhHIOFdzh6U="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ unittestCheckHook hypothesis @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/mulkieran/justbases"; license = lib.licenses.lgpl2Plus; }; -} +}) diff --git a/python/pkgs/justbytes/default.nix b/python/pkgs/justbytes/default.nix index a45a98118..5b1cf6cf0 100644 --- a/python/pkgs/justbytes/default.nix +++ b/python/pkgs/justbytes/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, justbases, unittestCheckHook, hypothesis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "justbytes"; version = "0.15.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mulkieran"; repo = "justbytes"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+jwIK1ZU+j58VoOfZAm7GdFy7KHU28khwzxhYhcws74="; }; - propagatedBuildInputs = [ justbases ]; + build-system = [ setuptools ]; + + dependencies = [ justbases ]; nativeCheckInputs = [ unittestCheckHook hypothesis @@ -30,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/mulkieran/justbytes"; license = lib.licenses.lgpl2Plus; }; -} +}) diff --git a/python/pkgs/justext/default.nix b/python/pkgs/justext/default.nix index a87199ba8..8faff5dad 100644 --- a/python/pkgs/justext/default.nix +++ b/python/pkgs/justext/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytest-cov-stub, lxml, lxml-html-clean, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "justext"; version = "3.0.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "miso-belica"; repo = "jusText"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/7wp41jz/5nUFqZNg4O7yF2+eE+awAEXp6dhD+Loc0U="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ lxml lxml-html-clean ]; @@ -30,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/miso-belica/jusText"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/justnimbus/default.nix b/python/pkgs/justnimbus/default.nix index eb8bd28cc..f7e84fb48 100644 --- a/python/pkgs/justnimbus/default.nix +++ b/python/pkgs/justnimbus/default.nix @@ -6,7 +6,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "justnimbus"; version = "0.7.4"; pyproject = true; @@ -14,16 +14,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kvanzuijlen"; repo = "justnimbus"; - tag = version; + tag = finalAttrs.version; hash = "sha256-FsuvpmMWBYI1LheO3NFfCeaW4m3YQ41Tc81TP3gdNqo="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "justnimbus" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/kvanzuijlen/justnimbus"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/jwcrypto/default.nix b/python/pkgs/jwcrypto/default.nix index 31f71339f..5d87ad364 100644 --- a/python/pkgs/jwcrypto/default.nix +++ b/python/pkgs/jwcrypto/default.nix @@ -7,13 +7,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jwcrypto"; version = "1.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AqgrCjo2slUzCdeMZeHA4zULZA/kCR9T9m9YKxH0k3g="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { description = "Implementation of JOSE Web standards"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/jwt/default.nix b/python/pkgs/jwt/default.nix index 054bb6844..a80022b9b 100644 --- a/python/pkgs/jwt/default.nix +++ b/python/pkgs/jwt/default.nix @@ -10,7 +10,7 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jwt"; version = "1.4.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GehirnInc"; repo = "python-jwt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Cv64SmhkETm8mx1Kj5u0WZpCPjPNvC+KS6/XaMzxCho="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/GehirnInc/python-jwt"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/jxlpy/default.nix b/python/pkgs/jxlpy/default.nix index 805ae1a86..291e9c341 100644 --- a/python/pkgs/jxlpy/default.nix +++ b/python/pkgs/jxlpy/default.nix @@ -7,14 +7,14 @@ libjxl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jxlpy"; version = "0.9.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Kqdm8b3hgO0Q3zE68rSIM4Jd7upjG+SQywSseGwCFUI="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/olokelo/jxlpy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/jxmlease/default.nix b/python/pkgs/jxmlease/default.nix index f600d013c..086d990c1 100644 --- a/python/pkgs/jxmlease/default.nix +++ b/python/pkgs/jxmlease/default.nix @@ -2,25 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, lxml, unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jxmlease"; version = "1.0.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "17l3w3ak07p72s8kv8hg0ilxs0kkxjn7bfwnl3g2cw58v1siab31"; }; - propagatedBuildInputs = [ lxml ]; + build-system = [ setuptools ]; + + dependencies = [ lxml ]; # tests broken in expat bump # https://github.com/Juniper/jxmlease/issues/26 - doCheck = false; unittestFlagsArray = [ "-v" ]; meta = { @@ -28,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/Juniper/jxmlease"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/kafka-python/default.nix b/python/pkgs/kafka-python/default.nix index 184f0ceb0..128acba40 100644 --- a/python/pkgs/kafka-python/default.nix +++ b/python/pkgs/kafka-python/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "kafka-python"; version = "3.0.11"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "dpkp"; diff --git a/python/pkgs/kaggle/default.nix b/python/pkgs/kaggle/default.nix index 64362492e..f901c7631 100644 --- a/python/pkgs/kaggle/default.nix +++ b/python/pkgs/kaggle/default.nix @@ -20,7 +20,6 @@ }: buildPythonPackage (finalAttrs: { - __structuredAttrs = true; pname = "kaggle"; version = "2.2.3"; diff --git a/python/pkgs/kagglehub/default.nix b/python/pkgs/kagglehub/default.nix index 1467d257d..d18eed56f 100644 --- a/python/pkgs/kagglehub/default.nix +++ b/python/pkgs/kagglehub/default.nix @@ -38,7 +38,6 @@ buildPythonPackage (finalAttrs: { pname = "kagglehub"; version = "1.0.2"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "Kaggle"; diff --git a/python/pkgs/kagglesdk/default.nix b/python/pkgs/kagglesdk/default.nix index 36ab0ffb2..6faf7a474 100644 --- a/python/pkgs/kagglesdk/default.nix +++ b/python/pkgs/kagglesdk/default.nix @@ -15,7 +15,6 @@ buildPythonPackage (finalAttrs: { pname = "kagglesdk"; version = "0.1.37"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "Kaggle"; @@ -37,7 +36,6 @@ buildPythonPackage (finalAttrs: { # The two available tests fail with: # AssertionError: 'https://api.kaggle.com' != 'https://www.kaggle.com' - doCheck = false; meta = { description = "Bindings to access Kaggle endpoints"; diff --git a/python/pkgs/kaitaistruct/default.nix b/python/pkgs/kaitaistruct/default.nix index 3f608dd4a..343b71029 100644 --- a/python/pkgs/kaitaistruct/default.nix +++ b/python/pkgs/kaitaistruct/default.nix @@ -16,13 +16,13 @@ let hash = "sha256-l3rGbblUgxO6Y7grlsMEiT3nRIgUZV1VqTyjIgIDtyA="; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kaitaistruct"; version = "0.11"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BT7nZCiOeLjlOs90jpczJorL1Xm42CpCexgFRTYl10s="; }; @@ -34,13 +34,11 @@ buildPythonPackage rec { build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ brotli lz4 ]; - doCheck = false; # no tests in upstream - pythonImportsCheck = [ "kaitaistruct" "kaitai.compress" @@ -51,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/kaiterra-async-client/default.nix b/python/pkgs/kaiterra-async-client/default.nix index 35d1910a8..11bf4a254 100644 --- a/python/pkgs/kaiterra-async-client/default.nix +++ b/python/pkgs/kaiterra-async-client/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kaiterra-async-client"; version = "1.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Wap+yJaIIwPfOUtbVijr85BU3F/JIN2p7nRWW3tsPP8="; }; @@ -21,7 +21,6 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; # PyPI tarball doesn't include tests - doCheck = false; pythonImportsCheck = [ "kaiterra_async_client" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/Michsior14/python-kaiterra-async-client"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/kajiki/default.nix b/python/pkgs/kajiki/default.nix index bafda5c19..687aa9fb8 100644 --- a/python/pkgs/kajiki/default.nix +++ b/python/pkgs/kajiki/default.nix @@ -6,7 +6,7 @@ linetable, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kajiki"; version = "1.0.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jackrosenthal"; repo = "kajiki"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bAgUMA9PlwsO7FRjwiKCsFffLWNU+Go1DToblmyWprk="; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { description = "Module provides fast well-formed XML templates"; mainProgram = "kajiki"; homepage = "https://github.com/jackrosenthal/kajiki"; - changelog = "https://github.com/jackrosenthal/kajiki/releases/tag/v${version}"; + changelog = "https://github.com/jackrosenthal/kajiki/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/kanidm/default.nix b/python/pkgs/kanidm/default.nix index d03124b60..e6d2f441c 100644 --- a/python/pkgs/kanidm/default.nix +++ b/python/pkgs/kanidm/default.nix @@ -22,13 +22,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kanidm"; version = "1.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-KlUxW/bJByQnzPdRd9Z5pStH27SpWrCijZc5jlVT5jE="; }; @@ -67,4 +67,4 @@ buildPythonPackage rec { homepage = "https://github.com/kanidm/kanidm/tree/master/pykanidm"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/kaptan/default.nix b/python/pkgs/kaptan/default.nix index 3ab05d631..529c7cd4d 100644 --- a/python/pkgs/kaptan/default.nix +++ b/python/pkgs/kaptan/default.nix @@ -6,13 +6,13 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kaptan"; version = "0.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-EBMwpE/e3oiFhvMBC9FFwOxIpIBrxWQp+lSHpndAIfg="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "Configuration manager for python applications"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/karton-dashboard/default.nix b/python/pkgs/karton-dashboard/default.nix index 6e0e19dd1..de1a177b2 100644 --- a/python/pkgs/karton-dashboard/default.nix +++ b/python/pkgs/karton-dashboard/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, flask, karton-core, mistune, @@ -9,18 +11,20 @@ prometheus-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "karton-dashboard"; version = "1.7.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "karton-dashboard"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DYfL//i1gJ0ci7jVPtrMKC8j+i5/L8rvmbs8zz6Eq2M="; }; + build-system = [ setuptools ]; + pythonRelaxDeps = [ "Flask" "mistune" @@ -28,7 +32,7 @@ buildPythonPackage rec { "prometheus-client" ]; - propagatedBuildInputs = [ + dependencies = [ flask karton-core mistune @@ -37,7 +41,6 @@ buildPythonPackage rec { ]; # Project has no tests. pythonImportsCheck requires MinIO configuration - doCheck = false; meta = { description = "Web application that allows for Karton task and queue introspection"; @@ -45,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/CERT-Polska/karton-dashboard"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/kasa-crypt/default.nix b/python/pkgs/kasa-crypt/default.nix index 83270970b..519bba876 100644 --- a/python/pkgs/kasa-crypt/default.nix +++ b/python/pkgs/kasa-crypt/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kasa-crypt"; version = "1.1.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = "kasa-crypt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rSRLrlV3QLatI2G8sd2jDwd6U8k4MrJil62ki1kNEMc="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/bdraco/kasa-crypt"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/kazoo/default.nix b/python/pkgs/kazoo/default.nix index 780238820..5340c0a2d 100644 --- a/python/pkgs/kazoo/default.nix +++ b/python/pkgs/kazoo/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kazoo"; version = "2.11.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-V+fm9pKVyPkiURSI7reWgHKeFLuOs4LVytg6oRNFw2w="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://kazoo.readthedocs.org"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/kconfiglib/default.nix b/python/pkgs/kconfiglib/default.nix index 629827b75..918178bb8 100644 --- a/python/pkgs/kconfiglib/default.nix +++ b/python/pkgs/kconfiglib/default.nix @@ -2,29 +2,32 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kconfiglib"; version = "14.1.1a4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-16d+R4neiTfVZ6/KM8BfxYu3kyAB9dMDdJSy74UWekE="; }; + build-system = [ setuptools ]; + patches = [ # see https://github.com/ulfalizer/Kconfiglib/pull/119 ./0001-Add-rudimentary-support-for-modules-property.patch ]; # doesnt work out of the box but might be possible - doCheck = false; meta = { description = "Flexible Python 2/3 Kconfig implementation and library"; homepage = "https://github.com/ulfalizer/Kconfiglib"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/kdl-py/default.nix b/python/pkgs/kdl-py/default.nix index 4fe148dd3..8c10b9a9d 100644 --- a/python/pkgs/kdl-py/default.nix +++ b/python/pkgs/kdl-py/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kdl-py"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Y/P0bGJ33trc5E3PyUZyv25r8zMLkBIuATTCKFfimXM="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "kdlreformat"; }; -} +}) diff --git a/python/pkgs/keba-kecontact/default.nix b/python/pkgs/keba-kecontact/default.nix index 497ef4057..e6b29eb89 100644 --- a/python/pkgs/keba-kecontact/default.nix +++ b/python/pkgs/keba-kecontact/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "keba-kecontact"; version = "4.3.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dannerph"; repo = "keba-kecontact"; - tag = version; + tag = finalAttrs.version; hash = "sha256-gIqHo+J/I4vqJCs/r3ZHo3kChefTRqpVmdw3r3y3Hzk="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/dannerph/keba-kecontact"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/keep/default.nix b/python/pkgs/keep/default.nix index 4d7c45c27..f93232a87 100644 --- a/python/pkgs/keep/default.nix +++ b/python/pkgs/keep/default.nix @@ -13,13 +13,13 @@ terminaltables3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "keep"; version = "2.11"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Brwvu/Zevr8sOE3KAwakDDzVMc2VoFxIb1orXAes2U0="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "keep"; }; -} +}) diff --git a/python/pkgs/keepalive/default.nix b/python/pkgs/keepalive/default.nix index 8477c592b..4a563acac 100644 --- a/python/pkgs/keepalive/default.nix +++ b/python/pkgs/keepalive/default.nix @@ -3,18 +3,22 @@ buildPythonPackage, fetchPypi, fetchpatch, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "keepalive"; version = "0.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PGuW+QYqWnYCLwydQenvVVLYCxyt1PzMG/jxg7odHsE="; }; + build-system = [ setuptools ]; + patches = [ # https://github.com/wikier/keepalive/pull/11 (fetchpatch { @@ -26,11 +30,10 @@ buildPythonPackage rec { ]; # No tests included - doCheck = false; meta = { description = "HTTP handler for `urllib` that supports HTTP 1.1 and keepalive"; homepage = "https://github.com/wikier/keepalive"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/keke/default.nix b/python/pkgs/keke/default.nix index b7a220da2..60bff344e 100644 --- a/python/pkgs/keke/default.nix +++ b/python/pkgs/keke/default.nix @@ -7,13 +7,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "keke"; version = "0.3.0b3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rkMfcJvhH4XTOyCwfK70fM8dZ4nDB59urfi+FhsSPQo="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/keke/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/kerberos/default.nix b/python/pkgs/kerberos/default.nix index 5b941eadb..6cde60b3e 100644 --- a/python/pkgs/kerberos/default.nix +++ b/python/pkgs/kerberos/default.nix @@ -2,26 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, libkrb5, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kerberos"; version = "1.3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "cdd046142a4e0060f96a00eb13d82a5d9ebc0f2d7934393ed559bac773460a2c"; }; - nativeBuildInputs = [ libkrb5 ]; + build-system = [ setuptools ]; - doCheck = false; + nativeBuildInputs = [ libkrb5 ]; meta = { description = "Kerberos high-level interface"; homepage = "https://pypi.org/project/kerberos/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/kernels/default.nix b/python/pkgs/kernels/default.nix index d057eb5dd..45618cfc4 100644 --- a/python/pkgs/kernels/default.nix +++ b/python/pkgs/kernels/default.nix @@ -5,7 +5,7 @@ huggingface-hub, setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kernels"; version = "0.11.7"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "huggingface"; repo = "kernels"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OUOCC7ViRWqRZIUpK31ItWsNc0F87dBpAg/Lql1LWp4="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { ]; # Tests require pervasive internet access - doCheck = false; pythonImportsCheck = [ "kernels" ]; @@ -35,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/huggingface/kernels"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/keyboard/default.nix b/python/pkgs/keyboard/default.nix index e6a9bcf6f..499c3fcaf 100644 --- a/python/pkgs/keyboard/default.nix +++ b/python/pkgs/keyboard/default.nix @@ -26,7 +26,6 @@ buildPythonPackage { # Specific OS tests are being run for other OS, like # winmouse on Linux, which provides the following error: # AttributeError: module 'ctypes' has no attribute 'WinDLL' - doCheck = false; meta = { description = "Hook and simulate keyboard events on Windows and Linux"; diff --git a/python/pkgs/keyring/default.nix b/python/pkgs/keyring/default.nix index befe8963f..f601f8944 100644 --- a/python/pkgs/keyring/default.nix +++ b/python/pkgs/keyring/default.nix @@ -15,7 +15,7 @@ secretstorage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "keyring"; version = "25.7.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaraco"; repo = "keyring"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-v9s28vwx/5DJRa3dQyS/mdZppfvFcfBtafjBRi2c1oQ="; }; @@ -68,4 +68,4 @@ buildPythonPackage rec { mainProgram = "keyring"; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/keyrings-alt/default.nix b/python/pkgs/keyrings-alt/default.nix index 7620e5dc8..8c0a72498 100644 --- a/python/pkgs/keyrings-alt/default.nix +++ b/python/pkgs/keyrings-alt/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "keyrings-alt"; version = "5.0.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaraco"; repo = "keyrings.alt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-m/hIXjri3FZ3rPIymiIBy8cKNOwJoj14WjsOyDtcWmU="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/keyrings.alt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/keyrings-cryptfile/default.nix b/python/pkgs/keyrings-cryptfile/default.nix index 2348bdaf9..4dda5291c 100644 --- a/python/pkgs/keyrings-cryptfile/default.nix +++ b/python/pkgs/keyrings-cryptfile/default.nix @@ -10,7 +10,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "keyrings-cryptfile"; version = "1.4.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frispete"; repo = "keyrings.cryptfile"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cDXx0s3o8hNqgzX4oNkjGhNcaUX5vi1uN2d9sdbiZwk="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/frispete/keyrings.cryptfile"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/keyrings-google-artifactregistry-auth/default.nix b/python/pkgs/keyrings-google-artifactregistry-auth/default.nix index 5e6ffd004..c8cdadbf8 100644 --- a/python/pkgs/keyrings-google-artifactregistry-auth/default.nix +++ b/python/pkgs/keyrings-google-artifactregistry-auth/default.nix @@ -10,14 +10,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "keyrings-google-artifactregistry-auth"; version = "1.1.2"; pyproject = true; src = fetchPypi { pname = "keyrings.google-artifactregistry-auth"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-vWq7cnQNLf60pcA8OxBcb326FpyqKd7jlZaU8fAsd94="; }; @@ -36,11 +36,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "keyrings.gauth" ]; # upstream has no tests - doCheck = false; meta = { description = "Python package which allows you to configure keyring to interact with Python repositories stored in Artifact Registry"; homepage = "https://github.com/GoogleCloudPlatform/artifact-registry-python-tools"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/keystoneauth1/default.nix b/python/pkgs/keystoneauth1/default.nix index 6938cbe7f..be132ba29 100644 --- a/python/pkgs/keystoneauth1/default.nix +++ b/python/pkgs/keystoneauth1/default.nix @@ -15,13 +15,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "keystoneauth1"; version = "5.17.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gjWazCDHVPyyKBjgkOL+pkfkxcETemrdtJhOn7pwirM="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/keystoneauth"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/keyutils/default.nix b/python/pkgs/keyutils/default.nix index 417281056..d77bda608 100644 --- a/python/pkgs/keyutils/default.nix +++ b/python/pkgs/keyutils/default.nix @@ -3,22 +3,26 @@ buildPythonPackage, cython, fetchFromGitHub, + # build-system + setuptools, keyutils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "keyutils"; version = "0.6"; - format = "setuptools"; + pyproject = true; # github version comes bundled with tests src = fetchFromGitHub { owner = "sassoftware"; repo = "python-keyutils"; - rev = version; + tag = finalAttrs.version; sha256 = "0pfqfr5xqgsqkxzrmj8xl2glyl4nbq0irs0k6ik7iy3gd3mxf5g1"; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py --replace '"pytest-runner"' "" ''; @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/sassoftware/python-keyutils"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/kgb/default.nix b/python/pkgs/kgb/default.nix index 47672f9d0..739e5f6f1 100644 --- a/python/pkgs/kgb/default.nix +++ b/python/pkgs/kgb/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kgb"; version = "7.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "beanbaginc"; repo = "kgb"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-hNJXoUIyrCB9PCWLCmN81F6pBRwZApDR6JWA0adyklw="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/beanbaginc/kgb"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/khanaa/default.nix b/python/pkgs/khanaa/default.nix index c7e48a016..806a236f4 100644 --- a/python/pkgs/khanaa/default.nix +++ b/python/pkgs/khanaa/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "khanaa"; version = "0.1.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cakimpei"; repo = "khanaa"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QFvvahVEld3BooINeUYJDahZyfh5xmQNtWRLAOdr6lw="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/cakimpei/khanaa"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/kinparse/default.nix b/python/pkgs/kinparse/default.nix index 82e2c2de1..cb5d74edd 100644 --- a/python/pkgs/kinparse/default.nix +++ b/python/pkgs/kinparse/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kinparse"; version = "1.2.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "xesscorp"; repo = "kinparse"; - tag = version; + tag = finalAttrs.version; hash = "sha256-170e2uhqpk6u/hahivWYubr3Ptb8ijymJSxhxrAfuyI="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/xesscorp/kinparse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/kiosker-python-api/default.nix b/python/pkgs/kiosker-python-api/default.nix index 5da24f892..8557e6f19 100644 --- a/python/pkgs/kiosker-python-api/default.nix +++ b/python/pkgs/kiosker-python-api/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ httpx ]; # Tests require a live Kiosker device (HOST/TOKEN env vars). - doCheck = false; pythonImportsCheck = [ "kiosker" ]; diff --git a/python/pkgs/kiss-headers/default.nix b/python/pkgs/kiss-headers/default.nix index ff8cd5edb..165121ed3 100644 --- a/python/pkgs/kiss-headers/default.nix +++ b/python/pkgs/kiss-headers/default.nix @@ -8,7 +8,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kiss-headers"; version = "2.5.0"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Ousret"; repo = "kiss-headers"; - tag = version; + tag = finalAttrs.version; hash = "sha256-h0e7kFbn6qxIeSG85qetBg6IeSi/2YAaZLGS0+JH2g8="; }; nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/Ousret/kiss-headers"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/kitchen/default.nix b/python/pkgs/kitchen/default.nix index 742c73bd3..b262f8ca1 100644 --- a/python/pkgs/kitchen/default.nix +++ b/python/pkgs/kitchen/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kitchen"; version = "1.2.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uEz1gvG9FVa2DrxzcLnTMeuSR7awcM6J3+lZy6LAsDw="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "kitchen" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/fedora-infra/kitchen"; license = lib.licenses.lgpl2Only; }; -} +}) diff --git a/python/pkgs/kivy-garden/default.nix b/python/pkgs/kivy-garden/default.nix index 02042fe93..463927b66 100644 --- a/python/pkgs/kivy-garden/default.nix +++ b/python/pkgs/kivy-garden/default.nix @@ -31,7 +31,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "garden" ]; # There are no tests - doCheck = false; meta = { description = "Kivy garden installation script, split into its own package for convenient use in buildozer"; diff --git a/python/pkgs/kiwiki-client/default.nix b/python/pkgs/kiwiki-client/default.nix index 4e54ebaac..a98607eed 100644 --- a/python/pkgs/kiwiki-client/default.nix +++ b/python/pkgs/kiwiki-client/default.nix @@ -2,29 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, python-dateutil, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kiwiki-client"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "c7h"; repo = "kiwiki_client"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CIBed8HzbUqUIzNy1lHxIgjneA6R8uKtmd43LU92M0Q="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ python-dateutil requests ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "kiwiki" ]; @@ -33,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/c7h/kiwiki_client"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/kiwisolver/default.nix b/python/pkgs/kiwisolver/default.nix index 466a6154f..9b79543ac 100644 --- a/python/pkgs/kiwisolver/default.nix +++ b/python/pkgs/kiwisolver/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, stdenv, cppy, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kiwisolver"; version = "1.5.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8TA+8u7IEmKktwjD6Fiv5Y18da2RwcBSZu2nZzNphZo="; }; + build-system = [ setuptools ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"; nativeBuildInputs = [ setuptools-scm ]; @@ -30,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/nucleic/kiwi"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/klein/default.nix b/python/pkgs/klein/default.nix index f604058db..ff130a2c3 100644 --- a/python/pkgs/klein/default.nix +++ b/python/pkgs/klein/default.nix @@ -21,7 +21,7 @@ treq, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "klein"; version = "24.8.0"; pyproject = true; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "twisted"; repo = "klein"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2/zl4fS9ZP73quPmGnz2+brEt84ODgVS89Om/cUsj0M="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/klein"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/knack/default.nix b/python/pkgs/knack/default.nix index 1e0ce0c44..092d1fabe 100644 --- a/python/pkgs/knack/default.nix +++ b/python/pkgs/knack/default.nix @@ -12,13 +12,13 @@ tabulate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "knack"; version = "0.14.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ld0y/WND7Jtu0NpymyEjYtDmsSCMAWJjPJDLb5SgWHc="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/microsoft/knack"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/kneaddata/default.nix b/python/pkgs/kneaddata/default.nix index 35b02296b..9a4ca3eb0 100644 --- a/python/pkgs/kneaddata/default.nix +++ b/python/pkgs/kneaddata/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kneaddata"; version = "0.12.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "biobakery"; repo = "kneaddata"; - tag = version; + tag = finalAttrs.version; hash = "sha256-biZ6lS0a81CBAAhTOb1Ol38/YagLqXA3AbMr2nBmSEw="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { platforms = lib.platforms.all; mainProgram = "kneaddata"; }; -} +}) diff --git a/python/pkgs/kneed/default.nix b/python/pkgs/kneed/default.nix index ba79709e0..08494658a 100644 --- a/python/pkgs/kneed/default.nix +++ b/python/pkgs/kneed/default.nix @@ -10,7 +10,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kneed"; version = "0.8.6"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arvkevi"; repo = "kneed"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-A9d5igX9Eqr3rgx93VMee9yFEs6WfO0bb/eCEFCxUJg="; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov-stub matplotlib @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/arvkevi/kneed"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/knot-floer-homology/default.nix b/python/pkgs/knot-floer-homology/default.nix index e258a8612..7d7eccb99 100644 --- a/python/pkgs/knot-floer-homology/default.nix +++ b/python/pkgs/knot-floer-homology/default.nix @@ -7,7 +7,7 @@ cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "knot-floer-homology"; version = "1.2.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "3-manifolds"; repo = "knot_floer_homology"; - tag = "${version}_as_released"; + tag = "${finalAttrs.version}_as_released"; hash = "sha256-Gw9k9AaUVTBzE+ERUH8VgS//aVT03DdKozpL8xLG4No="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/3-manifolds/knot_floer_homology"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/knx-frontend/default.nix b/python/pkgs/knx-frontend/default.nix index 2998613c9..5d3d60770 100644 --- a/python/pkgs/knx-frontend/default.nix +++ b/python/pkgs/knx-frontend/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "knx_frontend" ]; # no tests - doCheck = false; meta = { description = "Home Assistant Panel for managing the KNX integration"; diff --git a/python/pkgs/knx-telegram-store/default.nix b/python/pkgs/knx-telegram-store/default.nix index 172bb3096..69f899b12 100644 --- a/python/pkgs/knx-telegram-store/default.nix +++ b/python/pkgs/knx-telegram-store/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "0.11.2"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "XKNX"; repo = "knx-telegram-store"; diff --git a/python/pkgs/kombu/default.nix b/python/pkgs/kombu/default.nix index 7bf2d3b27..1043bfcf2 100644 --- a/python/pkgs/kombu/default.nix +++ b/python/pkgs/kombu/default.nix @@ -20,7 +20,7 @@ vine, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kombu"; version = "5.6.2"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "celery"; repo = "kombu"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-J0cEQsMHKethrfDVDDvIjc/iZpoCYLH9INHtgKmH9Pk="; }; @@ -66,4 +66,4 @@ buildPythonPackage rec { homepage = "https://github.com/celery/kombu"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/korean-lunar-calendar/default.nix b/python/pkgs/korean-lunar-calendar/default.nix index 1891c1668..a877d5337 100644 --- a/python/pkgs/korean-lunar-calendar/default.nix +++ b/python/pkgs/korean-lunar-calendar/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "korean_lunar_calendar"; version = "0.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vlbye8BZT9u997vgD1BKn5KaMeMRvX2buTVhtkWvrec="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/usingsky/korean_lunar_calendar_py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/kornia-rs/default.nix b/python/pkgs/kornia-rs/default.nix index 8248ca662..894fcb1cc 100644 --- a/python/pkgs/kornia-rs/default.nix +++ b/python/pkgs/kornia-rs/default.nix @@ -9,7 +9,7 @@ nasm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kornia-rs"; version = "0.1.14"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kornia"; repo = "kornia-rs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xzJkuWhSQe5V+I4dKNoGflbt7cARewtEbTdJ3YY+cm8="; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit + inherit (finalAttrs) pname version src @@ -48,4 +48,4 @@ buildPythonPackage rec { description = "Python bindings to Low-level Computer Vision library in Rust"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/kotsu/default.nix b/python/pkgs/kotsu/default.nix index dc7001c79..77a501c74 100644 --- a/python/pkgs/kotsu/default.nix +++ b/python/pkgs/kotsu/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pandas, typing-extensions, pytestCheckHook, @@ -10,19 +12,21 @@ scikit-learn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kotsu"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "datavaluepeople"; repo = "kotsu"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7bRrHowRKq3xiBiAkfS4ZL9PXHIUmZc99q9pHex9BLg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pandas typing-extensions ]; @@ -40,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/datavaluepeople/kotsu"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/krakenex/default.nix b/python/pkgs/krakenex/default.nix index 7fa0c3c97..e7017a3af 100644 --- a/python/pkgs/krakenex/default.nix +++ b/python/pkgs/krakenex/default.nix @@ -6,7 +6,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "krakenex"; version = "2.2.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "veox"; repo = "python3-krakenex"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-htldEds3vf9bjFkJAew0e0fHDLD15OTcVYybSmIp3DI="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ requests ]; # no tests implemented - doCheck = false; pythonImportsCheck = [ "krakenex" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/veox/python3-krakenex"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/krb5/default.nix b/python/pkgs/krb5/default.nix index c2149da2e..1a4e7b382 100644 --- a/python/pkgs/krb5/default.nix +++ b/python/pkgs/krb5/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "krb5"; version = "0.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-j0cRoKsR7kP9pWc3HvbZSHr9vU8VbKCT6Pswb0zGha4="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/jborean93/pykrb5"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/krfzf-py/default.nix b/python/pkgs/krfzf-py/default.nix index 11ba2d807..93b29e38d 100644 --- a/python/pkgs/krfzf-py/default.nix +++ b/python/pkgs/krfzf-py/default.nix @@ -5,14 +5,14 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "krfzf-py"; version = "0.0.6"; pyproject = true; src = fetchPypi { pname = "krfzf_py"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-/M9Atu9MLAGmnEdx6tknMJAit2o4Xt971uQ7pb0CBCk="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/krfzf-py/"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/kserve-storage/default.nix b/python/pkgs/kserve-storage/default.nix index 3491b9d30..b47cc2887 100644 --- a/python/pkgs/kserve-storage/default.nix +++ b/python/pkgs/kserve-storage/default.nix @@ -21,14 +21,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kserve-storage"; version = "0.20.0"; pyproject = true; src = fetchPypi { pname = "kserve_storage"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-8tBFGx++hMQkZfptV0EuFePZrlN1Tn5TlefzGop9aU0="; }; @@ -67,4 +67,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/kserve-storage"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/kubernetes-asyncio/default.nix b/python/pkgs/kubernetes-asyncio/default.nix index 144e7e4b8..97f04ab97 100644 --- a/python/pkgs/kubernetes-asyncio/default.nix +++ b/python/pkgs/kubernetes-asyncio/default.nix @@ -16,7 +16,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kubernetes-asyncio"; version = "33.3.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tomplus"; repo = "kubernetes_asyncio"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Ei5Y2IBBk8AoMQQBHOvKkJ1H+9dmnz22qrrZKrWazVE="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/tomplus/kubernetes_asyncio"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/kubernetes/default.nix b/python/pkgs/kubernetes/default.nix index c9a7f723d..b0a769e60 100644 --- a/python/pkgs/kubernetes/default.nix +++ b/python/pkgs/kubernetes/default.nix @@ -19,7 +19,7 @@ websocket-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kubernetes"; version = "36.0.3"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kubernetes-client"; repo = "python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-e5fD5H33hkyVSbNTky2R4RbuIsR/MPNj2rYONKxyGOo="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/kubernetes-client/python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/kurbopy/default.nix b/python/pkgs/kurbopy/default.nix index ac0c680c8..abc89f6cf 100644 --- a/python/pkgs/kurbopy/default.nix +++ b/python/pkgs/kurbopy/default.nix @@ -2,29 +2,33 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, fonttools, pytestCheckHook, rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kurbopy"; version = "0.13.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JiXNgUeY2booOp1zaWtCuEqdyp/CxXy4rUo5kKmq0eQ="; }; - propagatedBuildInputs = [ fonttools ]; + build-system = [ setuptools ]; + + dependencies = [ fonttools ]; nativeBuildInputs = [ rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-dWYOQk6kSGRL8nl3f89FWzdB17hgBALvsQkjeT9oKNc="; }; @@ -43,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/simoncozens/kurbopy"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/kuzu/default.nix b/python/pkgs/kuzu/default.nix index 4751cdb95..8f12bf6c8 100644 --- a/python/pkgs/kuzu/default.nix +++ b/python/pkgs/kuzu/default.nix @@ -6,12 +6,12 @@ cmake, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kuzu"; version = "0.11.3"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-576jyjDEu0Ynku7cqn8hJcgAskO7SocuHu3BaRfBlno="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://kuzudb.com/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/l18n/default.nix b/python/pkgs/l18n/default.nix index 651d155c8..df33ca0c7 100644 --- a/python/pkgs/l18n/default.nix +++ b/python/pkgs/l18n/default.nix @@ -1,6 +1,8 @@ { buildPythonPackage, fetchPypi, + # build-system + setuptools, lib, pytz, six, @@ -9,20 +11,21 @@ buildPythonPackage (finalAttrs: { pname = "l18n"; version = "2021.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-GVbokNZz0XE1zCCRMlPBVPa8HAAmbCK31QPMGlpC2Eg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pytz six ]; # tests are not included in sdist and building from source is none trivial - doCheck = false; pythonImportsCheck = [ "l18n" ]; diff --git a/python/pkgs/la-panic/default.nix b/python/pkgs/la-panic/default.nix index 700d6ee51..777769abc 100644 --- a/python/pkgs/la-panic/default.nix +++ b/python/pkgs/la-panic/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "la-panic"; version = "0.5.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "yanivhasbanidev"; repo = "la_panic"; - tag = version; + tag = finalAttrs.version; hash = "sha256-V9VUSp5uvj4jR3oVHdRjvnNDGB1a5bi8elu/ry4jq00="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; mainProgram = "la_panic"; }; -} +}) diff --git a/python/pkgs/labmath/default.nix b/python/pkgs/labmath/default.nix index cf3f84b49..c5f26047a 100644 --- a/python/pkgs/labmath/default.nix +++ b/python/pkgs/labmath/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "labmath"; version = "2.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dzJ4szPxnck0Cgc5IEp5FBmHvIyAC0rqKRVrkt20ntQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Module for basic math in the general vicinity of computational number theory"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/laces/default.nix b/python/pkgs/laces/default.nix index 67c8d4623..2cfb55b5a 100644 --- a/python/pkgs/laces/default.nix +++ b/python/pkgs/laces/default.nix @@ -6,7 +6,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "laces"; version = "0.1.2"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tbrlpld"; repo = "laces"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ELpPq7pqcLfAqUuHh8NOAOOiGPDImTFsA7WUHvVfMiI="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; pythonImportsCheck = [ "laces" ]; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/tbrlpld/laces"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/lacrosse-view/default.nix b/python/pkgs/lacrosse-view/default.nix index 27cea0446..f259e4f11 100644 --- a/python/pkgs/lacrosse-view/default.nix +++ b/python/pkgs/lacrosse-view/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lacrosse-view"; version = "1.1.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "IceBotYT"; repo = "lacrosse_view"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KU3/w/LpbDNmrE70wj7j1ztKn+k4wP6RzvUU1p50i2A="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # No tests - doCheck = false; pythonImportsCheck = [ "lacrosse_view" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/IceBotYT/lacrosse_view"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lakeside/default.nix b/python/pkgs/lakeside/default.nix index 56d830d35..26ac3519d 100644 --- a/python/pkgs/lakeside/default.nix +++ b/python/pkgs/lakeside/default.nix @@ -2,31 +2,34 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, protobuf, pycryptodome, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lakeside"; version = "0.13"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "nkgilley"; repo = "python-lakeside"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Y5g78trkwOF3jsbgTv0uVkvfB1HZN+w1T6xIorxGAhg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ protobuf pycryptodome requests ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "lakeside" ]; @@ -35,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/nkgilley/python-lakeside"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/lance-namespace-urllib3-client/default.nix b/python/pkgs/lance-namespace-urllib3-client/default.nix index 4ac46c114..4ac5ca2ae 100644 --- a/python/pkgs/lance-namespace-urllib3-client/default.nix +++ b/python/pkgs/lance-namespace-urllib3-client/default.nix @@ -19,7 +19,6 @@ buildPythonPackage (finalAttrs: { pname = "lance-namespace-urllib3-client"; version = "0.12.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "lancedb"; diff --git a/python/pkgs/lance-namespace/default.nix b/python/pkgs/lance-namespace/default.nix index 81777d51c..34dcd124b 100644 --- a/python/pkgs/lance-namespace/default.nix +++ b/python/pkgs/lance-namespace/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "lance-namespace"; version = "0.12.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "lancedb"; diff --git a/python/pkgs/lancedb/default.nix b/python/pkgs/lancedb/default.nix index bda7481f1..aacf3ad25 100644 --- a/python/pkgs/lancedb/default.nix +++ b/python/pkgs/lancedb/default.nix @@ -33,7 +33,6 @@ buildPythonPackage (finalAttrs: { pname = "lancedb"; version = "0.32.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "lancedb"; diff --git a/python/pkgs/langchain-anthropic/default.nix b/python/pkgs/langchain-anthropic/default.nix index 698858850..00c666492 100644 --- a/python/pkgs/langchain-anthropic/default.nix +++ b/python/pkgs/langchain-anthropic/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "langchain-anthropic"; version = "1.4.8"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langchain-aws/default.nix b/python/pkgs/langchain-aws/default.nix index fadfc0ce6..1073f8ab4 100644 --- a/python/pkgs/langchain-aws/default.nix +++ b/python/pkgs/langchain-aws/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { pname = "langchain-aws"; version = "1.7.5"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langchain-azure-dynamic-sessions/default.nix b/python/pkgs/langchain-azure-dynamic-sessions/default.nix index cfc3d3b42..fc4a48dc5 100644 --- a/python/pkgs/langchain-azure-dynamic-sessions/default.nix +++ b/python/pkgs/langchain-azure-dynamic-sessions/default.nix @@ -28,7 +28,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "langchain-azure-dynamic-sessions"; version = "0.2.0"; pyproject = true; @@ -36,11 +36,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-azure-dynamic-sessions==${version}"; + tag = "langchain-azure-dynamic-sessions==${finalAttrs.version}"; hash = "sha256-tgvoOSr4tpi+tFBan+kw8FZUfUJHcQXv9e1nyeGP0so="; }; - sourceRoot = "${src.name}/libs/partners/azure-dynamic-sessions"; + sourceRoot = "${finalAttrs.src.name}/libs/partners/azure-dynamic-sessions"; build-system = [ poetry-core ]; @@ -79,4 +79,4 @@ buildPythonPackage rec { homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/azure-dynamic-sessions"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/langchain-classic/default.nix b/python/pkgs/langchain-classic/default.nix index 23d208578..de12283cf 100644 --- a/python/pkgs/langchain-classic/default.nix +++ b/python/pkgs/langchain-classic/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { pname = "langchain-classic"; version = "1.0.8"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langchain-community/default.nix b/python/pkgs/langchain-community/default.nix index 417d50062..51902d826 100644 --- a/python/pkgs/langchain-community/default.nix +++ b/python/pkgs/langchain-community/default.nix @@ -26,7 +26,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "langchain-community"; version = "0.4.2"; pyproject = true; @@ -34,11 +34,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-community"; - tag = "libs/community/v${version}"; + tag = "libs/community/v${finalAttrs.version}"; hash = "sha256-I9xULsg+tlXM3Brh6Xa5xvFENx8zn4FRZ1/evNEh8UY="; }; - sourceRoot = "${src.name}/libs/community"; + sourceRoot = "${finalAttrs.src.name}/libs/community"; build-system = [ hatchling ]; @@ -72,4 +72,4 @@ buildPythonPackage rec { homepage = "https://github.com/langchain-ai/langchain-community"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/langchain-core/default.nix b/python/pkgs/langchain-core/default.nix index 293a567d0..1f6a1a24a 100644 --- a/python/pkgs/langchain-core/default.nix +++ b/python/pkgs/langchain-core/default.nix @@ -38,7 +38,6 @@ buildPythonPackage (finalAttrs: { pname = "langchain-core"; version = "1.4.9"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; @@ -66,7 +65,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "langchain_core" ]; # avoid infinite recursion - doCheck = false; passthru = { tests.pytest = langchain-core.overridePythonAttrs (_: { }); diff --git a/python/pkgs/langchain-deepseek/default.nix b/python/pkgs/langchain-deepseek/default.nix index 2d39910cf..bd2bbde9e 100644 --- a/python/pkgs/langchain-deepseek/default.nix +++ b/python/pkgs/langchain-deepseek/default.nix @@ -20,7 +20,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "langchain-deepseek"; version = "1.1.0"; pyproject = true; @@ -28,11 +28,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-deepseek==${version}"; + tag = "langchain-deepseek==${finalAttrs.version}"; hash = "sha256-IHWTArtJB/CLIk0tKirRxUPcdJiqf1NDXn5Y+HBYv/g="; }; - sourceRoot = "${src.name}/libs/partners/deepseek"; + sourceRoot = "${finalAttrs.src.name}/libs/partners/deepseek"; build-system = [ hatchling @@ -65,4 +65,4 @@ buildPythonPackage rec { homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/deepseek"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/langchain-google-genai/default.nix b/python/pkgs/langchain-google-genai/default.nix index faba3fb0e..9052c5d24 100644 --- a/python/pkgs/langchain-google-genai/default.nix +++ b/python/pkgs/langchain-google-genai/default.nix @@ -30,7 +30,6 @@ buildPythonPackage (finalAttrs: { pname = "langchain-google-genai"; version = "4.2.7"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langchain-groq/default.nix b/python/pkgs/langchain-groq/default.nix index a74a905ee..744efb7bf 100644 --- a/python/pkgs/langchain-groq/default.nix +++ b/python/pkgs/langchain-groq/default.nix @@ -19,7 +19,6 @@ buildPythonPackage (finalAttrs: { pname = "langchain-groq"; version = "1.1.3"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langchain-mistralai/default.nix b/python/pkgs/langchain-mistralai/default.nix index ad1cd8598..b8cdde330 100644 --- a/python/pkgs/langchain-mistralai/default.nix +++ b/python/pkgs/langchain-mistralai/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { pname = "langchain-mistralai"; version = "1.1.6"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langchain-ollama/default.nix b/python/pkgs/langchain-ollama/default.nix index b39165cdf..19e9a4e5c 100644 --- a/python/pkgs/langchain-ollama/default.nix +++ b/python/pkgs/langchain-ollama/default.nix @@ -24,7 +24,6 @@ buildPythonPackage (finalAttrs: { pname = "langchain-ollama"; version = "1.1.0"; pyproject = true; - __structuredAttrs = true; strictDeps = true; src = fetchFromGitHub { diff --git a/python/pkgs/langchain-openai/default.nix b/python/pkgs/langchain-openai/default.nix index fc5fab69d..f218c26d9 100644 --- a/python/pkgs/langchain-openai/default.nix +++ b/python/pkgs/langchain-openai/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { pname = "langchain-openai"; version = "1.3.5"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langchain-protocol/default.nix b/python/pkgs/langchain-protocol/default.nix index adea6d8c4..da32512bc 100644 --- a/python/pkgs/langchain-protocol/default.nix +++ b/python/pkgs/langchain-protocol/default.nix @@ -10,14 +10,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "langchain-protocol"; version = "0.0.18"; pyproject = true; src = fetchPypi { pname = "langchain_protocol"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-7D4ReC8e0MnbOOWp7QGw56DT+6QG+qiu9llLc8VqY+Y="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/langchain-protocol"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/langchain-tests/default.nix b/python/pkgs/langchain-tests/default.nix index 249b658b4..b1ec298af 100644 --- a/python/pkgs/langchain-tests/default.nix +++ b/python/pkgs/langchain-tests/default.nix @@ -30,7 +30,6 @@ buildPythonPackage (finalAttrs: { pname = "langchain-tests"; version = "1.1.9"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langchain/default.nix b/python/pkgs/langchain/default.nix index 07cc539fc..d0d2cc33c 100644 --- a/python/pkgs/langchain/default.nix +++ b/python/pkgs/langchain/default.nix @@ -27,7 +27,6 @@ buildPythonPackage (finalAttrs: { pname = "langchain"; version = "1.3.13"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langcodes/default.nix b/python/pkgs/langcodes/default.nix index 76a5e542e..898e61190 100644 --- a/python/pkgs/langcodes/default.nix +++ b/python/pkgs/langcodes/default.nix @@ -8,13 +8,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "langcodes"; version = "3.5.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QL/zFeAbAdEcKuOSjdT1y9dN04+b2RLBK5o2BsFD9zE="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/georgkrause/langcodes"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/langdetect/default.nix b/python/pkgs/langdetect/default.nix index a46b240d7..93b4b6514 100644 --- a/python/pkgs/langdetect/default.nix +++ b/python/pkgs/langdetect/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "langdetect"; version = "1.0.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-y8H++J+NBic5d0vVHto9oydABrNmHRmcJlX2s/bWBaA="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/Mimino666/langdetect"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/langfuse/default.nix b/python/pkgs/langfuse/default.nix index e3bbfded8..740099804 100644 --- a/python/pkgs/langfuse/default.nix +++ b/python/pkgs/langfuse/default.nix @@ -41,7 +41,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "langfuse" ]; # tests require network access and openai api key - doCheck = false; meta = { description = "Instrument your LLM app with decorators or low-level SDK and get detailed tracing/observability"; diff --git a/python/pkgs/langgraph-checkpoint-postgres/default.nix b/python/pkgs/langgraph-checkpoint-postgres/default.nix index a9d62cb6a..68acf61a0 100644 --- a/python/pkgs/langgraph-checkpoint-postgres/default.nix +++ b/python/pkgs/langgraph-checkpoint-postgres/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { pname = "langgraph-checkpoint-postgres"; version = "3.1.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langgraph-checkpoint-sqlite/default.nix b/python/pkgs/langgraph-checkpoint-sqlite/default.nix index 27e132f6e..5337f3487 100644 --- a/python/pkgs/langgraph-checkpoint-sqlite/default.nix +++ b/python/pkgs/langgraph-checkpoint-sqlite/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "langgraph-checkpoint-sqlite"; version = "3.1.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langgraph-checkpoint/default.nix b/python/pkgs/langgraph-checkpoint/default.nix index 302ec1953..dc97bc54e 100644 --- a/python/pkgs/langgraph-checkpoint/default.nix +++ b/python/pkgs/langgraph-checkpoint/default.nix @@ -42,11 +42,10 @@ buildPythonPackage (finalAttrs: { dependencies = [ langchain-core + msgpack ormsgpack ]; - propagatedBuildInputs = [ msgpack ]; - pythonImportsCheck = [ "langgraph.checkpoint" ]; passthru = { # python updater script sets the wrong tag diff --git a/python/pkgs/langgraph-cli/default.nix b/python/pkgs/langgraph-cli/default.nix index 36f39e2ba..fa43ca126 100644 --- a/python/pkgs/langgraph-cli/default.nix +++ b/python/pkgs/langgraph-cli/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { pname = "langgraph-cli"; version = "0.4.31"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langgraph-prebuilt/default.nix b/python/pkgs/langgraph-prebuilt/default.nix index ef6ef1970..33b6990b8 100644 --- a/python/pkgs/langgraph-prebuilt/default.nix +++ b/python/pkgs/langgraph-prebuilt/default.nix @@ -24,7 +24,6 @@ buildPythonPackage (finalAttrs: { pname = "langgraph-prebuilt"; version = "1.1.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langgraph-sdk/default.nix b/python/pkgs/langgraph-sdk/default.nix index 8baeba1d6..1a68576c6 100644 --- a/python/pkgs/langgraph-sdk/default.nix +++ b/python/pkgs/langgraph-sdk/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { pname = "langgraph-sdk"; version = "0.4.2"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langgraph/default.nix b/python/pkgs/langgraph/default.nix index 339f67d81..aa81d182d 100644 --- a/python/pkgs/langgraph/default.nix +++ b/python/pkgs/langgraph/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { pname = "langgraph"; version = "1.2.7"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "langchain-ai"; diff --git a/python/pkgs/langid/default.nix b/python/pkgs/langid/default.nix index dcc4d8a06..2f0bde801 100644 --- a/python/pkgs/langid/default.nix +++ b/python/pkgs/langid/default.nix @@ -3,29 +3,24 @@ buildPythonPackage, fetchPypi, setuptools, - wheel, numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "langid"; version = "1.1.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { # use PyPi as source, github repository does not contain tags or release branches - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BEvK4ZEtq4XDPY6Y8oEbj0/xIT5emp6VEBN7hNosspM="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; - doCheck = false; # Package has no tests pythonImportsCheck = [ "langid" ]; meta = { @@ -34,4 +29,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/langid/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/language-data/default.nix b/python/pkgs/language-data/default.nix index b0e905026..93bea4771 100644 --- a/python/pkgs/language-data/default.nix +++ b/python/pkgs/language-data/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "language-data"; version = "1.4.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "georgkrause"; repo = "language_data"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cWjeb2toGrnNSsK566e18NgWhv6YdQrKEzFPilmBdoA="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/georgkrause/language_data"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/language-tags/default.nix b/python/pkgs/language-tags/default.nix index 5acf537e8..d2800f018 100644 --- a/python/pkgs/language-tags/default.nix +++ b/python/pkgs/language-tags/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "language-tags"; version = "1.2.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "OnroerendErfgoed"; repo = "language-tags"; - tag = version; + tag = finalAttrs.version; hash = "sha256-T9K290seKhQLqW36EfA9kn3WveKCmyjN4Mx2j50qIEk="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://language-tags.readthedocs.io/en/latest/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/language-tool-python/default.nix b/python/pkgs/language-tool-python/default.nix index e83520b6d..4aa77610b 100644 --- a/python/pkgs/language-tool-python/default.nix +++ b/python/pkgs/language-tool-python/default.nix @@ -9,7 +9,7 @@ toml, pip, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "language-tool-python"; version = "3.4.0"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jxmorris12"; repo = "language_tool_python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-EX6O9bYJgrgvKkFDjq3A144iFkcwNPIvTTEIC9D9J6M="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/lanms-neo/default.nix b/python/pkgs/lanms-neo/default.nix index b1d5b96f9..fe8704fe9 100644 --- a/python/pkgs/lanms-neo/default.nix +++ b/python/pkgs/lanms-neo/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, nix-update-script, pybind11, numpy, @@ -12,7 +14,7 @@ let in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "gen-ko"; @@ -21,7 +23,9 @@ buildPythonPackage { hash = "sha256-0fs4RNN1ptiir7GfR9B8HK0VqTkk5PbVJxgKiDId3po="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pybind11 numpy ]; diff --git a/python/pkgs/lap/default.nix b/python/pkgs/lap/default.nix index 2a0d03505..dfdde9381 100644 --- a/python/pkgs/lap/default.nix +++ b/python/pkgs/lap/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lap"; version = "0.5.13"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nv9xaePKRSmVrwSTzCDTVFLEv9BhIsNsBkVxGf+9QRs="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/gatagat/lap"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/lark/default.nix b/python/pkgs/lark/default.nix index 0a3f24311..1f6c9e032 100644 --- a/python/pkgs/lark/default.nix +++ b/python/pkgs/lark/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lark"; version = "1.3.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JDtLSbVjypaHqamkknHDSql1GTMf1LA4TgJXqTn4Q20="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools-scm ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; dependencies = [ regex ]; @@ -35,11 +35,9 @@ buildPythonPackage rec { "lark.grammars" ]; - doCheck = false; - meta = { description = "Modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; homepage = "https://lark-parser.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lastversion/default.nix b/python/pkgs/lastversion/default.nix index ad2825c87..aca349139 100644 --- a/python/pkgs/lastversion/default.nix +++ b/python/pkgs/lastversion/default.nix @@ -20,7 +20,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lastversion"; version = "3.6.12"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dvershinin"; repo = "lastversion"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5losSZnAW16KznXKtH+hy8Ii6j/B5tMOSQFx6Sv3DT0="; }; @@ -81,4 +81,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; mainProgram = "lastversion"; }; -} +}) diff --git a/python/pkgs/latex2pydata/default.nix b/python/pkgs/latex2pydata/default.nix index de5a0d749..33c2677a1 100644 --- a/python/pkgs/latex2pydata/default.nix +++ b/python/pkgs/latex2pydata/default.nix @@ -6,13 +6,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "latex2pydata"; version = "0.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vMrSCDw6btcEkmU9XYGczZNgo6/Dwxnb7PSW+6BXQok="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/latexcodec/default.nix b/python/pkgs/latexcodec/default.nix index 79fecbeba..cfd03388b 100644 --- a/python/pkgs/latexcodec/default.nix +++ b/python/pkgs/latexcodec/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "latexcodec"; version = "3.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-54ppEc1y+d7DUDHG7CNYTeaEK/vEYQqWeIaNFM37A1c="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Lexer and codec to work with LaTeX code in Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/latexify-py/default.nix b/python/pkgs/latexify-py/default.nix index f1c40486b..0067406fd 100644 --- a/python/pkgs/latexify-py/default.nix +++ b/python/pkgs/latexify-py/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "latexify-py"; version = "0.4.4"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = "latexify_py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tyBIOIVRSNrhO1NOD7Zqmiksrvrm42DUY4w1IocVRl4="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/latexify_py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/latexrestricted/default.nix b/python/pkgs/latexrestricted/default.nix index 67c52349e..7892f228c 100644 --- a/python/pkgs/latexrestricted/default.nix +++ b/python/pkgs/latexrestricted/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "latexrestricted"; version = "0.6.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1R0hpBGXpYH/KcD4GFUfFvoOaJDe+Sl5msC952KnqmA="; }; @@ -20,11 +20,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "latexrestricted" ]; # upstream has no tests - doCheck = false; meta = { homepage = "https://github.com/gpoore/latexrestricted"; description = "Python library for creating executables compatible with LaTeX restricted shell escape"; license = lib.licenses.lppl13c; }; -} +}) diff --git a/python/pkgs/launchpadlib/default.nix b/python/pkgs/launchpadlib/default.nix index 4731256db..1cdced3c1 100644 --- a/python/pkgs/launchpadlib/default.nix +++ b/python/pkgs/launchpadlib/default.nix @@ -9,13 +9,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "launchpadlib"; version = "2.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tMJYkLt1BQ1UwIEj0nMxVreKWaJVX1Rh9psORM2RJC8="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://help.launchpad.net/API/launchpadlib"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/laundrify-aio/default.nix b/python/pkgs/laundrify-aio/default.nix index e7a781645..1257e15be 100644 --- a/python/pkgs/laundrify-aio/default.nix +++ b/python/pkgs/laundrify-aio/default.nix @@ -7,7 +7,7 @@ pyjwt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "laundrify-aio"; version = "1.2.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "laundrify"; repo = "laundrify-pypi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iFQ0396BkGWM7Ma/I0gbXucd2/yPmEVF4IC3/bMK2SA="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "laundrify_aio" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/laundrify/laundrify-pypi"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/lazr-config/default.nix b/python/pkgs/lazr-config/default.nix index 77a6e31a1..dd3ebf787 100644 --- a/python/pkgs/lazr-config/default.nix +++ b/python/pkgs/lazr-config/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lazr-config"; version = "3.1"; pyproject = true; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://launchpad.net/lazr.config"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/lazr-delegates/default.nix b/python/pkgs/lazr-delegates/default.nix index cd7549a52..dd109cbfb 100644 --- a/python/pkgs/lazr-delegates/default.nix +++ b/python/pkgs/lazr-delegates/default.nix @@ -6,14 +6,14 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lazr-delegates"; version = "4.0.0"; pyproject = true; src = fetchPypi { pname = "lazr_delegates"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-uxXCGgG1d6tfrHPaYbFU3W/NN3868C5SIHe0rhH+7Tc="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://launchpad.net/lazr.delegates"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/lazr-restfulclient/default.nix b/python/pkgs/lazr-restfulclient/default.nix index 5af5b49d8..95e4d1f48 100644 --- a/python/pkgs/lazr-restfulclient/default.nix +++ b/python/pkgs/lazr-restfulclient/default.nix @@ -10,14 +10,14 @@ wadllib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lazr-restfulclient"; version = "0.14.6"; pyproject = true; src = fetchPypi { pname = "lazr.restfulclient"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Q/EqHTlIRjsUYgOMR7Qp3LXkLgun8uFlEbArpdKt/9s="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/lazr.restfulclient"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/lazr-uri/default.nix b/python/pkgs/lazr-uri/default.nix index 4929cc049..d685e25cd 100644 --- a/python/pkgs/lazr-uri/default.nix +++ b/python/pkgs/lazr-uri/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lazr-uri"; version = "4.0.0"; pyproject = true; src = fetchPypi { pname = "lazr_uri"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-1KTkS3yHJpq2wB39TEYLjwSS4jd8QhUVfChZKYiO/lw="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://launchpad.net/lazr.uri"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/lazy-loader/default.nix b/python/pkgs/lazy-loader/default.nix index 63445656c..410a70290 100644 --- a/python/pkgs/lazy-loader/default.nix +++ b/python/pkgs/lazy-loader/default.nix @@ -6,14 +6,14 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lazy-loader"; version = "0.5"; pyproject = true; src = fetchPypi { pname = "lazy_loader"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-cX+ReaDb7TVwEt2tUKWtPV5NmguHEmgNTmh/Xm5u2bM="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { description = "Populate library namespace without incurring immediate import costs"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/lazy-object-proxy/default.nix b/python/pkgs/lazy-object-proxy/default.nix index 77b8e6c40..54515011e 100644 --- a/python/pkgs/lazy-object-proxy/default.nix +++ b/python/pkgs/lazy-object-proxy/default.nix @@ -5,7 +5,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lazy-object-proxy"; version = "1.12.0"; pyproject = true; @@ -13,18 +13,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ionelmc"; repo = "python-lazy-object-proxy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-80+QJlm2X2u0OGEkYbEsdg8OiAXLiBwrkVXOF9NBL+I="; }; build-system = [ setuptools-scm ]; # Broken tests. Seem to be fixed upstream according to Travis. - doCheck = false; meta = { description = "Fast and thorough lazy object proxy"; homepage = "https://github.com/ionelmc/python-lazy-object-proxy"; license = with lib.licenses; [ bsd2 ]; }; -} +}) diff --git a/python/pkgs/lazy/default.nix b/python/pkgs/lazy/default.nix index e187ef74c..2992c770d 100644 --- a/python/pkgs/lazy/default.nix +++ b/python/pkgs/lazy/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lazy"; version = "2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+S7A0y3WvRFd3sTjMjRz68C2gq1Yxqynjr/Z5tGqV3c="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Lazy attributes for Python objects"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/lb-matching-tools/default.nix b/python/pkgs/lb-matching-tools/default.nix index b8c497f61..5356bf339 100644 --- a/python/pkgs/lb-matching-tools/default.nix +++ b/python/pkgs/lb-matching-tools/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lb-matching-tools"; version = "2024.01.30.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "metabrainz"; repo = "listenbrainz-matching-tools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RQ4X6DKigQsNxaAWXB1meATKP+ddMUgkoAIyX8iIisU="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/metabrainz/listenbrainz-matching-tools"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/lc7001/default.nix b/python/pkgs/lc7001/default.nix index e94c89598..3a870c87c 100644 --- a/python/pkgs/lc7001/default.nix +++ b/python/pkgs/lc7001/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lc7001"; version = "1.0.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-I4I3vwW1kJsgLFPMGpe9hkD3iEeC3AqI4pCi6SCWPx4="; }; @@ -22,10 +22,9 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ cryptography ]; + dependencies = [ cryptography ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "lc7001" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/rtyle/lc7001"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lcgit/default.nix b/python/pkgs/lcgit/default.nix index 64092b611..7511235ac 100644 --- a/python/pkgs/lcgit/default.nix +++ b/python/pkgs/lcgit/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lcgit"; version = "3.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cisagov"; repo = "lcgit"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nCsTA0BKE/0afcqqqEx0mUrLOFbta14TPtNXHD67mas="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/cisagov/lcgit"; license = lib.licenses.cc0; }; -} +}) diff --git a/python/pkgs/lcn-frontend/default.nix b/python/pkgs/lcn-frontend/default.nix index ab7d26eff..9f147917f 100644 --- a/python/pkgs/lcn-frontend/default.nix +++ b/python/pkgs/lcn-frontend/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lcn-frontend"; version = "0.2.9"; pyproject = true; src = fetchPypi { pname = "lcn_frontend"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-JQcnfBqwlDp31XRg2yBG9HZ8j4avxp57Qa3gBqT+67I="; }; @@ -21,11 +21,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "lcn_frontend" ]; # upstream has no tests - doCheck = false; meta = { description = "LCN panel for Home Assistant"; homepage = "https://github.com/alengwenus/lcn-frontend"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ldap3-bleeding-edge/default.nix b/python/pkgs/ldap3-bleeding-edge/default.nix index 100241440..f70f39516 100644 --- a/python/pkgs/ldap3-bleeding-edge/default.nix +++ b/python/pkgs/ldap3-bleeding-edge/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ldap3-bleeding-edge"; version = "2.10.1.1338"; pyproject = true; src = fetchPypi { pname = "ldap3_bleeding_edge"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-7j5W1C0scvjm6j3eueNomdTRd+Uzishhr2U1bb1gB3s="; }; @@ -35,11 +35,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "ldap3" ]; # Tests require network access - doCheck = false; meta = { description = "Strictly RFC 4510 conforming LDAP V3 client library (bleeding edge)"; homepage = "https://pypi.org/project/ldap3-bleeding-edge/"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/ldap3/default.nix b/python/pkgs/ldap3/default.nix index ced828294..15a2fdf09 100644 --- a/python/pkgs/ldap3/default.nix +++ b/python/pkgs/ldap3/default.nix @@ -6,13 +6,13 @@ pyasn1, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ldap3"; version = "2.9.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8+f8Rxjj8J3aVotXEACV4M5YYzvKu+2GZ84/j7qkIp8="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { dependencies = [ pyasn1 ]; - doCheck = false; - pythonImportsCheck = [ "ldap3" ]; meta = { @@ -29,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/cannatag/ldap3"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/ldapdomaindump/default.nix b/python/pkgs/ldapdomaindump/default.nix index 744157ff8..d93ade1bb 100644 --- a/python/pkgs/ldapdomaindump/default.nix +++ b/python/pkgs/ldapdomaindump/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ldapdomaindump"; version = "0.10.0"; pyproject = true; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # Tests require LDAP server - doCheck = false; pythonImportsCheck = [ "ldapdomaindump" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/dirkjanm/ldapdomaindump/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ldappool/default.nix b/python/pkgs/ldappool/default.nix index 56149b0b5..c111add57 100644 --- a/python/pkgs/ldappool/default.nix +++ b/python/pkgs/ldappool/default.nix @@ -9,14 +9,14 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ldappool"; version = "3.0.0"; pyproject = true; src = fetchPypi { pname = "ldappool"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-S7WbfWsRQH9I7gGngSZ+PIupjZH0JoBqxyCGEq4Ie4Y="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { gpl2Plus ]; }; -} +}) diff --git a/python/pkgs/ldaptor/default.nix b/python/pkgs/ldaptor/default.nix index 78c0dee75..4399317a8 100644 --- a/python/pkgs/ldaptor/default.nix +++ b/python/pkgs/ldaptor/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, twisted, passlib, pyparsing, @@ -9,17 +11,19 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ldaptor"; version = "21.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jEnrGTddSqs+W4NYYGFODLF+VrtaIOGHSAj6W+xno1g="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ passlib pyparsing six @@ -33,7 +37,6 @@ buildPythonPackage rec { # Test creates an excessive amount of temporary files (order of millions). # Cleaning up those files already took over 15 hours already on my zfs # filesystem and is not finished yet. - doCheck = false; checkPhase = '' trial -j$NIX_BUILD_CORES ldaptor @@ -44,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/ldaptor"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ldfparser/default.nix b/python/pkgs/ldfparser/default.nix index b4af23cb5..8f375425d 100644 --- a/python/pkgs/ldfparser/default.nix +++ b/python/pkgs/ldfparser/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ldfparser"; version = "0.26.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "c4deszes"; repo = "ldfparser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SVl/O0/2k1Y4lta+3BFkddyBZfYO2vqh4Xx1ZXNwXN4="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "ldfparser"; }; -} +}) diff --git a/python/pkgs/leanclient/default.nix b/python/pkgs/leanclient/default.nix index 2acbe8f46..7c0f9ac40 100644 --- a/python/pkgs/leanclient/default.nix +++ b/python/pkgs/leanclient/default.nix @@ -35,7 +35,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests require a real Lean toolchain - doCheck = false; pythonImportsCheck = [ "leanclient" ]; diff --git a/python/pkgs/leather/default.nix b/python/pkgs/leather/default.nix index 5fbc11daf..75e67090f 100644 --- a/python/pkgs/leather/default.nix +++ b/python/pkgs/leather/default.nix @@ -10,13 +10,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "leather"; version = "0.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZxGcKu6TvoIfB3GTvYU04pbAWzi9F02cWoDEqjHRpNM="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { description = "Python charting library"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/leb128/default.nix b/python/pkgs/leb128/default.nix index 534924c9d..e1337efaf 100644 --- a/python/pkgs/leb128/default.nix +++ b/python/pkgs/leb128/default.nix @@ -5,7 +5,7 @@ lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "leb128"; version = "1.0.9"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mohanson"; repo = "leb128"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-X3iBYiANzM97M91dCyjEU/Onhqcid3MMsNzzKtcRcyA="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/mohanson/leb128"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ledgercomm/default.nix b/python/pkgs/ledgercomm/default.nix index e69cab098..e7acdd947 100644 --- a/python/pkgs/ledgercomm/default.nix +++ b/python/pkgs/ledgercomm/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ledgercomm"; version = "1.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AVz8BfFrjFn4zB2fwLiTWSPx/MOAbTPutrDgVbRPWpE="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/LedgerHQ/ledgercomm"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/legacy-api-wrap/default.nix b/python/pkgs/legacy-api-wrap/default.nix index 21466844f..b06c045f2 100644 --- a/python/pkgs/legacy-api-wrap/default.nix +++ b/python/pkgs/legacy-api-wrap/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "legacy-api-wrap"; version = "1.5"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "flying-sheep"; repo = "legacy-api-wrap"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UvOkVNtH3MbD+ExF0dQ+XAfDx9v7YD3GCNUsEaH7zzM="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/flying-sheep/legacy-api-wrap"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/legacy-cgi/default.nix b/python/pkgs/legacy-cgi/default.nix index 89db05c19..e95ea0b9b 100644 --- a/python/pkgs/legacy-cgi/default.nix +++ b/python/pkgs/legacy-cgi/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "legacy-cgi"; version = "2.6.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jackrosenthal"; repo = "legacy-cgi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2CCYRRWP8FP54AcLnehJ0Kj3F3U4cz8vnesSj5EakdA="; }; @@ -25,9 +25,9 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/jackrosenthal/legacy-cgi/releases/tag/${src.tag}"; + changelog = "https://github.com/jackrosenthal/legacy-cgi/releases/tag/${finalAttrs.src.tag}"; description = "Fork of the standard library cgi and cgitb modules, being deprecated in PEP-594"; homepage = "https://github.com/jackrosenthal/legacy-cgi"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/lektricowifi/default.nix b/python/pkgs/lektricowifi/default.nix index af45d56b0..19ffa7e19 100644 --- a/python/pkgs/lektricowifi/default.nix +++ b/python/pkgs/lektricowifi/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lektricowifi"; version = "0.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Lektrico"; repo = "lektricowifi"; - tag = "v.${version}"; + tag = "v.${finalAttrs.version}"; hash = "sha256-GkRZ+fBjLtiZ3dPsn/xeJ7c0cVMY6SHIs+wqhmXXOTk="; }; @@ -42,11 +42,10 @@ buildPythonPackage rec { ]; # AttributeError: type object 'InfoForCharger' has no attribute 'from_dict' - doCheck = false; meta = { description = "Communication with Lektrico's chargers"; homepage = "https://github.com/Lektrico/lektricowifi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/levenshtein/default.nix b/python/pkgs/levenshtein/default.nix index 9e6ca543f..5f958a088 100644 --- a/python/pkgs/levenshtein/default.nix +++ b/python/pkgs/levenshtein/default.nix @@ -9,13 +9,13 @@ rapidfuzz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "levenshtein"; version = "0.27.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GsMmsshCFXlRY9ilr0cRiJGLh5e0lT7IequiLJwfn8A="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/rapidfuzz/Levenshtein"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/lexid/default.nix b/python/pkgs/lexid/default.nix index 2ecd10172..7777e42dd 100644 --- a/python/pkgs/lexid/default.nix +++ b/python/pkgs/lexid/default.nix @@ -2,26 +2,30 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytestCheckHook, click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lexid"; version = "2021.1006"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "509a3a4cc926d3dbf22b203b18a4c66c25e6473fb7c0e0d30374533ac28bafe5"; }; + build-system = [ setuptools ]; + prePatch = '' # Disable lib3to6, since we're only building this on 3.6+ anyway. substituteInPlace setup.py \ --replace 'if any(arg.startswith("bdist") for arg in sys.argv):' 'if False:' ''; - propagatedBuildInputs = [ click ]; + dependencies = [ click ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -31,4 +35,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/lexid/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lhpapi/default.nix b/python/pkgs/lhpapi/default.nix index e43fd3c06..52e6b5ef0 100644 --- a/python/pkgs/lhpapi/default.nix +++ b/python/pkgs/lhpapi/default.nix @@ -9,7 +9,7 @@ fetchFromGitHub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lhpapi"; version = "1.0.11"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stephan192"; repo = "lhpapi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tz1/+NTg8wI0mWcPfM1zk7EheUwShv8eCoYA7wAb/lM="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/stephan192/lhpapi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lib4package/default.nix b/python/pkgs/lib4package/default.nix index a855b1712..61bda0d18 100644 --- a/python/pkgs/lib4package/default.nix +++ b/python/pkgs/lib4package/default.nix @@ -6,7 +6,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lib4package"; version = "0.3.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "anthonyharrison"; repo = "lib4package"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-x+JxBH4vfbXaq/e9PlKfkKvJVz2E3kotmsBhR8alhck="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/anthonyharrison/lib4package"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/lib4sbom/default.nix b/python/pkgs/lib4sbom/default.nix index 2b54aa481..75fd2f755 100644 --- a/python/pkgs/lib4sbom/default.nix +++ b/python/pkgs/lib4sbom/default.nix @@ -13,7 +13,7 @@ xmlschema, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lib4sbom"; version = "0.10.4"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "anthonyharrison"; repo = "lib4sbom"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-P9/QcICGxJUzcsilgfNPeybavgwrPwjO5eDBuxu25BA="; }; @@ -67,4 +67,4 @@ buildPythonPackage rec { homepage = "https://github.com/anthonyharrison/lib4sbom"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/lib4vex/default.nix b/python/pkgs/lib4vex/default.nix index 43daf0092..bdc04f20d 100644 --- a/python/pkgs/lib4vex/default.nix +++ b/python/pkgs/lib4vex/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lib4vex"; version = "0.2.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "anthonyharrison"; repo = "lib4vex"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XH3Y2kbsJFR202F8bmcd3IWpgHS36W+ylDObtBFNFFg="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "lib4vex" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/anthonyharrison/lib4vex"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/lib50/default.nix b/python/pkgs/lib50/default.nix index 43b685881..f5f074def 100644 --- a/python/pkgs/lib50/default.nix +++ b/python/pkgs/lib50/default.nix @@ -13,7 +13,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lib50"; version = "3.2.3"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { # latest GitHub release is several years old. Pypi is up to date. src = fetchPypi { pname = "lib50"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-8qQVDb269uq0aGCy6bVwg/e43KxnzjPUozB3+fhPMlI="; }; @@ -48,7 +48,6 @@ buildPythonPackage rec { # latest GitHub release is several years old and doesn't include # tests and neither does pypi version include tests - doCheck = false; meta = { description = "CS50's own internal library used in many of its tools"; @@ -56,4 +55,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/libais/default.nix b/python/pkgs/libais/default.nix index 79a2171c4..b6e842b1b 100644 --- a/python/pkgs/libais/default.nix +++ b/python/pkgs/libais/default.nix @@ -7,13 +7,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libais"; version = "0.17"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6yrqIpjF6XaSfXSOTA0B4f3aLcHXkgA/3WBZBBNQ018="; }; @@ -24,7 +24,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # data files missing - doCheck = false; pythonImportsCheck = [ "ais" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/libcloud/default.nix b/python/pkgs/libcloud/default.nix index fd223a81b..ceacf9497 100644 --- a/python/pkgs/libcloud/default.nix +++ b/python/pkgs/libcloud/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pycrypto, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "apache-libcloud"; version = "3.8.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-db9MCxI7wiXiTKlfyhw1vjCxnmu4X+6ngUBNQ8QnbJE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pycrypto requests ]; @@ -28,10 +32,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "setup_requires=pytest_runner," "setup_requires=[]," + substituteInPlace pyproject.toml \ + --replace-fail "setuptools~=66.1" "setuptools" \ + --replace-fail "wheel~=0.37.1" "wheel" ''; # requires a certificates file - doCheck = false; pythonImportsCheck = [ "libcloud" ]; @@ -40,4 +46,4 @@ buildPythonPackage rec { homepage = "https://libcloud.apache.org/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/libcst/default.nix b/python/pkgs/libcst/default.nix index a64df88ea..bca48bc8e 100644 --- a/python/pkgs/libcst/default.nix +++ b/python/pkgs/libcst/default.nix @@ -12,7 +12,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libcst"; version = "1.8.6"; pyproject = true; @@ -20,12 +20,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Instagram"; repo = "LibCST"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AJm3grS+I/NXZ8ame4rmHPOxRHGO0Ofo35RtSDO2tyI="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit + inherit (finalAttrs) pname version src @@ -64,4 +64,4 @@ buildPythonPackage rec { psfl ]; }; -} +}) diff --git a/python/pkgs/libgravatar/default.nix b/python/pkgs/libgravatar/default.nix index b9d9fdb5c..6648af7ba 100644 --- a/python/pkgs/libgravatar/default.nix +++ b/python/pkgs/libgravatar/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libgravatar"; version = "1.0.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pabluk"; repo = "libgravatar"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rJv/jfdT+JldxR0kKtXQLOI5wXQYSQRWJnqwExwWjTA="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/pabluk/libgravatar"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/libkeepass/default.nix b/python/pkgs/libkeepass/default.nix index ad8472baa..b5f22e88e 100644 --- a/python/pkgs/libkeepass/default.nix +++ b/python/pkgs/libkeepass/default.nix @@ -1,34 +1,37 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, lxml, pycryptodome, colorama, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libkeepass"; version = "0.3.1.post1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0pwg7n9xqcjia1qmz6g48h5s31slh3mxmcqag73gq4zhl4xb6bai"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ lxml pycryptodome colorama ]; # No tests on PyPI - doCheck = false; meta = { homepage = "https://github.com/libkeepass/libkeepass"; description = "Library to access KeePass 1.x/KeePassX (v3) and KeePass 2.x (v4) files"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/liblistenbrainz/default.nix b/python/pkgs/liblistenbrainz/default.nix index 843fb2906..6d23c158f 100644 --- a/python/pkgs/liblistenbrainz/default.nix +++ b/python/pkgs/liblistenbrainz/default.nix @@ -9,7 +9,7 @@ requests-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "liblistenbrainz"; version = "0.7.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "metabrainz"; repo = "liblistenbrainz"; - tag = version; + tag = finalAttrs.version; hash = "sha256-fZgIVGDUJ4Dh/7CIOugvpRP7FoijpsgA3bBKJMmDd7o="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/metabrainz/liblistenbrainz"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/liblp/default.nix b/python/pkgs/liblp/default.nix index 041bb3893..d12bb50f9 100644 --- a/python/pkgs/liblp/default.nix +++ b/python/pkgs/liblp/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "liblp"; version = "1.0.2"; pyproject = true; @@ -13,14 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sebaubuntu-python"; repo = "liblp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-F30D2mYUYPupbr8OsrcrN6wQ639L5OlzQw/FrxPCsC4="; }; build-system = [ poetry-core ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "liblp" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "lpunpack"; }; -} +}) diff --git a/python/pkgs/libmr/default.nix b/python/pkgs/libmr/default.nix index deebdbb68..249d532f2 100644 --- a/python/pkgs/libmr/default.nix +++ b/python/pkgs/libmr/default.nix @@ -2,32 +2,35 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, numpy, cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libmr"; version = "0.1.9"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; sha256 = "43ccd86693b725fa3abe648c8cdcef17ba5fa46b5528168829e5f9b968dfeb70"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy cython ]; # No tests in the pypi tarball - doCheck = false; meta = { description = "LibMR provides core MetaRecognition and Weibull fitting functionality"; homepage = "https://github.com/Vastlab/libMR"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/libnacl/default.nix b/python/pkgs/libnacl/default.nix index 61dddd673..7cf860019 100644 --- a/python/pkgs/libnacl/default.nix +++ b/python/pkgs/libnacl/default.nix @@ -7,7 +7,7 @@ libsodium, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libnacl"; version = "2.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "saltstack"; repo = "libnacl"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-phECLGDcBfDi/r2y0eGtqgIX/hvirtBqO8UUvEJ66zo="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/libpass/default.nix b/python/pkgs/libpass/default.nix index ad84b4829..497dbae4e 100644 --- a/python/pkgs/libpass/default.nix +++ b/python/pkgs/libpass/default.nix @@ -8,7 +8,7 @@ lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libpass"; version = "1.9.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ThirVondukr"; repo = "passlib"; - tag = version; + tag = finalAttrs.version; hash = "sha256-fzI9HpGE3wNK41ZSOeA5NAr5T4r3Jzdqe5+SHoWVXUs="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/ThirVondukr/passlib"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/libpurecool/default.nix b/python/pkgs/libpurecool/default.nix index 0d27f508b..b5e13ad9d 100644 --- a/python/pkgs/libpurecool/default.nix +++ b/python/pkgs/libpurecool/default.nix @@ -11,13 +11,13 @@ zeroconf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libpurecool"; version = "0.6.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1kwbinbg0i4fca1bpx6jwa1fiw71vg0xa89jhq4pmnl5cn9c8kqx"; }; @@ -40,7 +40,6 @@ buildPythonPackage rec { ]; # Tests are only present in repo, https://github.com/etheralm/libpurecool/issues/36 - doCheck = false; pythonImportsCheck = [ "libpurecool" ]; meta = { @@ -48,4 +47,4 @@ buildPythonPackage rec { homepage = "http://libpurecool.readthedocs.io"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/libpyfoscamcgi/default.nix b/python/pkgs/libpyfoscamcgi/default.nix index 97072bf72..bf03fe0af 100644 --- a/python/pkgs/libpyfoscamcgi/default.nix +++ b/python/pkgs/libpyfoscamcgi/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libpyfoscamcgi"; version = "0.0.9"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Foscam-wangzhengyu"; repo = "libfoscamcgi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tKA2UnVHAUjDfvm+t/aCk+3YfWfwjfEWPRgieDAcr7k="; }; @@ -27,11 +27,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "libpyfoscamcgi" ]; # tests need access to a camera - doCheck = false; meta = { description = "Python Library for Foscam IP Cameras"; homepage = "https://github.com/Foscam-wangzhengyu/libfoscamcgi"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/libpysal/default.nix b/python/pkgs/libpysal/default.nix index 1e62cd20d..6aa34d396 100644 --- a/python/pkgs/libpysal/default.nix +++ b/python/pkgs/libpysal/default.nix @@ -20,7 +20,7 @@ shapely, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libpysal"; version = "4.15.0"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pysal"; repo = "libpysal"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ltDrTbx4Z0ZVZHg+v45ETgMGHLDeEX71Qpbe2NykxKw="; }; @@ -83,4 +83,4 @@ buildPythonPackage rec { homepage = "https://pysal.org/libpysal/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/libpyvivotek/default.nix b/python/pkgs/libpyvivotek/default.nix index c9455aaa4..445225468 100644 --- a/python/pkgs/libpyvivotek/default.nix +++ b/python/pkgs/libpyvivotek/default.nix @@ -8,7 +8,7 @@ vcrpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libpyvivotek"; version = "0.6.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "HarlemSquirrel"; repo = "python-vivotek"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ai+FlvyrdeLyg/PJU8T0fTtbdnlyGo6mE4AM2oRATj8="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/HarlemSquirrel/python-vivotek"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/librehardwaremonitor-api/default.nix b/python/pkgs/librehardwaremonitor-api/default.nix index b2d8c4ab9..2c6f5c4b0 100644 --- a/python/pkgs/librehardwaremonitor-api/default.nix +++ b/python/pkgs/librehardwaremonitor-api/default.nix @@ -7,7 +7,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "librehardwaremonitor-api"; version = "1.11.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Sab44"; repo = "librehardwaremonitor-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GAJgLrfYhkdafk0DSgcNgXQ2vjtBf/kOEkkRw7i9rlE="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Sab44/librehardwaremonitor-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/librosa/default.nix b/python/pkgs/librosa/default.nix index 3fa4f9539..08792aac7 100644 --- a/python/pkgs/librosa/default.nix +++ b/python/pkgs/librosa/default.nix @@ -30,7 +30,6 @@ buildPythonPackage (finalAttrs: { pname = "librosa"; version = "0.11.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "librosa"; diff --git a/python/pkgs/librouteros/default.nix b/python/pkgs/librouteros/default.nix index 5b6c86f75..452cc8a79 100644 --- a/python/pkgs/librouteros/default.nix +++ b/python/pkgs/librouteros/default.nix @@ -9,7 +9,7 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "librouteros"; version = "3.4.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "luqasz"; repo = "librouteros"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vN12LYqFOU7flD6bTFtGw5VhPJ238pZ0MStM3ljwDU4="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://librouteros.readthedocs.io/"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/librt/default.nix b/python/pkgs/librt/default.nix index d78d1dc83..ed392009b 100644 --- a/python/pkgs/librt/default.nix +++ b/python/pkgs/librt/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "librt"; version = "0.9.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mypyc"; repo = "librt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RZGaOq8hmkwekCs1fKshDrx3vmHdJl/wI3IO9ZLH5rc="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/mypyc/librt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/libsoundtouch/default.nix b/python/pkgs/libsoundtouch/default.nix index a74df729c..aaa42244f 100644 --- a/python/pkgs/libsoundtouch/default.nix +++ b/python/pkgs/libsoundtouch/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libsoundtouch"; version = "0.8.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CharlesBlonde"; repo = "libsoundtouch"; - tag = version; + tag = finalAttrs.version; hash = "sha256-am8nHPdtKMh8ZA/jKgz2jnltpvgEga8/BjvP5nrhgvI="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/CharlesBlonde/libsoundtouch"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/libthumbor/default.nix b/python/pkgs/libthumbor/default.nix index af68d5ce0..aaab4db28 100644 --- a/python/pkgs/libthumbor/default.nix +++ b/python/pkgs/libthumbor/default.nix @@ -2,30 +2,32 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, django, six, pycrypto, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libthumbor"; version = "2.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1PsiFZrTDVQqy8A3nkaM5LdPiBoriRgHkklTOiczN+g="; }; + build-system = [ setuptools ]; + buildInputs = [ django ]; - propagatedBuildInputs = [ + dependencies = [ six pycrypto ]; - doCheck = false; - pythonImportsCheck = [ "libthumbor" ]; meta = { @@ -33,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/heynemann/libthumbor"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/libusb-package/default.nix b/python/pkgs/libusb-package/default.nix index 1dc7ada74..f1250e6fe 100644 --- a/python/pkgs/libusb-package/default.nix +++ b/python/pkgs/libusb-package/default.nix @@ -11,7 +11,7 @@ libusb1, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libusb-package"; version = "1.0.30.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyocd"; repo = "libusb-package"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/Q1VovC2864Xu+LidL72Rh/FfyZqSJ8m21WS+FBkOrU="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/python/pkgs/libusb1/default.nix b/python/pkgs/libusb1/default.nix index 2acab31cc..9f355aed4 100644 --- a/python/pkgs/libusb1/default.nix +++ b/python/pkgs/libusb1/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libusb1"; version = "3.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nPVjhQbVTyG/NlUNl+pjGJERojxNgHj2MBA6IFITX0U="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Python ctype-based wrapper around libusb1"; license = lib.licenses.lgpl2Plus; }; -} +}) diff --git a/python/pkgs/liccheck/default.nix b/python/pkgs/liccheck/default.nix index 783a648aa..a19c0578d 100644 --- a/python/pkgs/liccheck/default.nix +++ b/python/pkgs/liccheck/default.nix @@ -12,7 +12,7 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "liccheck"; version = "0.9.3"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dhatim"; repo = "python-license-check"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ohq3ZsbZcyqhwmvaVF/+mo7lNde5gjbz8pwhzHi3SPY="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "liccheck"; }; -} +}) diff --git a/python/pkgs/license-expression/default.nix b/python/pkgs/license-expression/default.nix index ed7de9b90..c55c7cea2 100644 --- a/python/pkgs/license-expression/default.nix +++ b/python/pkgs/license-expression/default.nix @@ -6,14 +6,14 @@ boolean-py, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "license-expression"; version = "30.4.4"; pyproject = true; src = fetchPypi { pname = "license_expression"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-c0SPCqzY0ICIlb3EssjgGo1nZG5BiPiHN1OYx2HzQP0="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/aboutcode-org/license-expression"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/life360/default.nix b/python/pkgs/life360/default.nix index 5c7d6a891..5c64a3cb7 100644 --- a/python/pkgs/life360/default.nix +++ b/python/pkgs/life360/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "life360" ]; diff --git a/python/pkgs/lifelines/default.nix b/python/pkgs/lifelines/default.nix index 63d95022f..fdbed90a0 100644 --- a/python/pkgs/lifelines/default.nix +++ b/python/pkgs/lifelines/default.nix @@ -19,7 +19,7 @@ sybil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lifelines"; version = "0.30.3"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CamDavidsonPilon"; repo = "lifelines"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-A9MsQN/JGCQ4cYNIZI5LBKpRb44uI/SM8eT4/nKpsXQ="; }; @@ -68,4 +68,4 @@ buildPythonPackage rec { homepage = "https://lifelines.readthedocs.io"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lightify/default.nix b/python/pkgs/lightify/default.nix index 649e9023f..70a3c6d69 100644 --- a/python/pkgs/lightify/default.nix +++ b/python/pkgs/lightify/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lightify"; version = "1.0.7.3"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tfriedel"; repo = "python-lightify"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zgDB1Tq4RYIeABZCjCcoB8NGt+ZhQFnFu655OghgpH0="; }; @@ -22,11 +22,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "lightify" ]; # tests access the network - doCheck = false; meta = { description = "Library to work with OSRAM Lightify"; homepage = "https://github.com/tfriedel/python-lightify"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/lightwave/default.nix b/python/pkgs/lightwave/default.nix index e59847431..3ecbadb7c 100644 --- a/python/pkgs/lightwave/default.nix +++ b/python/pkgs/lightwave/default.nix @@ -2,26 +2,29 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lightwave"; version = "0.24"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-l9hwdAKrpdXj/pkrgyiuhbPaGgT6tjfoOw/TBpR+k1I="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "lightwave" ]; # Requires physical hardware - doCheck = false; meta = { description = "Module for interacting with LightwaveRF hubs"; homepage = "https://github.com/GeoffAtHome/lightwave"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lightwave2/default.nix b/python/pkgs/lightwave2/default.nix index e9628fddc..31afc76e0 100644 --- a/python/pkgs/lightwave2/default.nix +++ b/python/pkgs/lightwave2/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "lightwave2" ]; diff --git a/python/pkgs/lima/default.nix b/python/pkgs/lima/default.nix index f493fb6e3..62fd64f82 100644 --- a/python/pkgs/lima/default.nix +++ b/python/pkgs/lima/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lima"; version = "0.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OxBBmzZGM+PtpSw5ixIMVH/Z1YVOTO/ZvPecPAoAEmM="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/b6d/lima"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lime/default.nix b/python/pkgs/lime/default.nix index eb0a44887..a32405c5e 100644 --- a/python/pkgs/lime/default.nix +++ b/python/pkgs/lime/default.nix @@ -20,8 +20,6 @@ buildPythonPackage (finalAttrs: { version = "0.2.0.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-dpYOTwVf61Pom1AiODuvyHtj8lusYmWYSwozPRpX94E="; diff --git a/python/pkgs/limitlessled/default.nix b/python/pkgs/limitlessled/default.nix index bc1a3eb7b..585faed90 100644 --- a/python/pkgs/limitlessled/default.nix +++ b/python/pkgs/limitlessled/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "limitlessled"; version = "1.1.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0pd71wxqjvznx10brsj1sgy3420bz7awbzk9jlj422rrdxql754j"; }; + build-system = [ setuptools ]; + meta = { description = "Control LimitlessLED products"; homepage = "https://github.com/happyleavesaoc/python-limitlessled/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/limits/default.nix b/python/pkgs/limits/default.nix index 371c1ea31..e52f48cdf 100644 --- a/python/pkgs/limits/default.nix +++ b/python/pkgs/limits/default.nix @@ -22,7 +22,7 @@ valkey, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "limits"; version = "5.8.0"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alisaifee"; repo = "limits"; - tag = version; + tag = finalAttrs.version; hash = "sha256-svCvfQcidmfTPpe/GPrPxDhIPbmyoeIlXBR2vttTyHI="; postFetch = '' rm "$out/limits/_version.pyi" @@ -88,4 +88,4 @@ buildPythonPackage rec { homepage = "https://github.com/alisaifee/limits"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/line-profiler/default.nix b/python/pkgs/line-profiler/default.nix index 15a157460..326f75e1d 100644 --- a/python/pkgs/line-profiler/default.nix +++ b/python/pkgs/line-profiler/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, cython, isPyPy, ipython, @@ -10,19 +12,21 @@ ubelt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "line-profiler"; version = "5.0.2"; - format = "setuptools"; + pyproject = true; disabled = isPyPy; src = fetchPypi { pname = "line_profiler"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-jYqZDITGS83kWvIq9QLRe8CuEHvkBc5Bu6kq9cOcAAA="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ cython cmake @@ -45,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyutils/line_profiler"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/lineax/default.nix b/python/pkgs/lineax/default.nix index a966cf877..78d5e8982 100644 --- a/python/pkgs/lineax/default.nix +++ b/python/pkgs/lineax/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { pname = "lineax"; version = "0.1.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "patrick-kidger"; diff --git a/python/pkgs/linecache2/default.nix b/python/pkgs/linecache2/default.nix index 18bb24a39..cbcca53a4 100644 --- a/python/pkgs/linecache2/default.nix +++ b/python/pkgs/linecache2/default.nix @@ -6,13 +6,13 @@ pbr, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "linecache2"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Syb/TnEQ23butvWntkqCYjg51ZXCA47tpmLyott46Xw="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { description = "Backport of linecache to older supported Pythons"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/lineedit/default.nix b/python/pkgs/lineedit/default.nix index 856848d9c..75f94020b 100644 --- a/python/pkgs/lineedit/default.nix +++ b/python/pkgs/lineedit/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pygments, six, wcwidth, @@ -11,19 +13,21 @@ pexpect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lineedit"; version = "0.1.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "randy3k"; repo = "lineedit"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "fq2NpjIQkIq1yzXEUxi6cz80kutVqcH6MqJXHtpTFsk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pygments six wcwidth @@ -43,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/randy3k/lineedit"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/linetable/default.nix b/python/pkgs/linetable/default.nix index 82ca16b10..5063d18a1 100644 --- a/python/pkgs/linetable/default.nix +++ b/python/pkgs/linetable/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "linetable"; version = "0.0.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "amol-"; repo = "linetable"; - tag = version; + tag = finalAttrs.version; hash = "sha256-nVZVxK6uB5TP0pReaEya3/lFXFkiqpnnaWqYzxzO6bM="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "linetable" ]; meta = { @@ -23,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/amol-/linetable"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lingua/default.nix b/python/pkgs/lingua/default.nix index 376117c03..d012e3850 100644 --- a/python/pkgs/lingua/default.nix +++ b/python/pkgs/lingua/default.nix @@ -7,13 +7,13 @@ click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lingua"; version = "4.16.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-seXLu+zUCv057z1Py0Dk4/yblrwOBD5wiESm0ibuVL0="; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ click polib ]; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/wichert/lingua"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/lingva/default.nix b/python/pkgs/lingva/default.nix index 34a6c5530..9a817543e 100644 --- a/python/pkgs/lingva/default.nix +++ b/python/pkgs/lingva/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lingva"; version = "5.0.7"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vacanza"; repo = "lingva"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jGdDXRNhgF3sy9clx9rg7T2rjYlH7UHm0QsN+HZV0Sk="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/vacanza/lingva"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/linkify-it-py/default.nix b/python/pkgs/linkify-it-py/default.nix index e2191e078..f8e0b5766 100644 --- a/python/pkgs/linkify-it-py/default.nix +++ b/python/pkgs/linkify-it-py/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "linkify-it-py"; version = "2.2.0"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tsutsu3"; repo = "linkify-it-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uFZBEBlM5IDN64ZydeNsUAZ2ssO4XRFPqPv5RoKEWwY="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ uc-micro-py ]; + dependencies = [ uc-micro-py ]; pythonImportsCheck = [ "linkify_it" ]; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/tsutsu3/linkify-it-py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/linknlink/default.nix b/python/pkgs/linknlink/default.nix index d57bc7f5f..2533ced45 100644 --- a/python/pkgs/linknlink/default.nix +++ b/python/pkgs/linknlink/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "linknlink"; version = "0.2.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "xuanxuan000"; repo = "python-linknlink"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ObPEcdDHi+SPFjuVKBtu7/5/IgHcam+IWblxxS3+mmI="; }; @@ -25,11 +25,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "linknlink" ]; # Module has no test - doCheck = false; meta = { description = "Module and CLI for controlling Linklink devices locally"; homepage = "https://github.com/xuanxuan000/python-linknlink"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/linode/default.nix b/python/pkgs/linode/default.nix index 1e83d83aa..52d229b52 100644 --- a/python/pkgs/linode/default.nix +++ b/python/pkgs/linode/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "linode"; version = "0.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "db3c2a7fab8966d903a63f16c515bff241533e4ef2d746aa7aae4a49bba5e573"; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; meta = { homepage = "https://github.com/ghickman/linode"; description = "Thin python wrapper around Linode's API"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/linuxfd/default.nix b/python/pkgs/linuxfd/default.nix index 38ca28428..989d68109 100644 --- a/python/pkgs/linuxfd/default.nix +++ b/python/pkgs/linuxfd/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "linuxfd"; version = "1.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "b8c00109724b68e093f9b556edd78e41ed65fb8d969fd0e83186a97b5d3139b4"; }; + build-system = [ setuptools ]; + # no tests - doCheck = false; meta = { description = "Python bindings for the Linux eventfd/signalfd/timerfd/inotify syscalls"; @@ -23,4 +26,4 @@ buildPythonPackage rec { platforms = lib.platforms.linux; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/lit/default.nix b/python/pkgs/lit/default.nix index 9dc94652e..f89094257 100644 --- a/python/pkgs/lit/default.nix +++ b/python/pkgs/lit/default.nix @@ -6,13 +6,13 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lit"; version = "18.1.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-R8F0oYaUGugw8E3tdqNERgC+Z9Xl+4KCw3g/umccTts="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { # Needs LLVM's `FileCheck` and `not`: `$out/bin/lit tests` # There should be `llvmPackages.lit` since older LLVM versions may # have the possibility of not correctly interfacing with newer lit versions - doCheck = false; meta = { description = "Portable tool for executing LLVM and Clang style test suites"; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "http://llvm.org/docs/CommandGuide/lit.html"; license = lib.licenses.ncsa; }; -} +}) diff --git a/python/pkgs/litecli/default.nix b/python/pkgs/litecli/default.nix index fedf3828e..04cc214c2 100644 --- a/python/pkgs/litecli/default.nix +++ b/python/pkgs/litecli/default.nix @@ -12,7 +12,7 @@ cli-helpers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "litecli"; version = "1.17.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dbcli"; repo = "litecli"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YSPNtDL5rNgRh5lJBKfL1jjWemlmf3eesBMSLyJVRLY="; }; @@ -38,8 +38,6 @@ buildPythonPackage rec { cli-helpers ]; - doCheck = true; - pythonImportsCheck = [ "litecli" ]; @@ -50,4 +48,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "litecli"; }; -} +}) diff --git a/python/pkgs/litellm/default.nix b/python/pkgs/litellm/default.nix index d084624eb..077941572 100644 --- a/python/pkgs/litellm/default.nix +++ b/python/pkgs/litellm/default.nix @@ -55,7 +55,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "litellm"; version = "1.89.0"; pyproject = true; @@ -63,7 +63,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "BerriAI"; repo = "litellm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tPw4cDqCQgyC8EoB5EPfui2gT+frjlSMOv95ntUXTWk="; }; @@ -151,12 +151,10 @@ buildPythonPackage rec { "python-dotenv" ]; - doCheck = false; - meta = { description = "Use any LLM as a drop in replacement for gpt-3.5-turbo"; mainProgram = "litellm"; homepage = "https://github.com/BerriAI/litellm"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/litestar-htmx/default.nix b/python/pkgs/litestar-htmx/default.nix index e16c40940..e7baaa1df 100644 --- a/python/pkgs/litestar-htmx/default.nix +++ b/python/pkgs/litestar-htmx/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "litestar-htmx"; version = "0.5.0"; src = fetchPypi { pname = "litestar_htmx"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-4C0aOpIXLIdINfo+Z0nWWun8Ym0N9GcZSQoWKT4hRvs="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { platforms = lib.platforms.unix; description = "HTMX Integration for Litesstar"; }; -} +}) diff --git a/python/pkgs/littleutils/default.nix b/python/pkgs/littleutils/default.nix index ddccbf65e..e9921ce2c 100644 --- a/python/pkgs/littleutils/default.nix +++ b/python/pkgs/littleutils/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "littleutils"; version = "0.2.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-x4NbAQIM7ULikRGLfXj7FrwtmhtPP0LzyzeHu02lPRk="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/alexmojaki/littleutils"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/livekit-api/default.nix b/python/pkgs/livekit-api/default.nix index 149b4a4ff..f0350db41 100644 --- a/python/pkgs/livekit-api/default.nix +++ b/python/pkgs/livekit-api/default.nix @@ -10,7 +10,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "livekit-api"; version = "1.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "livekit"; repo = "python-sdks"; - tag = "api-v${version}"; + tag = "api-v${finalAttrs.version}"; hash = "sha256-Z9ZyzESPUR+j9s9LXSTDx3pB+bltbqTeb8WVKaKk80A="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/livekit-protocol/default.nix b/python/pkgs/livekit-protocol/default.nix index 3f8f16c35..81f68f2b3 100644 --- a/python/pkgs/livekit-protocol/default.nix +++ b/python/pkgs/livekit-protocol/default.nix @@ -7,7 +7,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "livekit-protocol"; version = "1.1.17"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "livekit"; repo = "python-sdks"; - tag = "protocol-v${version}"; + tag = "protocol-v${finalAttrs.version}"; hash = "sha256-XTBQi1ckwHw7bpd2jQWqwhDXO0iHQRirc2GjfDtYILA="; }; @@ -29,8 +29,6 @@ buildPythonPackage rec { pythonRemoveDeps = [ "types-protobuf" ]; - doCheck = false; # no tests - pythonImportsCheck = [ "livekit" ]; passthru.updateScript = gitUpdater { rev-prefix = "protocol-v"; }; @@ -41,4 +39,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/livelossplot/default.nix b/python/pkgs/livelossplot/default.nix index ddf7e9a01..b2d422725 100644 --- a/python/pkgs/livelossplot/default.nix +++ b/python/pkgs/livelossplot/default.nix @@ -11,7 +11,7 @@ nbformat, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "livelossplot"; version = "0.5.6"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stared"; repo = "livelossplot"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qC1FBFJyf2IlDIffJ5Xs89WcN/GFA/8maODhc1u2xhA="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/stared/livelossplot"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/livereload/default.nix b/python/pkgs/livereload/default.nix index cadd8a3f2..70c81353f 100644 --- a/python/pkgs/livereload/default.nix +++ b/python/pkgs/livereload/default.nix @@ -6,13 +6,13 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "livereload"; version = "2.7.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PZv3wFZz3wbjK+ojtJS402ym0Q99XDyKaYlgjAnJhqk="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/lepture/python-livereload"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/livisi/default.nix b/python/pkgs/livisi/default.nix index 14f3ba024..89019f672 100644 --- a/python/pkgs/livisi/default.nix +++ b/python/pkgs/livisi/default.nix @@ -9,7 +9,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "livisi"; version = "1.0.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "planbnet"; repo = "livisi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5TRJfI4irg2/ZxpfgzShXE08HWU2aWLR8zGbrZKpwbc="; }; @@ -33,11 +33,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "livisi" ]; # upstream has no tests - doCheck = false; meta = { description = "Connection library for the abandoned Livisi Smart Home system"; homepage = "https://github.com/planbnet/livisi"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/lizard/default.nix b/python/pkgs/lizard/default.nix index ee5d91efb..6672bcb34 100644 --- a/python/pkgs/lizard/default.nix +++ b/python/pkgs/lizard/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, mock, jinja2, @@ -9,19 +11,21 @@ pathspec, # for .gitignore support }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lizard"; version = "1.24.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "terryyin"; repo = "lizard"; - tag = version; + tag = finalAttrs.version; hash = "sha256-npxnl9QrsAMLgrSDGsmWTb17VLwJ9sYCi9dhROCblhg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ jinja2 pygments pathspec @@ -46,4 +50,4 @@ buildPythonPackage rec { homepage = "http://www.lizard.ws"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-cpp-python/default.nix b/python/pkgs/llama-cpp-python/default.nix index 0fd66e045..85fdd3fd7 100644 --- a/python/pkgs/llama-cpp-python/default.nix +++ b/python/pkgs/llama-cpp-python/default.nix @@ -24,7 +24,7 @@ let stdenvTarget = if cudaSupport then gcc13Stdenv else stdenv; in -buildPythonPackage.override { stdenv = stdenvTarget; } rec { +buildPythonPackage.override { stdenv = stdenvTarget; } (finalAttrs: { pname = "llama-cpp-python"; version = "0.3.35"; pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage.override { stdenv = stdenvTarget; } rec { src = fetchFromGitHub { owner = "abetlen"; repo = "llama-cpp-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3o9YdjJ4rORVzwtu4lPZTioqiKHpWc1alhM76cCfVVM="; fetchSubmodules = true; }; @@ -90,4 +90,4 @@ buildPythonPackage.override { stdenv = stdenvTarget; } rec { homepage = "https://github.com/abetlen/llama-cpp-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-index-cli/default.nix b/python/pkgs/llama-index-cli/default.nix index 2e74ac723..aa9cbda8e 100644 --- a/python/pkgs/llama-index-cli/default.nix +++ b/python/pkgs/llama-index-cli/default.nix @@ -27,8 +27,6 @@ buildPythonPackage (finalAttrs: { llama-index-llms-openai ]; - doCheck = false; - pythonImportsCheck = [ "llama_index.cli" ]; meta = { diff --git a/python/pkgs/llama-index-core/default.nix b/python/pkgs/llama-index-core/default.nix index 691bb4287..280c32784 100644 --- a/python/pkgs/llama-index-core/default.nix +++ b/python/pkgs/llama-index-core/default.nix @@ -93,8 +93,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "llama_index" ]; - doCheck = false; - meta = { description = "Data framework for your LLM applications"; homepage = "https://github.com/run-llama/llama_index/"; diff --git a/python/pkgs/llama-index-embeddings-google-genai/default.nix b/python/pkgs/llama-index-embeddings-google-genai/default.nix index 979b34e69..247525d1b 100644 --- a/python/pkgs/llama-index-embeddings-google-genai/default.nix +++ b/python/pkgs/llama-index-embeddings-google-genai/default.nix @@ -26,7 +26,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests are only available in the mono repo - doCheck = false; pythonImportsCheck = [ "llama_index.embeddings.google_genai" ]; diff --git a/python/pkgs/llama-index-embeddings-ollama/default.nix b/python/pkgs/llama-index-embeddings-ollama/default.nix index b68e2d29e..223c302b4 100644 --- a/python/pkgs/llama-index-embeddings-ollama/default.nix +++ b/python/pkgs/llama-index-embeddings-ollama/default.nix @@ -8,14 +8,14 @@ pytest-asyncio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-embeddings-ollama"; version = "0.9.0"; pyproject = true; src = fetchPypi { pname = "llama_index_embeddings_ollama"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-GdLSoOPwk0SA6uMSQ6xfHOFxMZV4ucCtrSXPG2w1ZZ4="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # Tests are only available in the mono repo - doCheck = false; pythonImportsCheck = [ "llama_index.embeddings.ollama" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/embeddings/llama-index-embeddings-ollama"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-index-embeddings-openai-like/default.nix b/python/pkgs/llama-index-embeddings-openai-like/default.nix index 1d985ea76..09d3cdefb 100644 --- a/python/pkgs/llama-index-embeddings-openai-like/default.nix +++ b/python/pkgs/llama-index-embeddings-openai-like/default.nix @@ -24,7 +24,6 @@ buildPythonPackage (finalAttrs: { pythonRelaxDeps = [ "llama-index-embeddings-openai" ]; # Tests are only available in the mono repo - doCheck = false; pythonImportsCheck = [ "llama_index.embeddings.openai_like" ]; diff --git a/python/pkgs/llama-index-embeddings-openai/default.nix b/python/pkgs/llama-index-embeddings-openai/default.nix index 13863cee1..52d661ddd 100644 --- a/python/pkgs/llama-index-embeddings-openai/default.nix +++ b/python/pkgs/llama-index-embeddings-openai/default.nix @@ -26,7 +26,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests are only available in the mono repo - doCheck = false; pythonImportsCheck = [ "llama_index.embeddings.openai" ]; diff --git a/python/pkgs/llama-index-graph-stores-neo4j/default.nix b/python/pkgs/llama-index-graph-stores-neo4j/default.nix index 5f8b5bafa..9e151439f 100644 --- a/python/pkgs/llama-index-graph-stores-neo4j/default.nix +++ b/python/pkgs/llama-index-graph-stores-neo4j/default.nix @@ -28,7 +28,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests are not shipped with PyPI package - doCheck = false; pythonImportsCheck = [ "llama_index.graph_stores.neo4j" ]; diff --git a/python/pkgs/llama-index-graph-stores-neptune/default.nix b/python/pkgs/llama-index-graph-stores-neptune/default.nix index ee0ccc37c..251022781 100644 --- a/python/pkgs/llama-index-graph-stores-neptune/default.nix +++ b/python/pkgs/llama-index-graph-stores-neptune/default.nix @@ -7,14 +7,14 @@ llama-index-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-graph-stores-neptune"; version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "llama_index_graph_stores_neptune"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-qYr9WcQvGrq4juuZk2Ww8IK9uxnS9Th00fB4Dmh7Irc="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/graph_stores/llama-index-graph-stores-neptune"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-index-instrumentation/default.nix b/python/pkgs/llama-index-instrumentation/default.nix index 5b2798f32..97fe97190 100644 --- a/python/pkgs/llama-index-instrumentation/default.nix +++ b/python/pkgs/llama-index-instrumentation/default.nix @@ -7,14 +7,14 @@ pydantic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-instrumentation"; version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "llama_index_instrumentation"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-sYXE4op/MomcJ2ScwuLX1UJn+i/wzUPL4rUhK66Y/jo="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/llama-index-instrumentation/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-index-legacy/default.nix b/python/pkgs/llama-index-legacy/default.nix index 023cd0957..4da6f9ff7 100644 --- a/python/pkgs/llama-index-legacy/default.nix +++ b/python/pkgs/llama-index-legacy/default.nix @@ -6,14 +6,14 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-legacy"; version = "0.9.48.post4"; pyproject = true; src = fetchPypi { pname = "llama_index_legacy"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-+Kl2Tn4TSlK/715T0tYlYb/AH8CYdMUcwAHfb1MCrjA="; }; @@ -24,11 +24,10 @@ buildPythonPackage rec { dependencies = [ llama-index-core ]; # Tests are only available in the mono repo - doCheck = false; meta = { description = "LlamaIndex Readers Integration for files"; homepage = "https://github.com/run-llama/llama_index/tree/v0.9.48"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-index-llms-ollama/default.nix b/python/pkgs/llama-index-llms-ollama/default.nix index 0122ec4cd..01329061e 100644 --- a/python/pkgs/llama-index-llms-ollama/default.nix +++ b/python/pkgs/llama-index-llms-ollama/default.nix @@ -7,14 +7,14 @@ ollama, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-llms-ollama"; version = "0.11.0"; pyproject = true; src = fetchPypi { pname = "llama_index_llms_ollama"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-5rjKwgCp/2fK6lMf7OCmJyqJ41BrK5ZI7HCaz/5KeYA="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { ]; # Tests are only available in the mono repo - doCheck = false; pythonImportsCheck = [ "llama_index.llms.ollama" ]; @@ -35,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/llms/llama-index-llms-ollama"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-index-llms-openai-like/default.nix b/python/pkgs/llama-index-llms-openai-like/default.nix index 5ee28e0db..da1ea45ad 100644 --- a/python/pkgs/llama-index-llms-openai-like/default.nix +++ b/python/pkgs/llama-index-llms-openai-like/default.nix @@ -28,7 +28,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests are only available in the mono repo - doCheck = false; pythonImportsCheck = [ "llama_index.llms.openai_like" ]; diff --git a/python/pkgs/llama-index-llms-openai/default.nix b/python/pkgs/llama-index-llms-openai/default.nix index 695ba7aee..d823f4a30 100644 --- a/python/pkgs/llama-index-llms-openai/default.nix +++ b/python/pkgs/llama-index-llms-openai/default.nix @@ -26,7 +26,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests are only available in the mono repo - doCheck = false; pythonImportsCheck = [ "llama_index.llms.openai" ]; diff --git a/python/pkgs/llama-index-node-parser-docling/default.nix b/python/pkgs/llama-index-node-parser-docling/default.nix index 2dd236cfc..65907c708 100644 --- a/python/pkgs/llama-index-node-parser-docling/default.nix +++ b/python/pkgs/llama-index-node-parser-docling/default.nix @@ -7,14 +7,14 @@ llama-index-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-node-parser-docling"; version = "0.5.0"; pyproject = true; src = fetchPypi { pname = "llama_index_node_parser_docling"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-4xp1UKDaZn/wFjGTHjaKr5e3AGm7Ce19pDZkaMIT8H8="; }; @@ -28,11 +28,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "llama_index.node_parser.docling" ]; # Module has no tests - doCheck = false; meta = { description = "Llama-index node_parser docling integration"; homepage = "https://pypi.org/project/llama-index-node-parser-docling/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-index-readers-database/default.nix b/python/pkgs/llama-index-readers-database/default.nix index 62d6f8afd..28f9dd3e4 100644 --- a/python/pkgs/llama-index-readers-database/default.nix +++ b/python/pkgs/llama-index-readers-database/default.nix @@ -6,14 +6,14 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-readers-database"; version = "0.7.0"; pyproject = true; src = fetchPypi { pname = "llama_index_readers_database"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-5Ffw3Ro7+vmskRI8xr1gRTxgEyMCn7GWHn6I4mEcnoY="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { dependencies = [ llama-index-core ]; # Tests are only available in the mono repo - doCheck = false; pythonImportsCheck = [ "llama_index.readers.database" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-database"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-index-readers-file/default.nix b/python/pkgs/llama-index-readers-file/default.nix index b1e14a8a6..580fbf4ca 100644 --- a/python/pkgs/llama-index-readers-file/default.nix +++ b/python/pkgs/llama-index-readers-file/default.nix @@ -11,14 +11,14 @@ striprtf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-readers-file"; version = "0.7.0"; pyproject = true; src = fetchPypi { pname = "llama_index_readers_file"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Mo4/5dptphcuPXG2C1x2wWdnB7IgyPxH7fqnlfmu/RY="; }; @@ -43,7 +43,6 @@ buildPythonPackage rec { }; # Tests are only available in the mono repo - doCheck = false; pythonImportsCheck = [ "llama_index.readers.file" ]; @@ -52,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-file"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-index-readers-json/default.nix b/python/pkgs/llama-index-readers-json/default.nix index fc098b66f..da2ddca3f 100644 --- a/python/pkgs/llama-index-readers-json/default.nix +++ b/python/pkgs/llama-index-readers-json/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ llama-index-core ]; # Tests are only available in the mono repo - doCheck = false; pythonImportsCheck = [ "llama_index.readers.json" ]; diff --git a/python/pkgs/llama-index-readers-s3/default.nix b/python/pkgs/llama-index-readers-s3/default.nix index 6feca8951..42d2d3ca4 100644 --- a/python/pkgs/llama-index-readers-s3/default.nix +++ b/python/pkgs/llama-index-readers-s3/default.nix @@ -9,14 +9,14 @@ s3fs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-readers-s3"; version = "0.6.1"; pyproject = true; src = fetchPypi { pname = "llama_index_readers_s3"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-cK5XmH4F0TZt6IMJvAnmEs7UWkekrrbEAIvd/CE33xw="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { ]; # Tests are only available in the mono repo - doCheck = false; pythonImportsCheck = [ "llama_index.readers.s3" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-s3"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-index-readers-twitter/default.nix b/python/pkgs/llama-index-readers-twitter/default.nix index 9e49ab755..1254ebdcc 100644 --- a/python/pkgs/llama-index-readers-twitter/default.nix +++ b/python/pkgs/llama-index-readers-twitter/default.nix @@ -7,14 +7,14 @@ tweepy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-readers-twitter"; version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "llama_index_readers_twitter"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-WguqvAbb6xbuTZDL55Qyv35DdJ7DjqrnvtyxMYe9Tkc="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { ]; # Tests are only available in the mono repo - doCheck = false; pythonImportsCheck = [ "llama_index.readers.twitter" ]; @@ -35,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-twitter"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-index-readers-txtai/default.nix b/python/pkgs/llama-index-readers-txtai/default.nix index f2a304740..660f524f3 100644 --- a/python/pkgs/llama-index-readers-txtai/default.nix +++ b/python/pkgs/llama-index-readers-txtai/default.nix @@ -6,14 +6,14 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-readers-txtai"; version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "llama_index_readers_txtai"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-X8cf/3KrDNQeVj4zPgRi2CmTbrPxZerLzIJZc9Ln4To="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { dependencies = [ llama-index-core ]; # Tests are only available in the mono repo - doCheck = false; pythonImportsCheck = [ "llama_index.readers.txtai" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-txtai"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-index-vector-stores-google/default.nix b/python/pkgs/llama-index-vector-stores-google/default.nix index 328b3c8fe..faaf9775d 100644 --- a/python/pkgs/llama-index-vector-stores-google/default.nix +++ b/python/pkgs/llama-index-vector-stores-google/default.nix @@ -7,14 +7,14 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-vector-stores-google"; version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_google"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-bGxsNAE6tC0bOLfjzn3kY1Se17yh6c7jjk/sgyMPdck="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/vector_stores/llama-index-vector-stores-google"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/llama-index-vector-stores-milvus/default.nix b/python/pkgs/llama-index-vector-stores-milvus/default.nix index f03552ebe..6073a7051 100644 --- a/python/pkgs/llama-index-vector-stores-milvus/default.nix +++ b/python/pkgs/llama-index-vector-stores-milvus/default.nix @@ -28,7 +28,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "llama_index.vector_stores.milvus" ]; # Module has no tests - doCheck = false; meta = { description = "Llama-index vector_stores milvus integration"; diff --git a/python/pkgs/llguidance/default.nix b/python/pkgs/llguidance/default.nix index ee84f682e..fb736f046 100644 --- a/python/pkgs/llguidance/default.nix +++ b/python/pkgs/llguidance/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { pname = "llguidance"; version = "1.7.6"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "guidance-ai"; diff --git a/python/pkgs/llvmlite/default.nix b/python/pkgs/llvmlite/default.nix index 1af2b5982..7ffaceffe 100644 --- a/python/pkgs/llvmlite/default.nix +++ b/python/pkgs/llvmlite/default.nix @@ -19,7 +19,7 @@ let llvm = llvmPackages.llvm; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llvmlite"; version = "0.49.0"; pyproject = true; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "numba"; repo = "llvmlite"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AUte9llrcPl2z4ipkZ3PGeryDveZ9vj5oaBQtzGaT+w="; }; @@ -61,4 +61,4 @@ buildPythonPackage rec { homepage = "http://llvmlite.pydata.org/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/lm-format-enforcer/default.nix b/python/pkgs/lm-format-enforcer/default.nix index 5fb283afb..6fb714f65 100644 --- a/python/pkgs/lm-format-enforcer/default.nix +++ b/python/pkgs/lm-format-enforcer/default.nix @@ -8,7 +8,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lm-format-enforcer"; version = "0.11.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "noamgat"; repo = "lm-format-enforcer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aUZo7Nlk5A9SRyQFFGhy3LAJO29ygRFwNC4WbRuXvYE="; }; @@ -28,8 +28,6 @@ buildPythonPackage rec { pyyaml ]; - doCheck = false; # most tests require internet access - pythonImportsCheck = [ "lmformatenforcer" ]; meta = { @@ -37,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/noamgat/lm-format-enforcer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lmfit/default.nix b/python/pkgs/lmfit/default.nix index 77903887c..2dcfe3801 100644 --- a/python/pkgs/lmfit/default.nix +++ b/python/pkgs/lmfit/default.nix @@ -21,13 +21,13 @@ pandas, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lmfit"; version = "1.3.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PCLCjEP3F/bFtKO9geiTohSXOcJqWSwEby4zwjz75Jc="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://lmfit.github.io/lmfit-py/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/lml/default.nix b/python/pkgs/lml/default.nix index 454e370f8..bb8f2132f 100644 --- a/python/pkgs/lml/default.nix +++ b/python/pkgs/lml/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lml"; version = "0.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jdWvtDZ6WT0c2yFEoFh0zZk49SZr67DJ4UEyAEI8DXQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "http://lml.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/lmnotify/default.nix b/python/pkgs/lmnotify/default.nix index 818abb8a0..a0a9d0ee3 100644 --- a/python/pkgs/lmnotify/default.nix +++ b/python/pkgs/lmnotify/default.nix @@ -2,29 +2,32 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, oauthlib, requests, requests-oauthlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lmnotify"; version = "0.0.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cCP7BU2f7QJe9gAI298cvkp3OGijvBv8G1RN7qfZ5PE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ oauthlib requests requests-oauthlib ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "lmnotify" ]; @@ -33,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/keans/lmnotify"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lnkparse3/default.nix b/python/pkgs/lnkparse3/default.nix index 1d904a0d5..242a8814b 100644 --- a/python/pkgs/lnkparse3/default.nix +++ b/python/pkgs/lnkparse3/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lnkparse3"; version = "1.6.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Matmaus"; repo = "LnkParse3"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nTU6FMHM0hRwHBgszixZLArbhKKJmtwUXZC8ZW1KOvk="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/Matmaus/LnkParse3"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/localimport/default.nix b/python/pkgs/localimport/default.nix index 6b9f57528..25205ad39 100644 --- a/python/pkgs/localimport/default.nix +++ b/python/pkgs/localimport/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: buildPythonPackage (finalAttrs: { pname = "localimport"; version = "1.7.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-8UhaZyGdN/N6UwR7pPYQR2hZCz3TrBxr1KOBJRx28ok="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "localimport" ]; meta = { diff --git a/python/pkgs/localstack-client/default.nix b/python/pkgs/localstack-client/default.nix index 0bf824281..130f6b23f 100644 --- a/python/pkgs/localstack-client/default.nix +++ b/python/pkgs/localstack-client/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, boto3, pytestCheckHook, @@ -9,23 +11,24 @@ pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "localstack-client"; version = "2.12"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "localstack_client"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-27mHEv0siGnV3+16LKAGuVx3UP6aQ68SPvBU78fn67Q="; }; - propagatedBuildInputs = [ boto3 ]; + build-system = [ setuptools ]; + + dependencies = [ boto3 ]; pythonImportsCheck = [ "localstack_client" ]; # All commands test `localstack` which is a downstream dependency - doCheck = false; nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ @@ -41,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/localstack/localstack-python-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/localzone/default.nix b/python/pkgs/localzone/default.nix index 53d2bc3d6..c599b65f5 100644 --- a/python/pkgs/localzone/default.nix +++ b/python/pkgs/localzone/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "localzone"; version = "0.9.8"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ags-slc"; repo = "localzone"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-quAo5w4Oxu9Hu96inu3vuiQ9GZMLpq0M8Vj67IPYcbE="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://localzone.iomaestro.com"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/locationsharinglib/default.nix b/python/pkgs/locationsharinglib/default.nix index 9fa204ff4..20e561e4c 100644 --- a/python/pkgs/locationsharinglib/default.nix +++ b/python/pkgs/locationsharinglib/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "locationsharinglib"; version = "5.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ar5/gyDnby0aceqqHe8lTQaHafOub+IPKglmct4xEGM="; }; @@ -36,7 +36,6 @@ buildPythonPackage rec { ]; # There are no tests - doCheck = false; pythonImportsCheck = [ "locationsharinglib" ]; @@ -45,4 +44,4 @@ buildPythonPackage rec { homepage = "https://locationsharinglib.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/locket/default.nix b/python/pkgs/locket/default.nix index 4a8abb37a..0ab2a2663 100644 --- a/python/pkgs/locket/default.nix +++ b/python/pkgs/locket/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "locket"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XA1MBSqLu/dQ4Fao5lzNMJCG9PDxii6sMGqN+kESpjI="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Library which provides a lock that can be used by multiple processes"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/lockfile/default.nix b/python/pkgs/lockfile/default.nix index eb4f1a75f..8581189fb 100644 --- a/python/pkgs/lockfile/default.nix +++ b/python/pkgs/lockfile/default.nix @@ -6,13 +6,13 @@ pbr, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lockfile"; version = "0.12.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-au0C3gPLok76vNYAswVAFAY0/AbPpgOCLVCNU2Hp95k="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { description = "Platform-independent advisory file locking capability for Python applications"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/locust-cloud/default.nix b/python/pkgs/locust-cloud/default.nix index dab41025f..9fbe1e576 100644 --- a/python/pkgs/locust-cloud/default.nix +++ b/python/pkgs/locust-cloud/default.nix @@ -16,7 +16,7 @@ requests-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "locust-cloud"; version = "1.30.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "locustcloud"; repo = "locust-cloud"; - tag = version; + tag = finalAttrs.version; hash = "sha256-GJS0+CUYMz3G98I7Edj2qEsIFTp5wzsuSMmN7DlZPjA="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/locustcloud/locust-cloud"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/locust/default.nix b/python/pkgs/locust/default.nix index 25a4be61e..635e2a113 100644 --- a/python/pkgs/locust/default.nix +++ b/python/pkgs/locust/default.nix @@ -22,7 +22,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "locust"; version = "2.43.1"; pyproject = true; @@ -30,26 +30,26 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "locustio"; repo = "locust"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+0B4S524UjvaYl7VTZ1IY7UuBuDjUBqOvjHu0UVOi6A="; }; postPatch = '' substituteInPlace locust/test/test_main.py \ - --replace-fail '"locust"' '"${placeholder "out"}/bin/locust"' + --replace-fail '"locust"' '"$(out)/bin/locust"' substituteInPlace locust/test/test_log.py \ - --replace-fail '"locust"' '"${placeholder "out"}/bin/locust"' + --replace-fail '"locust"' '"$(out)/bin/locust"' ''; webui = callPackage ./webui.nix { - inherit version; - src = "${src}/locust/webui"; + inherit (finalAttrs) version; + src = "${finalAttrs.src}/locust/webui"; }; preBuild = '' mkdir -p $out/${python.sitePackages}/locust/webui/dist - ln -sf ${webui}/dist/* $out/${python.sitePackages}/locust/webui/dist + ln -sf ${finalAttrs.webui}/dist/* $out/${python.sitePackages}/locust/webui/dist ''; build-system = [ @@ -82,11 +82,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "locust" ]; - doCheck = false; - meta = { description = "Developer-friendly load testing framework"; homepage = "https://docs.locust.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/log-symbols/default.nix b/python/pkgs/log-symbols/default.nix index 4049672c4..9a4ccf66b 100644 --- a/python/pkgs/log-symbols/default.nix +++ b/python/pkgs/log-symbols/default.nix @@ -6,13 +6,13 @@ colorama, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "log_symbols"; version = "0.0.14"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zwu8b+Go5T8NF0pxa8YlxPhwQ8wh61XdinQM/iJoBVY="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/manrajgrover/py-log-symbols"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/logbook/default.nix b/python/pkgs/logbook/default.nix index 54be8669c..1a8b95d36 100644 --- a/python/pkgs/logbook/default.nix +++ b/python/pkgs/logbook/default.nix @@ -6,13 +6,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "logbook"; version = "1.10.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-f9+NCdYMnqpNjSezc2O0zid9AZ9MrlwlnqAwQPe2NLc="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { description = "Logging replacement for Python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/logfire/default.nix b/python/pkgs/logfire/default.nix index a1f00209d..95b56f78c 100644 --- a/python/pkgs/logfire/default.nix +++ b/python/pkgs/logfire/default.nix @@ -65,7 +65,6 @@ buildPythonPackage (finalAttrs: { pname = "logfire"; version = "5.0.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "pydantic"; @@ -129,7 +128,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "logfire" ]; # Too many outdated snapshots that fail with inline-snapshot - doCheck = false; meta = { description = "Uncomplicated Observability for Python and beyond"; downloadPage = "https://github.com/pydantic/logfire/releases/tag/${finalAttrs.src.tag}"; diff --git a/python/pkgs/logfury/default.nix b/python/pkgs/logfury/default.nix index 0045ec5db..67575d178 100644 --- a/python/pkgs/logfury/default.nix +++ b/python/pkgs/logfury/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "logfury"; version = "1.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-EwpdrOq5rVNJJCUt33BIKqLJZmKzo4JafTCYHQO3aiY="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/ppolewicz/logfury"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/logging-journald/default.nix b/python/pkgs/logging-journald/default.nix index c61d6ac67..a21e60530 100644 --- a/python/pkgs/logging-journald/default.nix +++ b/python/pkgs/logging-journald/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "logging-journald"; version = "0.6.12"; pyproject = true; @@ -13,14 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mosquito"; repo = "logging-journald"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kR/ter0hr9t+f1yFG9dhE/CZz92ve64nBAMnvLosG9E="; }; build-system = [ hatchling ]; # Circular dependency with aiomisc - doCheck = false; pythonImportsCheck = [ "logging_journald" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/mosquito/logging-journald"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/logic2-automation/default.nix b/python/pkgs/logic2-automation/default.nix index 68c51d1a0..fbafc343b 100644 --- a/python/pkgs/logic2-automation/default.nix +++ b/python/pkgs/logic2-automation/default.nix @@ -40,7 +40,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests require the unfree saleae-logic-2 package, plus gRPC server which is not packaged, yet. - doCheck = false; pythonImportsCheck = [ "saleae.automation" ]; diff --git a/python/pkgs/logmatic-python/default.nix b/python/pkgs/logmatic-python/default.nix index fffcf8a09..5ddf57736 100644 --- a/python/pkgs/logmatic-python/default.nix +++ b/python/pkgs/logmatic-python/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "logmatic-python"; version = "0.1.7"; pyproject = true; @@ -14,16 +14,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "logmatic"; repo = "logmatic-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UYKm00KhXnPQDkKJVm7s0gOwZ3GNY07O0oKbzPhAdVE="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ python-json-logger ]; + dependencies = [ python-json-logger ]; # Only functional tests, no unit tests - doCheck = false; pythonImportsCheck = [ "logmatic" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/logmatic/logmatic-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/loguru/default.nix b/python/pkgs/loguru/default.nix index d8a071657..48f953da2 100644 --- a/python/pkgs/loguru/default.nix +++ b/python/pkgs/loguru/default.nix @@ -8,7 +8,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "loguru"; version = "0.7.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Delgan"; repo = "loguru"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tccEzzs9TtFAZM9s43cskF9llc81Ng28LqedjLiE1m4="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/Delgan/loguru"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/logutils/default.nix b/python/pkgs/logutils/default.nix index a0d895fcf..3b3bc33cb 100644 --- a/python/pkgs/logutils/default.nix +++ b/python/pkgs/logutils/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "logutils"; version = "0.3.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vAWKJdXCCUYfE04fA8q2N9ZqelzMEuWT21b7snmJmoI="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://bitbucket.org/vinay.sajip/logutils/"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/logzero/default.nix b/python/pkgs/logzero/default.nix index 8408af57a..f4523a5af 100644 --- a/python/pkgs/logzero/default.nix +++ b/python/pkgs/logzero/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "logzero"; version = "1.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-f3Pd0645NFcjbwgf/r0ESjqi5COkeubdtReauQ0K0II="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Robust and effective logging for Python 2 and 3"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lomond/default.nix b/python/pkgs/lomond/default.nix index a1d287c23..4cbbc48fe 100644 --- a/python/pkgs/lomond/default.nix +++ b/python/pkgs/lomond/default.nix @@ -1,6 +1,8 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lib, pythonAtLeast, @@ -13,24 +15,26 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lomond"; version = "0.3.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "wildfoundry"; - repo = "dataplicity-${pname}"; + repo = "dataplicity-${finalAttrs.pname}"; rev = "b30dad3cc38d5ff210c5dd01f8c3c76aa6c616d1"; sha256 = "0lydq0imala08wxdyg2iwhqa6gcdrn24ah14h91h2zcxjhjk4gv8"; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner'" "" ''; - propagatedBuildInputs = [ six ]; + dependencies = [ six ]; nativeCheckInputs = [ freezegun @@ -58,4 +62,4 @@ buildPythonPackage rec { homepage = "https://github.com/wildfoundry/dataplicity-lomond"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/london-tube-status/default.nix b/python/pkgs/london-tube-status/default.nix index 9f10295d9..605600812 100644 --- a/python/pkgs/london-tube-status/default.nix +++ b/python/pkgs/london-tube-status/default.nix @@ -8,7 +8,7 @@ requests-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "london-tube-status"; version = "0.7"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robmarkcole"; repo = "London-tube-status"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0uDCrF3abx94X47LQxgALirSF/spJPVD91G2WqXaDVs="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail 'VERSION = "0.6.1"' 'VERSION = "${version}"' + --replace-fail 'VERSION = "0.6.1"' 'VERSION = "${finalAttrs.version}"' ''; build-system = [ @@ -40,7 +40,6 @@ buildPythonPackage rec { # Tests are currently broken # https://github.com/robmarkcole/London-tube-status/issues/7 - doCheck = false; pythonImportsCheck = [ "london_tube_status" @@ -51,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/robmarkcole/London-tube-status"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/looseversion/default.nix b/python/pkgs/looseversion/default.nix index 92cbc7a22..19c2371b9 100644 --- a/python/pkgs/looseversion/default.nix +++ b/python/pkgs/looseversion/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "looseversion"; version = "1.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/effigies/looseversion"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/loqedapi/default.nix b/python/pkgs/loqedapi/default.nix index 0a0daba7a..c48532a7c 100644 --- a/python/pkgs/loqedapi/default.nix +++ b/python/pkgs/loqedapi/default.nix @@ -27,7 +27,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests require network access - doCheck = false; pythonImportsCheck = [ "loqedAPI" ]; diff --git a/python/pkgs/loro/default.nix b/python/pkgs/loro/default.nix index 6870984ad..299fcd395 100644 --- a/python/pkgs/loro/default.nix +++ b/python/pkgs/loro/default.nix @@ -5,18 +5,18 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "loro"; version = "1.13.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-DDcnvFL1CYV2Uy7dOZ78CM6yNMXZI1oZy9XqN8T7pIU="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-KVBe2bUvxilOysCVfcBSZCtwexlTkVAc83tH1H7nMbQ="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/loro-dev/loro-py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/low-index/default.nix b/python/pkgs/low-index/default.nix index c505c5f78..bd3a6cdd8 100644 --- a/python/pkgs/low-index/default.nix +++ b/python/pkgs/low-index/default.nix @@ -7,7 +7,7 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "low-index"; version = "1.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "3-manifolds"; repo = "low_index"; - tag = "v${version}_as_released"; + tag = "v${finalAttrs.version}_as_released"; hash = "sha256-m3p05bqu70pMOsb9drW1B6+N893eBSZBFTNNS23OY6w="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/3-manifolds/low_index"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/lox/default.nix b/python/pkgs/lox/default.nix index b25b33bb3..f5f92b13a 100644 --- a/python/pkgs/lox/default.nix +++ b/python/pkgs/lox/default.nix @@ -10,7 +10,7 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lox"; version = "1.0.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "BrianPugh"; repo = "lox"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PZKs+D1TmrBr+1M4ni7kKLywQ8Z6YCVjH2HFF6QjHdY="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/BrianPugh/lox"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/lpc-checksum/default.nix b/python/pkgs/lpc-checksum/default.nix index 4a5bfb28c..8c1e3755d 100644 --- a/python/pkgs/lpc-checksum/default.nix +++ b/python/pkgs/lpc-checksum/default.nix @@ -7,7 +7,7 @@ intelhex, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lpc-checksum"; version = "3.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "basilfx"; repo = "lpc_checksum"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-POgV0BdkMLmdjBh/FToPPmJTAxsPASB7ZE32SqGGKHk="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { pytestCheckHook ]; - propagatedBuildInputs = [ intelhex ]; + dependencies = [ intelhex ]; pythonImportsCheck = [ "lpc_checksum" ]; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/lpc-checksum/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lrclibapi/default.nix b/python/pkgs/lrclibapi/default.nix index 73720f726..e90215327 100644 --- a/python/pkgs/lrclibapi/default.nix +++ b/python/pkgs/lrclibapi/default.nix @@ -7,7 +7,7 @@ vcrpy, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lrclibapi"; version = "0.3.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Dr-Blank"; repo = "lrclibapi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-K5wO3BexftnWe48loaW8TjySQvh2X+X3GSmG5qg+BGc="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { description = "Python wrapper for downloading synced lyrics from the lrclib.net api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lsprotocol/2023.nix b/python/pkgs/lsprotocol/2023.nix index 8e6c0d8e2..2c8e288c3 100644 --- a/python/pkgs/lsprotocol/2023.nix +++ b/python/pkgs/lsprotocol/2023.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lsprotocol"; version = "2023.0.1"; # nixpkgs-update: no auto update pyproject = true; @@ -19,11 +19,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "lsprotocol"; - tag = version; + tag = finalAttrs.version; hash = "sha256-PHjLKazMaT6W4Lve1xNxm6hEwqE3Lr2m5L7Q03fqb68="; }; - sourceRoot = "${src.name}/packages/python"; + sourceRoot = "${finalAttrs.src.name}/packages/python"; build-system = [ flit-core @@ -34,9 +34,8 @@ buildPythonPackage rec { cattrs ]; - nativeCheckInputs = [ pytestCheckHook ]; - - checkInputs = [ + nativeCheckInputs = [ + pytestCheckHook importlib-resources jsonschema pyhamcrest @@ -62,7 +61,7 @@ buildPythonPackage rec { meta = { description = "Python implementation of the Language Server Protocol"; homepage = "https://github.com/microsoft/lsprotocol"; - changelog = "https://github.com/microsoft/lsprotocol/releases/tag/${src.tag}"; + changelog = "https://github.com/microsoft/lsprotocol/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lsprotocol/default.nix b/python/pkgs/lsprotocol/default.nix index dff806d2e..6abcd0d7a 100644 --- a/python/pkgs/lsprotocol/default.nix +++ b/python/pkgs/lsprotocol/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lsprotocol"; version = "2025.0.0"; pyproject = true; @@ -19,11 +19,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "lsprotocol"; - tag = version; + tag = finalAttrs.version; hash = "sha256-DrWXHMgDZSQQ6vsmorThMrUTX3UQU+DajSEOdxoXrFQ="; }; - sourceRoot = "${src.name}/packages/python"; + sourceRoot = "${finalAttrs.src.name}/packages/python"; build-system = [ flit-core @@ -34,9 +34,8 @@ buildPythonPackage rec { cattrs ]; - nativeCheckInputs = [ pytestCheckHook ]; - - checkInputs = [ + nativeCheckInputs = [ + pytestCheckHook importlib-resources jsonschema pyhamcrest @@ -62,4 +61,4 @@ buildPythonPackage rec { homepage = "https://github.com/microsoft/lsprotocol"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ltpycld2/default.nix b/python/pkgs/ltpycld2/default.nix index e52062285..2c0671555 100644 --- a/python/pkgs/ltpycld2/default.nix +++ b/python/pkgs/ltpycld2/default.nix @@ -3,21 +3,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ltpycld2"; version = "0.42"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "LTpycld2"; - inherit version; + inherit (finalAttrs) version; sha256 = "948d0c1ab5518ab4efcbcc3cd73bb29f809f1dfb30f4d2fbd81b175a1ffeb516"; }; - doCheck = false; # completely broken tests + build-system = [ setuptools ]; pythonImportsCheck = [ "pycld2" ]; @@ -30,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/LibreTranslate/pycld2"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/luddite/default.nix b/python/pkgs/luddite/default.nix index edcd4d113..5c0c350d4 100644 --- a/python/pkgs/luddite/default.nix +++ b/python/pkgs/luddite/default.nix @@ -9,26 +9,26 @@ pytest-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "luddite"; version = "1.0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jumptrading"; repo = "luddite"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iJ3h1XRBzLd4cBKFPNOlIV5Z5XJ/miscfIdkpPIpbJ8="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace pytest.ini \ --replace "--disable-socket" "" ''; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ packaging ]; + dependencies = [ packaging ]; pythonImportsCheck = [ "luddite" ]; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/jumptrading/luddite"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/luhn/default.nix b/python/pkgs/luhn/default.nix index b8290bdb8..aac3c3656 100644 --- a/python/pkgs/luhn/default.nix +++ b/python/pkgs/luhn/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "luhn"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mmcloughlin"; repo = "luhn"; - rev = version; + tag = finalAttrs.version; hash = "sha256-ZifaCjOVhWdXuzi5n6V+6eVN5vrEHKgUdpSOXoMyR18="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; enabledTestPaths = [ "test.py" ]; @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/mmcloughlin/luhn"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/luigi/default.nix b/python/pkgs/luigi/default.nix index 51a20ad43..a6cbfffaa 100644 --- a/python/pkgs/luigi/default.nix +++ b/python/pkgs/luigi/default.nix @@ -40,7 +40,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "luigi" ]; # Requires tox, hadoop, and google cloud - doCheck = false; # This enables accessing modules stored in cwd makeWrapperArgs = [ "--prefix PYTHONPATH . :" ]; diff --git a/python/pkgs/lunarcalendar/default.nix b/python/pkgs/lunarcalendar/default.nix index 3fc6d9470..e99483a79 100644 --- a/python/pkgs/lunarcalendar/default.nix +++ b/python/pkgs/lunarcalendar/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, python-dateutil, ephem, @@ -13,7 +15,7 @@ buildPythonPackage { pname = "lunarcalendar"; version = "0.0.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "wolfhong"; @@ -22,7 +24,9 @@ buildPythonPackage { hash = "sha256-AhxCWWqCjlOroqs4pOSZTWoIQT8a1l/D2Rxuw1XUoU8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ python-dateutil ephem pytz diff --git a/python/pkgs/lupupy/default.nix b/python/pkgs/lupupy/default.nix index 3f3f10893..ab085aa40 100644 --- a/python/pkgs/lupupy/default.nix +++ b/python/pkgs/lupupy/default.nix @@ -8,26 +8,25 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lupupy"; version = "0.3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-A92Jk6WlRKep3dkbqLiYYHklEh0pyncipRW6swq0mvo="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ colorlog pyyaml requests ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "lupupy" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/majuss/lupupy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/luqum/default.nix b/python/pkgs/luqum/default.nix index d632294fe..97baf7e4f 100644 --- a/python/pkgs/luqum/default.nix +++ b/python/pkgs/luqum/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "luqum"; version = "1.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jurismarches"; repo = "luqum"; - tag = version; + tag = finalAttrs.version; hash = "sha256-X1P7sACcp2yVjW3xWmD88iDT4T9dSDi8yxwDFaRbEsc="; }; @@ -28,11 +28,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ ply ]; + dependencies = [ ply ]; pythonImportsCheck = [ "luqum" ]; meta = { description = "Lucene query parser generating ElasticSearch queries"; homepage = "https://github.com/jurismarches/luqum"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/luxtronik/default.nix b/python/pkgs/luxtronik/default.nix index 0b9c43727..7bcb8a332 100644 --- a/python/pkgs/luxtronik/default.nix +++ b/python/pkgs/luxtronik/default.nix @@ -2,22 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "luxtronik"; version = "0.3.14"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Bouni"; repo = "python-luxtronik"; - rev = version; + tag = finalAttrs.version; hash = "sha256-7TuvqOAb/MUumOF6BKTRLOJuvteqZPmFUXXsuwEpmOM="; }; + build-system = [ setuptools ]; + # Project has no tests - doCheck = false; pythonImportsCheck = [ "luxtronik" ]; @@ -26,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/Bouni/python-luxtronik"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lw12/default.nix b/python/pkgs/lw12/default.nix index e042b064b..4085a41e0 100644 --- a/python/pkgs/lw12/default.nix +++ b/python/pkgs/lw12/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lw12"; version = "0.9.2"; pyproject = true; @@ -13,18 +13,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaypikay"; repo = "python-lw12"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6zZolUfs1SzCH0DT2YYuP4eXt8Hxv+TYIDgLnR51MAQ="; }; build-system = [ setuptools ]; # Tests require hardware access - doCheck = false; meta = { description = "Library to control the Lagute LW-12 WiFi LED controller"; homepage = "https://github.com/jaypikay/python-lw12"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lxml-html-clean/default.nix b/python/pkgs/lxml-html-clean/default.nix index 30bb65835..b8b894564 100644 --- a/python/pkgs/lxml-html-clean/default.nix +++ b/python/pkgs/lxml-html-clean/default.nix @@ -7,7 +7,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lxml-html-clean"; version = "0.4.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fedora-python"; repo = "lxml_html_clean"; - tag = version; + tag = finalAttrs.version; hash = "sha256-mToWK2Cc2cfBmEqcL5z61WydQUb78TWZDGGLR9kNliA="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/fedora-python/lxml_html_clean/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/lxml/default.nix b/python/pkgs/lxml/default.nix index 5a486bf20..bf203b4d6 100644 --- a/python/pkgs/lxml/default.nix +++ b/python/pkgs/lxml/default.nix @@ -48,7 +48,6 @@ buildPythonPackage (finalAttrs: { }; # tests are meant to be ran "in-place" in the same directory as src - doCheck = false; pythonImportsCheck = [ "lxml" diff --git a/python/pkgs/lyricwikia/default.nix b/python/pkgs/lyricwikia/default.nix index 2cd712fdb..86a4321d6 100644 --- a/python/pkgs/lyricwikia/default.nix +++ b/python/pkgs/lyricwikia/default.nix @@ -3,30 +3,34 @@ beautifulsoup4, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, requests, responses, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lyricwikia"; version = "0.1.11"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "enricobacis"; repo = "lyricwikia"; - tag = version; + tag = finalAttrs.version; hash = "sha256-P88DrRAa2zptt8JLy0/PLi0oZ/BghF/XGSP0kOObi7E="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner'" "" ''; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 requests six @@ -50,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/enricobacis/lyricwikia"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/lzallright/default.nix b/python/pkgs/lzallright/default.nix index ea78f6f9c..ec62b6092 100644 --- a/python/pkgs/lzallright/default.nix +++ b/python/pkgs/lzallright/default.nix @@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "vlaci"; repo = "lzallright"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bnGnx+CKcneBWd5tpYWxEPp5f3hvGxM+8QcD2NKX4Tw="; }; diff --git a/python/pkgs/lzfse/default.nix b/python/pkgs/lzfse/default.nix index 3053684be..a21cc57f0 100644 --- a/python/pkgs/lzfse/default.nix +++ b/python/pkgs/lzfse/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lzfse"; version = "0.4.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "m1stadev"; repo = "lzfse"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-ER+Hr/WrGCB0uYwsSgB4U8sCPeZ4JlOHoeb5YEGUFFM="; }; @@ -23,11 +23,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "lzfse" ]; # upstream has no tests - doCheck = false; meta = { description = "Python bindings for the LZFSE reference implementation"; homepage = "https://github.com/m1stadev/lzfse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/m3u8/default.nix b/python/pkgs/m3u8/default.nix index e1fcddb50..a5914b839 100644 --- a/python/pkgs/m3u8/default.nix +++ b/python/pkgs/m3u8/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "m3u8"; version = "6.0.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "globocom"; repo = "m3u8"; - tag = version; + tag = finalAttrs.version; hash = "sha256-1SOuKKNBg67Yc0a6Iqb1goTE7sraptzpFIB2lvrbMQg="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/globocom/m3u8"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mac-alias/default.nix b/python/pkgs/mac-alias/default.nix index be44f881a..90a1e9be1 100644 --- a/python/pkgs/mac-alias/default.nix +++ b/python/pkgs/mac-alias/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mac-alias"; version = "2.2.3"; pyproject = true; src = fetchPypi { pname = "mac_alias"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-HH+jZ2h9ZpefLOTRqLJxbPHJ+4EXQcqzzzyjVlVcK+s="; }; @@ -24,7 +24,6 @@ buildPythonPackage rec { # pypi package does not include tests; # tests anyway require admin privileges to succeed - doCheck = false; pythonImportsCheck = [ "mac_alias" ]; meta = { @@ -40,4 +39,4 @@ buildPythonPackage rec { ''; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mac-vendor-lookup/default.nix b/python/pkgs/mac-vendor-lookup/default.nix index a0bc71d96..cb54e2c12 100644 --- a/python/pkgs/mac-vendor-lookup/default.nix +++ b/python/pkgs/mac-vendor-lookup/default.nix @@ -30,8 +30,6 @@ buildPythonPackage (finalAttrs: { aiohttp ]; - doCheck = false; # no tests - pythonImportsCheck = [ "mac_vendor_lookup" ]; meta = { diff --git a/python/pkgs/macholib/default.nix b/python/pkgs/macholib/default.nix index e75c1c5cb..8b77089a9 100644 --- a/python/pkgs/macholib/default.nix +++ b/python/pkgs/macholib/default.nix @@ -14,7 +14,7 @@ let coreutils' = coreutils.override { singleBinary = false; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "macholib"; version = "1.16.4"; pyproject = true; @@ -22,14 +22,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ronaldoussoren"; repo = "macholib"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+7dFPwzwKmvtDY/blLNyrNDEATcgo+BUceoSGg55gbo="; }; # test_command_line.py::test_shared_main requires that /bin/sh and # /bin/ls exist and are regular executables (not symlinks). # It also dislikes something about the real /bin. - postPatch = lib.optionalString doCheck '' + postPatch = lib.optionalString finalAttrs.doCheck '' substituteInPlace macholib_tests/test_command_line.py \ --replace-fail '"/bin/sh"' '"${lib.getExe' bashNonInteractive "bash"}"' \ --replace-fail '"/bin/ls"' '"${lib.getExe' coreutils' "ls"}"' \ @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/ronaldoussoren/macholib"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/magic-filter/default.nix b/python/pkgs/magic-filter/default.nix index e9c6794d4..f909d75b7 100644 --- a/python/pkgs/magic-filter/default.nix +++ b/python/pkgs/magic-filter/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "magic-filter"; version = "1.0.12"; pyproject = true; @@ -13,13 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aiogram"; repo = "magic-filter"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MSYIZ/bzngRu6mG3EGblUotSCA+6bi+l3EymFA8NRZA="; }; postPatch = '' substituteInPlace magic_filter/__init__.py \ - --replace '"1"' '"${version}"' + --replace '"1"' '"${finalAttrs.version}"' ''; nativeBuildInputs = [ hatchling ]; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/aiogram/magic-filter"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/magic/default.nix b/python/pkgs/magic/default.nix index 81c2e2b72..dabbbddd5 100644 --- a/python/pkgs/magic/default.nix +++ b/python/pkgs/magic/default.nix @@ -3,12 +3,16 @@ stdenv, buildPythonPackage, pkgs, + # build-system + setuptools, }: buildPythonPackage { - format = "setuptools"; + pyproject = true; inherit (pkgs.file) pname version src; + build-system = [ setuptools ]; + patchPhase = '' substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; @@ -18,7 +22,6 @@ buildPythonPackage { preConfigure = "cd python"; # No test suite - doCheck = false; meta = { description = "Python wrapper around libmagic"; diff --git a/python/pkgs/mailcap-fix/default.nix b/python/pkgs/mailcap-fix/default.nix index dbad31163..e0a089409 100644 --- a/python/pkgs/mailcap-fix/default.nix +++ b/python/pkgs/mailcap-fix/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mailcap-fix"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "02lijkq6v379r8zkqg9q2srin3i80m4wvwik3hcbih0s14v0ng0i"; }; + build-system = [ setuptools ]; + meta = { description = "Patched mailcap module that conforms to RFC 1524"; homepage = "https://github.com/michael-lazar/mailcap_fix"; license = lib.licenses.unlicense; }; -} +}) diff --git a/python/pkgs/mailchecker/default.nix b/python/pkgs/mailchecker/default.nix index 05e297f75..4a05340da 100644 --- a/python/pkgs/mailchecker/default.nix +++ b/python/pkgs/mailchecker/default.nix @@ -18,7 +18,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "MailChecker" ]; diff --git a/python/pkgs/mailchimp/default.nix b/python/pkgs/mailchimp/default.nix index ba1c50319..0f1722ec6 100644 --- a/python/pkgs/mailchimp/default.nix +++ b/python/pkgs/mailchimp/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, docopt, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "2.0.10"; - format = "setuptools"; + pyproject = true; pname = "mailchimp"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "5227999904233a7d2e9ce5eac5225b9a5fac0318ae5107e3ed09c8bf89286768"; }; + build-system = [ setuptools ]; + buildInputs = [ docopt ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; patchPhase = '' sed -i 's/==/>=/' setup.py ''; @@ -27,4 +31,4 @@ buildPythonPackage rec { homepage = "http://apidocs.mailchimp.com/api/2.0/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mailmanclient/default.nix b/python/pkgs/mailmanclient/default.nix index 2e2c7bbf1..342273a3a 100644 --- a/python/pkgs/mailmanclient/default.nix +++ b/python/pkgs/mailmanclient/default.nix @@ -6,13 +6,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mailmanclient"; version = "3.3.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Y1gcYEyn6sAhSJwVqsygaklY63b2ZXTG+rBerGVN2Fc="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://www.gnu.org/software/mailman/"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/maison/default.nix b/python/pkgs/maison/default.nix index 1039d36dd..cdaf42827 100644 --- a/python/pkgs/maison/default.nix +++ b/python/pkgs/maison/default.nix @@ -11,7 +11,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "maison"; version = "2.0.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dbatten5"; repo = "maison"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-F0mxOeLFDCiPhhKaaUy4qV//Pb2JXCtOLNB1uW2KWZY="; }; @@ -32,7 +32,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pydantic pytestCheckHook ]; @@ -45,4 +45,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "maison"; }; -} +}) diff --git a/python/pkgs/makefun/default.nix b/python/pkgs/makefun/default.nix index 80695bd3a..47dc76267 100644 --- a/python/pkgs/makefun/default.nix +++ b/python/pkgs/makefun/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "makefun"; version = "1.16.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4UYBgxVwv/H21+aIKLzTDS9YVvJLrV3gzLIpIc7ryUc="; }; @@ -28,11 +28,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "makefun" ]; - doCheck = false; - meta = { homepage = "https://github.com/smarie/python-makefun"; description = "Small library to dynamically create python functions"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/mallard-ducktype/default.nix b/python/pkgs/mallard-ducktype/default.nix index fc001e4b9..31d4684a1 100644 --- a/python/pkgs/mallard-ducktype/default.nix +++ b/python/pkgs/mallard-ducktype/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mallard-ducktype"; version = "1.0.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "projectmallard"; repo = "mallard-ducktype"; - tag = version; + tag = finalAttrs.version; hash = "sha256-jHjzTBBRBh//bOrdnyCRmZRmpupgDaDRuZGAd75baco="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/projectmallard/mallard-ducktype"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mammoth/default.nix b/python/pkgs/mammoth/default.nix index b7f51d0b0..72f57ea06 100644 --- a/python/pkgs/mammoth/default.nix +++ b/python/pkgs/mammoth/default.nix @@ -10,7 +10,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mammoth"; version = "1.12.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mwilliamson"; repo = "python-mammoth"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8aqO5JPiyONu5rfR76qrutPHGE4nJn+716uPtYlZ+xA="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/mwilliamson/python-mammoth"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/managesieve/default.nix b/python/pkgs/managesieve/default.nix index c62bbdbf5..0f42f2625 100644 --- a/python/pkgs/managesieve/default.nix +++ b/python/pkgs/managesieve/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "managesieve"; version = "0.8.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LVwe0Pn6YPIAuoIaxXMfvCbOfS4NAjozkrdMNZDq+uU="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { description = "ManageSieve client library for remotely managing Sieve scripts"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/mando/default.nix b/python/pkgs/mando/default.nix index e0e42dba4..f15ddfe3f 100644 --- a/python/pkgs/mando/default.nix +++ b/python/pkgs/mando/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mando"; version = "0.8.2"; @@ -15,12 +15,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rubik"; repo = "mando"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FuQZ53ojrQO++0TN0C3hk0LXH+mcfRqtGq8VvfYDufg="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ six ]; + dependencies = [ six ]; pythonImportsCheck = [ "mando" ]; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://mando.readthedocs.org"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/manhole/default.nix b/python/pkgs/manhole/default.nix index 2a49593bc..4ad99ebdc 100644 --- a/python/pkgs/manhole/default.nix +++ b/python/pkgs/manhole/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "manhole"; version = "1.8.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Nmj9r4OzPJQ9tOdQ4MVU4xwg9jM4SWiV3U1kEGgNnEs="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ionelmc/python-manhole"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/manifestoo-core/default.nix b/python/pkgs/manifestoo-core/default.nix index 36f372f19..38fa0dd6d 100644 --- a/python/pkgs/manifestoo-core/default.nix +++ b/python/pkgs/manifestoo-core/default.nix @@ -6,13 +6,13 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "manifestoo-core"; version = "1.15.5"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "manifestoo_core"; hash = "sha256-K1STpYG4m6JojWEAevB/VkP0fkSbbE5eaxINL0UfxPg="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/acsone/manifestoo-core"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/manimpango/default.nix b/python/pkgs/manimpango/default.nix index 21c6bcfec..ef8c06540 100644 --- a/python/pkgs/manimpango/default.nix +++ b/python/pkgs/manimpango/default.nix @@ -8,7 +8,7 @@ cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "manimpango"; version = "0.6.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ManimCommunity"; repo = "manimpango"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8eQmhVsW440/zxOwjngnPTGT7iFbdSvBV7tnI332piE="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/ManimCommunity/ManimPango"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/manuel/default.nix b/python/pkgs/manuel/default.nix index 74b293b28..29166bb82 100644 --- a/python/pkgs/manuel/default.nix +++ b/python/pkgs/manuel/default.nix @@ -3,20 +3,24 @@ buildPythonPackage, fetchPypi, fetchpatch, + # build-system + setuptools, python, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "manuel"; version = "1.13.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XWMSDej6bZJ3gLaa4oqj6dFmmxCvPTJ4Xz+6EaW+iFo="; }; + build-system = [ setuptools ]; + patches = lib.optionals (lib.versionAtLeast python.version "3.11") [ # https://github.com/benji-york/manuel/pull/32 # Applying conditionally until upstream arrives at some general solution. @@ -27,11 +31,11 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ six ]; + dependencies = [ six ]; meta = { description = "Documentation builder"; homepage = "https://pypi.org/project/manuel/"; license = lib.licenses.zpl20; }; -} +}) diff --git a/python/pkgs/mapbox-earcut/default.nix b/python/pkgs/mapbox-earcut/default.nix index 831190f76..30bf1230a 100644 --- a/python/pkgs/mapbox-earcut/default.nix +++ b/python/pkgs/mapbox-earcut/default.nix @@ -16,7 +16,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mapbox-earcut"; version = "2.0.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "skogler"; repo = "mapbox_earcut_python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-R5YDJbfDNf6jAvG3VJQMYay6i8dw616SUs0tPgrJt6I="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { polygons. ''; }; -} +}) diff --git a/python/pkgs/mapclassify/default.nix b/python/pkgs/mapclassify/default.nix index 298a6f8cf..cd401076b 100644 --- a/python/pkgs/mapclassify/default.nix +++ b/python/pkgs/mapclassify/default.nix @@ -12,7 +12,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mapclassify"; version = "2.11.0"; pyproject = true; @@ -20,13 +20,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pysal"; repo = "mapclassify"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QmGSMkCBAzpWLmDcSjwa8DibAA0JsNHjgjmb8zBuXno="; }; build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ networkx numpy pandas @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://pysal.org/mapclassify/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mariadb/default.nix b/python/pkgs/mariadb/default.nix index e8d08da12..8928de294 100644 --- a/python/pkgs/mariadb/default.nix +++ b/python/pkgs/mariadb/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mariadb"; version = "1.1.14"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mariadb-corporation"; repo = "mariadb-connector-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BPyEBQ5M/kqTKpZX/incgTX/+E1dMZW98GuywsBeCJw="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/mariadb-corporation/mariadb-connector-python"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/marimo/default.nix b/python/pkgs/marimo/default.nix index 1883e669b..580c0a4ce 100644 --- a/python/pkgs/marimo/default.nix +++ b/python/pkgs/marimo/default.nix @@ -27,14 +27,14 @@ uvicorn, websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "marimo"; version = "0.23.14"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8z8Xq7UQbtq/aSHQFtkabY8CtNGw7VmQOZV7j39blIk="; }; @@ -73,4 +73,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "marimo"; }; -} +}) diff --git a/python/pkgs/marisa-trie/default.nix b/python/pkgs/marisa-trie/default.nix index 5ddda7f13..9a1a3e5e8 100644 --- a/python/pkgs/marisa-trie/default.nix +++ b/python/pkgs/marisa-trie/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "marisa-trie"; version = "1.4.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytries"; repo = "marisa-trie"; - tag = version; + tag = finalAttrs.version; hash = "sha256-U3gntlvJ0IaWoK+2V0OQ/XoDLfQsSbrrsSj95VR1m+4="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/kmike/marisa-trie"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/markdown-include/default.nix b/python/pkgs/markdown-include/default.nix index 98790cd06..4cab53741 100644 --- a/python/pkgs/markdown-include/default.nix +++ b/python/pkgs/markdown-include/default.nix @@ -2,34 +2,36 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, markdown, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "markdown-include"; version = "0.8.1"; - format = "setuptools"; + pyproject = true; # only wheel on pypi src = fetchFromGitHub { owner = "cmacmackin"; repo = "markdown-include"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1MEk0U00a5cpVhqnDZkwBIk4NYgsRXTVsI/ANNQ/OH0="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ markdown ]; + dependencies = [ markdown ]; pythonImportsCheck = [ "markdown_include" ]; - doCheck = false; # no tests - meta = { description = "Extension to Python-Markdown which provides an include function"; homepage = "https://github.com/cmacmackin/markdown-include"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/markdown-it-py/default.nix b/python/pkgs/markdown-it-py/default.nix index dcbb63d22..41ff209ac 100644 --- a/python/pkgs/markdown-it-py/default.nix +++ b/python/pkgs/markdown-it-py/default.nix @@ -6,7 +6,7 @@ mdurl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "markdown-it-py"; version = "4.2.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; repo = "markdown-it-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-S3xDPvnGqawsxAUcrMF/3a4jds6i+zfPLMpyvduaDpE="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "markdown-it"; }; -} +}) diff --git a/python/pkgs/markdown-macros/default.nix b/python/pkgs/markdown-macros/default.nix index a483431cf..f3c8723d4 100644 --- a/python/pkgs/markdown-macros/default.nix +++ b/python/pkgs/markdown-macros/default.nix @@ -7,13 +7,13 @@ markdown, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "markdown-macros"; version = "0.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1lzvrb7nci22yp21ab2qqc9p0fhkazqj29vw0wln2r4ckb2nbawv"; }; @@ -35,11 +35,9 @@ buildPythonPackage rec { dependencies = [ markdown ]; - doCheck = false; - meta = { description = "Extension for python-markdown that makes writing trac-like macros easy"; homepage = "https://github.com/wnielson/markdown-macros"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/markdown/default.nix b/python/pkgs/markdown/default.nix index 8c3857cc3..a788c4a32 100644 --- a/python/pkgs/markdown/default.nix +++ b/python/pkgs/markdown/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "markdown"; version = "3.10.3"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Python-Markdown"; repo = "markdown"; - tag = version; + tag = finalAttrs.version; hash = "sha256-itRigH1234C6hwtGRon4AiDAKafscmhMn22V5J9WtvI="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/Python-Markdown/markdown"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/markdown2/default.nix b/python/pkgs/markdown2/default.nix index 3c6a7dcf7..6e6d103ee 100644 --- a/python/pkgs/markdown2/default.nix +++ b/python/pkgs/markdown2/default.nix @@ -10,7 +10,7 @@ latex2mathml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "markdown2"; version = "2.5.5"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "trentm"; repo = "python-markdown2"; - tag = version; + tag = finalAttrs.version; hash = "sha256-h0vzv59RsceTZSvFF9DX5D6YanAKMTG3cNc1napXMyI="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/trentm/python-markdown2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/markuppy/default.nix b/python/pkgs/markuppy/default.nix index 522e84e47..10e72f0b3 100644 --- a/python/pkgs/markuppy/default.nix +++ b/python/pkgs/markuppy/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "markuppy"; version = "1.18"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VA8xuDUHYmAzk2iJCsT0TrOXHXX9vZe0n6H4tmhVE9M="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "HTML/XML generator"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/markups/default.nix b/python/pkgs/markups/default.nix index 3a913e68b..dd998a3a3 100644 --- a/python/pkgs/markups/default.nix +++ b/python/pkgs/markups/default.nix @@ -11,7 +11,7 @@ textile, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "markups"; version = "4.1.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "retext-project"; repo = "pymarkups"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kQ1L8l/ONT4qOA/xfx85WyA7pDveaKoXWGZbljYxO/4="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/retext-project/pymarkups"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/markupsafe/default.nix b/python/pkgs/markupsafe/default.nix index f912f2299..65e91b207 100644 --- a/python/pkgs/markupsafe/default.nix +++ b/python/pkgs/markupsafe/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "markupsafe"; version = "3.0.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pallets"; repo = "markupsafe"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2d64cItemqVM25WJIKrjExKz6v4UW2wVxM6phH1g1sE="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://palletsprojects.com/p/markupsafe/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/marqo/default.nix b/python/pkgs/marqo/default.nix index 8762cf3e9..b7df2af0c 100644 --- a/python/pkgs/marqo/default.nix +++ b/python/pkgs/marqo/default.nix @@ -11,7 +11,7 @@ requests-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "marqo"; version = "3.18.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "marqo-ai"; repo = "py-marqo"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vzeIl3egT3HOV0GacfEGaAgBxQ/c/4b9kxxTd2uNNfQ="; }; @@ -72,4 +72,4 @@ buildPythonPackage rec { homepage = "https://marqo.ai"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/marshmallow-oneofschema/default.nix b/python/pkgs/marshmallow-oneofschema/default.nix index abea83587..ae97147cd 100644 --- a/python/pkgs/marshmallow-oneofschema/default.nix +++ b/python/pkgs/marshmallow-oneofschema/default.nix @@ -6,7 +6,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "marshmallow-oneofschema"; version = "3.2.0"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "marshmallow-code"; repo = "marshmallow-oneofschema"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Hk36wxZV1hVqIbqDOkEDlqABRKE6s/NyA/yBEXzj/yM="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ marshmallow ]; + dependencies = [ marshmallow ]; pythonImportsCheck = [ "marshmallow_oneofschema" ]; meta = { @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/marshmallow-sqlalchemy/default.nix b/python/pkgs/marshmallow-sqlalchemy/default.nix index 7ffa7f94b..230fab8b6 100644 --- a/python/pkgs/marshmallow-sqlalchemy/default.nix +++ b/python/pkgs/marshmallow-sqlalchemy/default.nix @@ -8,14 +8,14 @@ sqlalchemy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "marshmallow-sqlalchemy"; version = "1.5.0"; pyproject = true; src = fetchPypi { pname = "marshmallow_sqlalchemy"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-5RGSwgR3BkWi+rDXL0T4eJJy7vdZUfhLFgjWtLC/4OY="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/marshmallow/default.nix b/python/pkgs/marshmallow/default.nix index 9901a081f..fc8b9f5f9 100644 --- a/python/pkgs/marshmallow/default.nix +++ b/python/pkgs/marshmallow/default.nix @@ -8,7 +8,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "marshmallow"; version = "4.3.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "marshmallow-code"; repo = "marshmallow"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KNxR8AiEJ9S15G5l3rB48BvLdgB5s6q6L1I83V7iMv0="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/marshmallow-code/marshmallow"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mashumaro/default.nix b/python/pkgs/mashumaro/default.nix index d704eb6b2..5d67d20bb 100644 --- a/python/pkgs/mashumaro/default.nix +++ b/python/pkgs/mashumaro/default.nix @@ -13,7 +13,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mashumaro"; version = "3.22"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Fatal1ty"; repo = "mashumaro"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/aAyylHOEjSmcjb+OKDNY0OOlR2JXepvVpVsfGbKSyw="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/Fatal1ty/mashumaro"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/mastodon-py/default.nix b/python/pkgs/mastodon-py/default.nix index 7a3e313d8..15bb5f6b5 100644 --- a/python/pkgs/mastodon-py/default.nix +++ b/python/pkgs/mastodon-py/default.nix @@ -18,7 +18,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mastodon-py"; version = "2.2.2"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "halcy"; repo = "Mastodon.py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/1oOouJjCCBCymfl9ps3eMDs099cqRY5f4j2jMKKBfE="; }; @@ -56,7 +56,7 @@ buildPythonPackage rec { pytest-vcr requests-mock ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; pythonImportsCheck = [ "mastodon" ]; @@ -65,4 +65,4 @@ buildPythonPackage rec { homepage = "https://github.com/halcy/Mastodon.py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/material-color-utilities/default.nix b/python/pkgs/material-color-utilities/default.nix index f3e7a0aa8..cd4175dcb 100644 --- a/python/pkgs/material-color-utilities/default.nix +++ b/python/pkgs/material-color-utilities/default.nix @@ -2,29 +2,32 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pillow, regex, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "material-color-utilities-python"; version = "0.1.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PG8C585wWViFRHve83z3b9NijHyV+iGY2BdMJpyVH64="; }; + build-system = [ setuptools ]; + pythonRelaxDeps = [ "Pillow" ]; - propagatedBuildInputs = [ + dependencies = [ pillow regex ]; # No tests implemented. - doCheck = false; pythonImportsCheck = [ "material_color_utilities_python" ]; @@ -33,4 +36,4 @@ buildPythonPackage rec { description = "Python port of material_color_utilities used for Material You colors"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/matplotlib-inline/default.nix b/python/pkgs/matplotlib-inline/default.nix index 1bfeb3bf5..797aa3c53 100644 --- a/python/pkgs/matplotlib-inline/default.nix +++ b/python/pkgs/matplotlib-inline/default.nix @@ -6,7 +6,7 @@ traitlets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "matplotlib-inline"; version = "0.2.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ipython"; repo = "matplotlib-inline"; - tag = version; + tag = finalAttrs.version; hash = "sha256-qExS0SsbnYgu0wFTew90z5QwPyJ+UWGVEgFURSMedSY="; }; @@ -23,11 +23,10 @@ buildPythonPackage rec { dependencies = [ traitlets ]; # wants to import ipython, which creates a circular dependency - doCheck = false; meta = { description = "Matplotlib Inline Back-end for IPython and Jupyter"; homepage = "https://github.com/ipython/matplotlib-inline"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/matplotlib-venn/default.nix b/python/pkgs/matplotlib-venn/default.nix index b2aa5eae1..89f48d18b 100644 --- a/python/pkgs/matplotlib-venn/default.nix +++ b/python/pkgs/matplotlib-venn/default.nix @@ -11,14 +11,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "matplotlib-venn"; version = "1.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bysHoD6btaYt4vMvllIWc54XUXb51lTdGeevLCLsNuM="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.mit; broken = stdenv.hostPlatform.isDarwin; # https://github.com/konstantint/matplotlib-venn/issues/87 }; -} +}) diff --git a/python/pkgs/matplotlib/default.nix b/python/pkgs/matplotlib/default.nix index c8149908f..eed5cdb5b 100644 --- a/python/pkgs/matplotlib/default.nix +++ b/python/pkgs/matplotlib/default.nix @@ -31,13 +31,13 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "3.10.9"; pname = "matplotlib"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/WZQjoxod9mOWGZUtgigRW241+ilRuseJgDv2VcwI1g="; }; @@ -95,8 +95,6 @@ buildPythonPackage rec { b_lto = false; }; - doCheck = false; - pythonImportsCheck = [ "matplotlib" ]; meta = { @@ -107,4 +105,4 @@ buildPythonPackage rec { bsd0 ]; }; -} +}) diff --git a/python/pkgs/matplotx/default.nix b/python/pkgs/matplotx/default.nix index d6c4cfe56..a45e7ec0f 100644 --- a/python/pkgs/matplotx/default.nix +++ b/python/pkgs/matplotx/default.nix @@ -12,7 +12,7 @@ scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "matplotx"; version = "0.3.10"; pyproject = true; @@ -20,11 +20,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nschloe"; repo = "matplotx"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EWEiEY23uFwd/vgWVLCH/buUmgRqz1rqqlJEdXINYMg="; }; - propagatedBuildInputs = [ + dependencies = [ setuptools matplotlib numpy @@ -47,7 +47,7 @@ buildPythonPackage rec { # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; - nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ finalAttrs.optional-dependencies.all; disabledTestPaths = [ "tests/test_spy.py" # Requires meshzoo (non-free) and pytest-codeblocks (not packaged) @@ -61,4 +61,4 @@ buildPythonPackage rec { mainProgram = "matplotx"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/matrix-client/default.nix b/python/pkgs/matrix-client/default.nix index a508e90aa..e26e9fdae 100644 --- a/python/pkgs/matrix-client/default.nix +++ b/python/pkgs/matrix-client/default.nix @@ -9,14 +9,14 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "matrix-client"; version = "0.4.0"; pyproject = true; src = fetchPypi { pname = "matrix_client"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-BnivQPLLLwkoqQikEMApdH1Ay5YaxaPxvQWqNVY8MVY="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/matrix-org/matrix-python-sdk"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/matrix-common/default.nix b/python/pkgs/matrix-common/default.nix index cffe2f7c2..bc9ecba9a 100644 --- a/python/pkgs/matrix-common/default.nix +++ b/python/pkgs/matrix-common/default.nix @@ -6,14 +6,14 @@ attrs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "matrix-common"; version = "1.3.0"; pyproject = true; src = fetchPypi { pname = "matrix_common"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-YuEhzM2fJDQXtX7DenbcRK6xmKelxnr9a4J1mS/yq9E="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/matrix-org/matrix-python-common"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/mattermostdriver/default.nix b/python/pkgs/mattermostdriver/default.nix index 4c50f84e6..efde7ad39 100644 --- a/python/pkgs/mattermostdriver/default.nix +++ b/python/pkgs/mattermostdriver/default.nix @@ -7,13 +7,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mattermostdriver"; version = "7.3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Lk17ShfTAT4nnG+ZN0bqGM1gtF2Po74k9HvC3iK5s7Q="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/Vaelor/python-mattermost-driver"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/maxcube-api/default.nix b/python/pkgs/maxcube-api/default.nix index b2a62a6b2..299d2870f 100644 --- a/python/pkgs/maxcube-api/default.nix +++ b/python/pkgs/maxcube-api/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "maxcube-api"; version = "0.4.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "hackercowboy"; - repo = "python-${pname}"; - rev = "V${version}"; + repo = "python-${finalAttrs.pname}"; + tag = "V${finalAttrs.version}"; sha256 = "10k61gfpnqljf3p3qxr97xq7j67a9cr4ivd9v72hdni0znrbx6ym"; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py --replace "license=license" "license='MIT'" ''; @@ -38,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/hackercowboy/python-maxcube-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/maxminddb/default.nix b/python/pkgs/maxminddb/default.nix index bcf48a8f9..5e108c074 100644 --- a/python/pkgs/maxminddb/default.nix +++ b/python/pkgs/maxminddb/default.nix @@ -8,13 +8,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "maxminddb"; version = "3.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-sZqTjEgVGPGaLFNP/cs7xZWC8Pu9z5+BrJrfkSoK9oY="; }; @@ -23,8 +23,6 @@ buildPythonPackage rec { setuptools-scm ]; - doCheck = false; - pythonImportsCheck = [ "maxminddb" ]; meta = { @@ -32,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/maxmind/MaxMind-DB-Reader-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/maya/default.nix b/python/pkgs/maya/default.nix index c083fbe0a..d7ccdbc13 100644 --- a/python/pkgs/maya/default.nix +++ b/python/pkgs/maya/default.nix @@ -14,7 +14,7 @@ tzlocal, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "maya"; version = "0.6.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timofurrer"; repo = "maya"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4fUyUqVQk/AcQL3xMnU1cQlF5yiD/N9NPAsUPuDTTNY="; }; @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ dateparser humanize pendulum @@ -61,4 +61,4 @@ buildPythonPackage rec { homepage = "https://github.com/timofurrer/maya"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mayim/default.nix b/python/pkgs/mayim/default.nix index bd8de7da0..c509780d9 100644 --- a/python/pkgs/mayim/default.nix +++ b/python/pkgs/mayim/default.nix @@ -16,7 +16,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mayim"; version = "1.3.2"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ahopkins"; repo = "mayim"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HEnzHpgTbEZOBzUG7DDIO9YRWIoLroLY+Spq/jkMib0="; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { pytest-cov-stub ] ++ ( - with optional-dependencies; + with finalAttrs.optional-dependencies; lib.concatLists [ postgres mysql @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://github.com/ahopkins/mayim"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mbddns/default.nix b/python/pkgs/mbddns/default.nix index 89c2fb2d3..3cba31fa9 100644 --- a/python/pkgs/mbddns/default.nix +++ b/python/pkgs/mbddns/default.nix @@ -3,24 +3,27 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mbddns"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "thinkl33t"; repo = "mb-ddns"; - rev = version; + tag = finalAttrs.version; sha256 = "13xzkprqk1v0zlzx4a0n9zzpnlb1g2h6pc62ms66fj72lsmjynj7"; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "mbddns" ]; @@ -29,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/thinkl33t/mb-ddns"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mbstrdecoder/default.nix b/python/pkgs/mbstrdecoder/default.nix index f4bff20bb..70e8cf372 100644 --- a/python/pkgs/mbstrdecoder/default.nix +++ b/python/pkgs/mbstrdecoder/default.nix @@ -8,7 +8,7 @@ faker, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mbstrdecoder"; version = "1.1.5"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thombashi"; repo = "mbstrdecoder"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RPtxoI4fFiBHBOWOdGueVjPPOAUjDThawS80SIoTQ78="; }; @@ -27,10 +27,10 @@ buildPythonPackage rec { pythonRelaxDeps = [ "chardet" ]; - propagatedBuildInputs = [ chardet ]; + dependencies = [ chardet ]; meta = { homepage = "https://github.com/thombashi/mbstrdecoder"; description = "Library for decoding multi-byte character strings"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mccabe/default.nix b/python/pkgs/mccabe/default.nix index c5f18535f..e9fa99811 100644 --- a/python/pkgs/mccabe/default.nix +++ b/python/pkgs/mccabe/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mccabe"; version = "0.7.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NI4CQMM7YLvfTlIxku+RnyjLLD19XHeU90AJKQ8jYyU="; }; + build-system = [ setuptools ]; + buildInputs = [ pytest ]; # https://github.com/PyCQA/mccabe/issues/93 - doCheck = false; meta = { description = "McCabe checker, plugin for flake8"; homepage = "https://github.com/flintwork/mccabe"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mcp/default.nix b/python/pkgs/mcp/default.nix index 49c4cecee..48d7048c6 100644 --- a/python/pkgs/mcp/default.nix +++ b/python/pkgs/mcp/default.nix @@ -35,7 +35,6 @@ buildPythonPackage (finalAttrs: { pname = "mcp"; version = "1.27.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; diff --git a/python/pkgs/mcuuid/default.nix b/python/pkgs/mcuuid/default.nix index dcd74dc61..23ac3ef0c 100644 --- a/python/pkgs/mcuuid/default.nix +++ b/python/pkgs/mcuuid/default.nix @@ -2,25 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mcuuid"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "clerie"; repo = "mcuuid"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YwM7CdZVXpUXKXUzFL3AtoDhekLDIvZ/q8taLsHihNk="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # upstream code does not provide tests - doCheck = false; pythonImportsCheck = [ "mcuuid" ]; @@ -29,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/clerie/mcuuid"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/md-toc/default.nix b/python/pkgs/md-toc/default.nix index 649bedb0f..36dcedb5c 100644 --- a/python/pkgs/md-toc/default.nix +++ b/python/pkgs/md-toc/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "md-toc"; version = "9.0.0"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frnmst"; repo = "md-toc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YVDFYxxKMKOrHyymewLTTkmBgg6YVqWou4hTKHJmbOg="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ fpyutils ]; + dependencies = [ fpyutils ]; nativeCheckInputs = [ pyfakefs @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://docs.franco.net.eu.org/md-toc/"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/md2pdf/default.nix b/python/pkgs/md2pdf/default.nix index 85820a04e..35518acb7 100644 --- a/python/pkgs/md2pdf/default.nix +++ b/python/pkgs/md2pdf/default.nix @@ -16,7 +16,7 @@ weasyprint, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "md2pdf"; version = "3.1.1"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jmaupetit"; repo = "md2pdf"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EZIiuyy2FhHgpCh95/KbYfQpxyPQfDHnB/Q5yo2xVac="; }; @@ -56,7 +56,7 @@ buildPythonPackage rec { pytest-cov-stub pytestCheckHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; preCheck = '' export PATH="$out/bin:$PATH" @@ -76,4 +76,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "md2pdf"; }; -} +}) diff --git a/python/pkgs/mdformat-admon/default.nix b/python/pkgs/mdformat-admon/default.nix index c0588d9c8..d9ccc411c 100644 --- a/python/pkgs/mdformat-admon/default.nix +++ b/python/pkgs/mdformat-admon/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mdformat-admon"; version = "2.1.1"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KyleKing"; repo = "mdformat-admon"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-y0TNyje2OXBY4oo9kBePlqSZAU36vbQQKZUPm/u6DAc="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ mdformat mdit-py-plugins ]; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/KyleKing/mdformat-admon"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mdformat-footnote/default.nix b/python/pkgs/mdformat-footnote/default.nix index 355077966..44522cf88 100644 --- a/python/pkgs/mdformat-footnote/default.nix +++ b/python/pkgs/mdformat-footnote/default.nix @@ -7,7 +7,7 @@ mdit-py-plugins, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mdformat-footnote"; version = "0.1.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; repo = "mdformat-footnote"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KPxPDKG3aC5zLdrJRL3kzFMpLJ0Yk5UZXW4CamC1/NQ="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/mdformat-footnote"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mdformat-toc/default.nix b/python/pkgs/mdformat-toc/default.nix index 1f9091c61..735595d28 100644 --- a/python/pkgs/mdformat-toc/default.nix +++ b/python/pkgs/mdformat-toc/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mdformat-toc"; version = "0.5.0"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hukkin"; repo = "mdformat-toc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Rj1lp5Ub+UriOuE896tywN4myovna2RLYO3LRa96FCM="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ mdformat ]; + dependencies = [ mdformat ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/hukkin/mdformat-toc"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mdformat-wikilink/default.nix b/python/pkgs/mdformat-wikilink/default.nix index 032218b72..ab95f8fc5 100644 --- a/python/pkgs/mdformat-wikilink/default.nix +++ b/python/pkgs/mdformat-wikilink/default.nix @@ -9,7 +9,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mdformat-wikilink"; version = "0.3.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tmr232"; repo = "mdformat-wikilink"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tYUF5gNmXjzlf0jQg0tL2ayFGCSFFeYJHkWA6cYLpvI="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/tmr232/mdformat-wikilink"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mdtraj/default.nix b/python/pkgs/mdtraj/default.nix index 4a448fcd8..261d194b0 100644 --- a/python/pkgs/mdtraj/default.nix +++ b/python/pkgs/mdtraj/default.nix @@ -17,7 +17,7 @@ scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mdtraj"; version = "1.11.1.post2"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mdtraj"; repo = "mdtraj"; - tag = version; + tag = finalAttrs.version; hash = "sha256-K08XeutguD2JkJJvcyv4X+Y3Bl20uBc1Ux55zQALtdk="; }; @@ -69,4 +69,4 @@ buildPythonPackage rec { homepage = "https://github.com/mdtraj/mdtraj"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/mdutils/default.nix b/python/pkgs/mdutils/default.nix index a455e6b10..1c3bf34a0 100644 --- a/python/pkgs/mdutils/default.nix +++ b/python/pkgs/mdutils/default.nix @@ -5,7 +5,7 @@ unittestCheckHook, setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mdutils"; version = "1.8.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "didix21"; repo = "mdutils"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qUCiiFzbOccS7wy0LqgyZH04KlwG/FzE3a+R3z7tPF8="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/didix21/mdutils"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mdx-truly-sane-lists/default.nix b/python/pkgs/mdx-truly-sane-lists/default.nix index d42524976..c69760625 100644 --- a/python/pkgs/mdx-truly-sane-lists/default.nix +++ b/python/pkgs/mdx-truly-sane-lists/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mdx-truly-sane-lists"; version = "1.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "radude"; repo = "mdx_truly_sane_lists"; - tag = version; + tag = finalAttrs.version; hash = "sha256-hPnqF1UA4peW8hzeFiMlsBPfodC1qJXETGoq2yUm7d4="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/radude/mdx_truly_sane_lists"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mdx-wikilink-plus/default.nix b/python/pkgs/mdx-wikilink-plus/default.nix index 4d9f32252..5a361ac90 100644 --- a/python/pkgs/mdx-wikilink-plus/default.nix +++ b/python/pkgs/mdx-wikilink-plus/default.nix @@ -31,7 +31,6 @@ buildPythonPackage (finalAttrs: { ]; # No tests available. - doCheck = false; meta = { description = "A wikilink extension for Python Markdown"; diff --git a/python/pkgs/mean-average-precision/default.nix b/python/pkgs/mean-average-precision/default.nix index 3d66fa1a9..e53a33d42 100644 --- a/python/pkgs/mean-average-precision/default.nix +++ b/python/pkgs/mean-average-precision/default.nix @@ -7,7 +7,7 @@ pandas, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mean-average-precision"; version = "2024.01.05.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bes-dev"; repo = "mean_average_precision"; - tag = version; + tag = finalAttrs.version; hash = "sha256-qo160L+oJsHERVOV0qdiRIZPMjvSlUmMTrAzThfrQSs="; }; @@ -33,11 +33,10 @@ buildPythonPackage rec { ]; # No tests - doCheck = false; meta = { description = "Mean Average Precision for Object Detection"; homepage = "https://github.com/bes-dev/mean_average_precision"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/measurement/default.nix b/python/pkgs/measurement/default.nix index 57094a35f..b96b1509b 100644 --- a/python/pkgs/measurement/default.nix +++ b/python/pkgs/measurement/default.nix @@ -11,7 +11,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "measurement"; version = "4.0a8"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "coddingtonbear"; repo = "python-measurement"; - tag = version; + tag = finalAttrs.version; hash = "sha256-QxXxx9Jbx7ykQFaw/3S6ANPUmw3mhvSa4np6crsfVtE="; }; @@ -31,7 +31,7 @@ buildPythonPackage rec { sphinx ]; - propagatedBuildInputs = [ sympy ]; + dependencies = [ sympy ]; nativeCheckInputs = [ pytestCheckHook @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/coddingtonbear/python-measurement"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/meater-python/default.nix b/python/pkgs/meater-python/default.nix index 2b724e2ba..dd6663f4d 100644 --- a/python/pkgs/meater-python/default.nix +++ b/python/pkgs/meater-python/default.nix @@ -3,22 +3,25 @@ aiohttp, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "meater-python"; version = "0.0.8"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-86XJmKOc2MCyU9v0UAZsPCUL/kAXywOlQOIHaykNF1o="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "meater" ]; @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/Sotolotl/meater-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/mechanicalsoup/default.nix b/python/pkgs/mechanicalsoup/default.nix index 5a36e1291..c351dab0f 100644 --- a/python/pkgs/mechanicalsoup/default.nix +++ b/python/pkgs/mechanicalsoup/default.nix @@ -13,7 +13,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mechanicalsoup"; version = "1.4.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MechanicalSoup"; repo = "MechanicalSoup"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fu3DGTsLrw+MHZCFF4WHMpyjqkexH/c8j9ko9ZAeAwU="; }; @@ -63,4 +63,4 @@ buildPythonPackage rec { homepage = "https://github.com/hickford/MechanicalSoup"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mechanize/default.nix b/python/pkgs/mechanize/default.nix index 8a9d95c8c..def61cd19 100644 --- a/python/pkgs/mechanize/default.nix +++ b/python/pkgs/mechanize/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mechanize"; version = "0.4.10"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-HeqUf5vn6gq2EPe7xKTja0XWv9/O6imtPTiaiKGVfd8="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-mechanize/mechanize"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/medallion/default.nix b/python/pkgs/medallion/default.nix index f9d3827e9..61542b583 100644 --- a/python/pkgs/medallion/default.nix +++ b/python/pkgs/medallion/default.nix @@ -11,7 +11,7 @@ pymongo, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "medallion"; version = "3.0.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oasis-open"; repo = "cti-taxii-server"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+fWifWi/XR6MSOLhWXn2CFpItVdkOpzQItlrZkjapAk="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://medallion.readthedocs.io/en/latest/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mediafile/default.nix b/python/pkgs/mediafile/default.nix index 6ed483cad..0c77dfe3f 100644 --- a/python/pkgs/mediafile/default.nix +++ b/python/pkgs/mediafile/default.nix @@ -7,13 +7,13 @@ mutagen, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mediafile"; version = "0.17.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gMkAP9JdcJanI347WOb/AY72f5w5kA/q+sq6wXQsfTo="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/beetbox/mediafile"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mediafire-dl/default.nix b/python/pkgs/mediafire-dl/default.nix index 69b3d9292..121a992bf 100644 --- a/python/pkgs/mediafire-dl/default.nix +++ b/python/pkgs/mediafire-dl/default.nix @@ -1,6 +1,8 @@ { lib, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, requests, six, @@ -10,7 +12,7 @@ buildPythonPackage { pname = "mediafire-dl"; version = "unstable-2023-09-07"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Juvenal-Yescas"; @@ -19,7 +21,9 @@ buildPythonPackage { hash = "sha256-9qACTNMkO/CH/qB6WiggIKwSiFIccgU7CH0UeGUaFb4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests six tqdm diff --git a/python/pkgs/meilisearch/default.nix b/python/pkgs/meilisearch/default.nix index c34fb72de..7befba29d 100644 --- a/python/pkgs/meilisearch/default.nix +++ b/python/pkgs/meilisearch/default.nix @@ -30,7 +30,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "meilisearch" ]; # Tests spin up a local server and are not mocking the requests - doCheck = false; meta = { description = "Client for the Meilisearch API"; diff --git a/python/pkgs/meld3/default.nix b/python/pkgs/meld3/default.nix index 2e49f1fe0..6f8790e66 100644 --- a/python/pkgs/meld3/default.nix +++ b/python/pkgs/meld3/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "meld3"; version = "2.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PqJmmU8aqDUHZ5pntJO4UsIyp5BeKUQKa4aFWMrV53U="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "HTML/XML templating engine"; license = lib.licenses.free; }; -} +}) diff --git a/python/pkgs/memestra/default.nix b/python/pkgs/memestra/default.nix index 7f2ee951b..82af4f6db 100644 --- a/python/pkgs/memestra/default.nix +++ b/python/pkgs/memestra/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, beniget, frilouz, gast, @@ -10,17 +12,19 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "memestra"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6shwf9BoDfZMy0itP8esNP4ov6fw6LJpO3Y5ZahwDZw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ gast beniget frilouz @@ -30,7 +34,6 @@ buildPythonPackage rec { ]; # Tests are not detected and so the checkPhase fails - doCheck = false; pythonImportsCheck = [ "memestra" ]; @@ -39,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/QuantStack/memestra"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/memory-allocator/default.nix b/python/pkgs/memory-allocator/default.nix index da97fc377..bf4620a18 100644 --- a/python/pkgs/memory-allocator/default.nix +++ b/python/pkgs/memory-allocator/default.nix @@ -7,13 +7,13 @@ cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "memory-allocator"; version = "0.2.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "memory_allocator"; hash = "sha256-Z108kQGduYyXRB3nPVxkiCHlroE/P1TNCYY9R0tI/iY="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { cython ]; - propagatedBuildInputs = [ cython ]; + dependencies = [ cython ]; pythonImportsCheck = [ "memory_allocator" ]; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/sagemath/memory_allocator/"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/memory-profiler/default.nix b/python/pkgs/memory-profiler/default.nix index b2b1071f8..2e6ba858b 100644 --- a/python/pkgs/memory-profiler/default.nix +++ b/python/pkgs/memory-profiler/default.nix @@ -6,14 +6,14 @@ psutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "memory-profiler"; version = "0.61.0"; pyproject = true; src = fetchPypi { pname = "memory_profiler"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Tltz14ZKHRKS+3agPoKj5475NNBoKKaY2dradtogZ7A="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/memory_profiler/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/memory-tempfile/default.nix b/python/pkgs/memory-tempfile/default.nix index ddcb9fa96..7bfe73f42 100644 --- a/python/pkgs/memory-tempfile/default.nix +++ b/python/pkgs/memory-tempfile/default.nix @@ -6,7 +6,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "memory-tempfile"; version = "2.2.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mbello"; repo = "memory-tempfile"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4fz2CLkZdy2e1GwGw/afG54LkUVJ4cza70jcbX3rVlQ="; }; @@ -30,8 +30,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - doCheck = false; # constrained selection of memory backed filesystems due to build sandbox - pythonImportsCheck = [ "memory_tempfile" ]; meta = { @@ -39,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/mbello/memory-tempfile"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/meraki/default.nix b/python/pkgs/meraki/default.nix index 1aa3dba03..14d535f32 100644 --- a/python/pkgs/meraki/default.nix +++ b/python/pkgs/meraki/default.nix @@ -6,7 +6,7 @@ httpx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "meraki"; version = "4.5.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "meraki"; repo = "dashboard-api-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-SYILd5epeB/V/fa+yxZvT49eHapZnqxcTW1s8gH3fAY="; }; @@ -25,7 +25,6 @@ buildPythonPackage rec { ]; # All tests require an API key - doCheck = false; pythonImportsCheck = [ "meraki" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/meraki/dashboard-api-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mercadopago/default.nix b/python/pkgs/mercadopago/default.nix index fb03cd1d2..8eebab617 100644 --- a/python/pkgs/mercadopago/default.nix +++ b/python/pkgs/mercadopago/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mercadopago"; version = "3.6.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mercadopago"; repo = "sdk-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-hi/DbIJx1eRYUHeqe6J4wQKnFmmGKwU0rXDMTlezfIM="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # require internet - doCheck = false; pythonImportsCheck = [ "mercadopago" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://www.mercadopago.com"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mercantile/default.nix b/python/pkgs/mercantile/default.nix index c2fd35b74..e7423cd4b 100644 --- a/python/pkgs/mercantile/default.nix +++ b/python/pkgs/mercantile/default.nix @@ -13,7 +13,7 @@ hypothesis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mercantile"; version = "1.2.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mapbox"; repo = "mercantile"; - tag = version; + tag = finalAttrs.version; hash = "sha256-DiDXO2XnD3We6NhP81z7aIHzHrHDi/nkqy98OT9986w="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/mapbox/mercantile"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/merge3/default.nix b/python/pkgs/merge3/default.nix index f8635161b..c3f82aa32 100644 --- a/python/pkgs/merge3/default.nix +++ b/python/pkgs/merge3/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "merge3"; version = "0.0.16"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CFLeQ4HLRr5e9O1J46wgxaSgzUao/0u7hwvCeqtUMwY="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Python implementation of 3-way merge"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/mergedb/default.nix b/python/pkgs/mergedb/default.nix index 988743f08..70e88da01 100644 --- a/python/pkgs/mergedb/default.nix +++ b/python/pkgs/mergedb/default.nix @@ -10,19 +10,21 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mergedb"; version = "0.1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "2034c18dca23456c5b166b63d94300bcd8ec9f386e6cd639c2f66e141c0313f9"; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ pyyaml colorama jinja2 @@ -39,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/graysonhead/mergedb"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/mergedeep/default.nix b/python/pkgs/mergedeep/default.nix index dfc650f28..a740ac22f 100644 --- a/python/pkgs/mergedeep/default.nix +++ b/python/pkgs/mergedeep/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mergedeep"; version = "1.3.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "clarketm"; repo = "mergedeep"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yRB0GqoIFu6BHuijAaR0J+qsaUPaEb39+12PMX/bW9c="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { description = "Deep merge function for python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mergedict/default.nix b/python/pkgs/mergedict/default.nix index 22c007cb9..ee6ee9374 100644 --- a/python/pkgs/mergedict/default.nix +++ b/python/pkgs/mergedict/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mergedict"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4ZkrNqVCKQFPvLx6nIwo0fSuEx6h2NNFyTlz+fDcb9w="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { description = "Python dict with a merge() method"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/merkletools/default.nix b/python/pkgs/merkletools/default.nix index 7683bbeea..31ef89b34 100644 --- a/python/pkgs/merkletools/default.nix +++ b/python/pkgs/merkletools/default.nix @@ -2,28 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "merkletools"; version = "1.0.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Tierion"; repo = "pymerkletools"; - tag = version; + tag = finalAttrs.version; hash = "sha256-pd7Wxi7Sk95RcrFOTOtl725nIXidva3ftdKSGxHYPTA="; }; + build-system = [ setuptools ]; + postPatch = '' # pysha3 is deprecated and not needed for Python > 3.6 substituteInPlace setup.py \ --replace "install_requires=install_requires" "install_requires=[]," ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "merkletools" ]; @@ -32,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Tierion/pymerkletools"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/meross-iot/default.nix b/python/pkgs/meross-iot/default.nix index 04df48337..d5dd4b3f2 100644 --- a/python/pkgs/meross-iot/default.nix +++ b/python/pkgs/meross-iot/default.nix @@ -32,7 +32,6 @@ buildPythonPackage (finalAttrs: { ++ aiohttp.optional-dependencies.speedups; # Test require network access - doCheck = false; pythonImportsCheck = [ "meross_iot" ]; diff --git a/python/pkgs/meshcat/default.nix b/python/pkgs/meshcat/default.nix index 23fd91691..865b1122f 100644 --- a/python/pkgs/meshcat/default.nix +++ b/python/pkgs/meshcat/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, ipython, u-msgpack-python, numpy, @@ -14,18 +16,20 @@ buildPythonPackage (finalAttrs: { pname = "meshcat"; version = "0.3.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-LP4XzeT+hdByo94Bip2r9WJvgMJV//LOY7JqSNJIStk="; }; + build-system = [ setuptools ]; + postPatch = '' sed -i '/PYTHONPATH/d' src/meshcat/servers/zmqserver.py ''; - propagatedBuildInputs = [ + dependencies = [ ipython u-msgpack-python numpy @@ -38,7 +42,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "meshcat" ]; # requires a running MeshCat viewer - doCheck = false; meta = { homepage = "https://github.com/rdeits/meshcat-python"; diff --git a/python/pkgs/meshio/default.nix b/python/pkgs/meshio/default.nix index e081d2ca2..ef2639f08 100644 --- a/python/pkgs/meshio/default.nix +++ b/python/pkgs/meshio/default.nix @@ -17,7 +17,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "meshio"; version = "5.3.5"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nschloe"; repo = "meshio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2j+5BYftCiy+g33UbsgCMWBRggGBJBx5VoEdSqQ/mV0="; }; @@ -108,4 +108,4 @@ buildPythonPackage rec { mainProgram = "meshio"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/meshlabxml/default.nix b/python/pkgs/meshlabxml/default.nix index 5d58cf4c9..0edd60701 100644 --- a/python/pkgs/meshlabxml/default.nix +++ b/python/pkgs/meshlabxml/default.nix @@ -1,23 +1,25 @@ { buildPythonPackage, fetchPypi, + # build-system + setuptools, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "meshlabxml"; version = "2018.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "MeshLabXML"; - inherit version; + inherit (finalAttrs) version; sha256 = "1villmg46hqby5jjkkpxr5bxydr72y5b3cbfngwpyxxdljn091w8"; }; - propagatedBuildInputs = [ ]; + build-system = [ setuptools ]; - doCheck = false; # Upstream not currently have any tests. + dependencies = [ ]; pythonImportsCheck = [ "meshlabxml" ]; @@ -26,4 +28,4 @@ buildPythonPackage rec { description = "Create and run MeshLab XML scripts with Python"; license = lib.licenses.lgpl21; }; -} +}) diff --git a/python/pkgs/meson-python/default.nix b/python/pkgs/meson-python/default.nix index a4c60e48f..fc5ca01a9 100644 --- a/python/pkgs/meson-python/default.nix +++ b/python/pkgs/meson-python/default.nix @@ -11,13 +11,13 @@ pyproject-metadata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "meson-python"; version = "0.20.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "meson_python"; hash = "sha256-bZcmrmzTfiLyEMdLNkswGApowgRC6X/wnzxWakFK9zg="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/mesonbuild/meson-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/messagebird/default.nix b/python/pkgs/messagebird/default.nix index f23c51ee4..6dfe7d315 100644 --- a/python/pkgs/messagebird/default.nix +++ b/python/pkgs/messagebird/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, requests, pyjwt, mock, @@ -9,19 +11,21 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "messagebird"; version = "2.2.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "messagebird"; repo = "python-rest-api"; - rev = version; + tag = finalAttrs.version; hash = "sha256-OiLhnmZ725VbyoOHvSf4nKQRA7JsxqcOv0VKBL6rUtU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyjwt python-dateutil requests @@ -44,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/messagebird/python-rest-api"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/metaflow/default.nix b/python/pkgs/metaflow/default.nix index 57a0e7d8d..a55ac0220 100644 --- a/python/pkgs/metaflow/default.nix +++ b/python/pkgs/metaflow/default.nix @@ -8,7 +8,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "metaflow"; version = "2.19.39"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Netflix"; repo = "metaflow"; - tag = version; + tag = finalAttrs.version; hash = "sha256-1YpOVPah0dYDeA3l0xCEF0lnx0IajobxRs3ReonOH2M="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://metaflow.org/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/metakernel/default.nix b/python/pkgs/metakernel/default.nix index 104c2fd5a..a47de3e96 100644 --- a/python/pkgs/metakernel/default.nix +++ b/python/pkgs/metakernel/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests hang, so disable - doCheck = false; pythonImportsCheck = [ "metakernel" ]; diff --git a/python/pkgs/metar/default.nix b/python/pkgs/metar/default.nix index 32015adf6..aa645b97c 100644 --- a/python/pkgs/metar/default.nix +++ b/python/pkgs/metar/default.nix @@ -7,17 +7,17 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "metar"; version = "2.0.1"; pyproject = true; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; src = fetchFromGitHub { owner = "python-metar"; repo = "python-metar"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MRcGUFcp3oL9rrGl3xGGttle5oXkJqxxZvkWVe0uWv8="; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "Python parser for coded METAR weather reports"; homepage = "https://github.com/python-metar/python-metar"; - changelog = "https://github.com/python-metar/python-metar/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/python-metar/python-metar/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ bsd1 ]; }; -} +}) diff --git a/python/pkgs/meteoalertapi/default.nix b/python/pkgs/meteoalertapi/default.nix index 7be0b179d..967c25c98 100644 --- a/python/pkgs/meteoalertapi/default.nix +++ b/python/pkgs/meteoalertapi/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, requests, xmltodict, }: @@ -9,7 +11,7 @@ buildPythonPackage (finalAttrs: { pname = "meteoalertapi"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "rolfberkenbosch"; @@ -18,13 +20,14 @@ buildPythonPackage (finalAttrs: { hash = "sha256-Imb4DVcNB3QiVSCLCI+eKpfl73aMn4NIItQVf7p0H+E="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests xmltodict ]; # Tests require network access - doCheck = false; pythonImportsCheck = [ "meteoalertapi" ]; diff --git a/python/pkgs/meteocalc/default.nix b/python/pkgs/meteocalc/default.nix index d3ae7503e..f77bd9d34 100644 --- a/python/pkgs/meteocalc/default.nix +++ b/python/pkgs/meteocalc/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "meteocalc"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "malexer"; repo = "meteocalc"; - rev = version; + tag = finalAttrs.version; hash = "sha256-WuIW6hROQkjMfbCLUouECIrp4s6oCd2/N79hsrTbVTk="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "meteocalc" ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/malexer/meteocalc"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/meteoswiss-async/default.nix b/python/pkgs/meteoswiss-async/default.nix index fd2c8cc74..21ce53abe 100644 --- a/python/pkgs/meteoswiss-async/default.nix +++ b/python/pkgs/meteoswiss-async/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "meteoswiss-async"; version = "0.1.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "albertomontesg"; repo = "meteoswiss-async"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xFvfyLZvBfnbzShKN+94piNUVjV1cfi4jWpc/Xw6XG4="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/albertomontesg/meteoswiss-async"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/methodtools/default.nix b/python/pkgs/methodtools/default.nix index f872f4f32..4ff948fc0 100644 --- a/python/pkgs/methodtools/default.nix +++ b/python/pkgs/methodtools/default.nix @@ -6,7 +6,7 @@ wirerope, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "methodtools"; version = "0.4.7"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "youknowone"; repo = "methodtools"; - rev = version; + tag = finalAttrs.version; hash = "sha256-Y5VdYVSb3A+32waUUoIDDGW+AhRapN71pebTTlJC0es="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/youknowone/methodtools"; license = lib.licenses.bsd2WithViews; }; -} +}) diff --git a/python/pkgs/mf2py/default.nix b/python/pkgs/mf2py/default.nix index 80c9fc696..8e50fe624 100644 --- a/python/pkgs/mf2py/default.nix +++ b/python/pkgs/mf2py/default.nix @@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 html5lib requests diff --git a/python/pkgs/mficlient/default.nix b/python/pkgs/mficlient/default.nix index 4ab5cfe98..026cc784d 100644 --- a/python/pkgs/mficlient/default.nix +++ b/python/pkgs/mficlient/default.nix @@ -9,7 +9,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mficlient"; version = "0.5.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "uilibs"; repo = "mficlient"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gr9E+3qYD3usK2AAk+autfFQVPL3RDtjG7vvsmZui80="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "mfi"; }; -} +}) diff --git a/python/pkgs/micawber/default.nix b/python/pkgs/micawber/default.nix index 1db838cae..3b86d4b03 100644 --- a/python/pkgs/micawber/default.nix +++ b/python/pkgs/micawber/default.nix @@ -6,13 +6,13 @@ beautifulsoup4, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "micawber"; version = "0.8.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3u2qkRfFbH2AAwrFVm/cW1Kz62qfryuqaUCIltkJDSg="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://micawber.readthedocs.io/en/latest/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/micloud/default.nix b/python/pkgs/micloud/default.nix index 9e15f4191..5901b12d1 100644 --- a/python/pkgs/micloud/default.nix +++ b/python/pkgs/micloud/default.nix @@ -2,25 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, click, pycryptodome, requests, tzlocal, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "micloud"; version = "0.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Squachen"; repo = "micloud"; - rev = "v_${version}"; + tag = "v_${finalAttrs.version}"; hash = "sha256-IsNXFs1N+rKwqve2Pjp+wRTZCxHF4acEo6KyhsSKuqI="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ click pycryptodome requests @@ -28,7 +32,6 @@ buildPythonPackage rec { ]; # tests require credentials - doCheck = false; pythonImportsCheck = [ "micloud" ]; @@ -38,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/Squachen/micloud"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/microbeespy/default.nix b/python/pkgs/microbeespy/default.nix index 81df61b56..fe25f4394 100644 --- a/python/pkgs/microbeespy/default.nix +++ b/python/pkgs/microbeespy/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "microbeespy"; version = "0.3.5"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microBeesTech"; repo = "pythonSDK"; - tag = version; + tag = finalAttrs.version; hash = "sha256-h3IbWdZ/iHsNlAr/DfASj4dKNkQ4t1mUUeUIs00L8iU="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # Package doesn't include tests - doCheck = false; pythonImportsCheck = [ "microBeesPy" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/microBeesTech/pythonSDK"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/microdata/default.nix b/python/pkgs/microdata/default.nix index 1e4b9392b..ce8a01dd0 100644 --- a/python/pkgs/microdata/default.nix +++ b/python/pkgs/microdata/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, html5lib, unittestCheckHook, }: @@ -9,16 +11,18 @@ buildPythonPackage (finalAttrs: { pname = "microdata"; version = "0.8.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "edsu"; repo = "microdata"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BAygCLBLxZ033ZWRFSR52dSM2nPY8jXplDXQ8WW3KPo="; }; - propagatedBuildInputs = [ html5lib ]; + build-system = [ setuptools ]; + + dependencies = [ html5lib ]; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/python/pkgs/microsoft-kiota-serialization-multipart/default.nix b/python/pkgs/microsoft-kiota-serialization-multipart/default.nix index e22b4143d..949627590 100644 --- a/python/pkgs/microsoft-kiota-serialization-multipart/default.nix +++ b/python/pkgs/microsoft-kiota-serialization-multipart/default.nix @@ -10,7 +10,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "microsoft-kiota-serialization-multipart"; version = "1.12.1"; pyproject = true; @@ -18,11 +18,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; - tag = "microsoft-kiota-serialization-multipart-v${version}"; + tag = "microsoft-kiota-serialization-multipart-v${finalAttrs.version}"; hash = "sha256-J33Bxo9TwHRCPzDw/Jduo9HHxoofB5h/HsNX6R9FfFI="; }; - sourceRoot = "${src.name}/packages/serialization/multipart/"; + sourceRoot = "${finalAttrs.src.name}/packages/serialization/multipart/"; build-system = [ flit-core ]; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/serialization/multipart"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/microsoft-kiota-serialization-text/default.nix b/python/pkgs/microsoft-kiota-serialization-text/default.nix index 1e882b26f..422905afa 100644 --- a/python/pkgs/microsoft-kiota-serialization-text/default.nix +++ b/python/pkgs/microsoft-kiota-serialization-text/default.nix @@ -10,7 +10,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "microsoft-kiota-serialization-text"; version = "1.12.1"; pyproject = true; @@ -18,11 +18,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; - tag = "microsoft-kiota-serialization-text-v${version}"; + tag = "microsoft-kiota-serialization-text-v${finalAttrs.version}"; hash = "sha256-J33Bxo9TwHRCPzDw/Jduo9HHxoofB5h/HsNX6R9FfFI="; }; - sourceRoot = "${src.name}/packages/serialization/text/"; + sourceRoot = "${finalAttrs.src.name}/packages/serialization/text/"; build-system = [ flit-core ]; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/serialization/text"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/microsoft-security-utilities-secret-masker/default.nix b/python/pkgs/microsoft-security-utilities-secret-masker/default.nix index 807fe2438..e5558e858 100644 --- a/python/pkgs/microsoft-security-utilities-secret-masker/default.nix +++ b/python/pkgs/microsoft-security-utilities-secret-masker/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "microsoft-security-utilities-secret-masker"; version = "1.0.0b4"; pyproject = true; src = fetchPypi { pname = "microsoft_security_utilities_secret_masker"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-owvTYawYyLUvaEQHa8JkZTNZSeqcegBNlfUZbsb97z4="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/microsoft-security-utilities-secret-masker/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/midea-beautiful-air/default.nix b/python/pkgs/midea-beautiful-air/default.nix index 44ef91f16..ad2188d59 100644 --- a/python/pkgs/midea-beautiful-air/default.nix +++ b/python/pkgs/midea-beautiful-air/default.nix @@ -10,7 +10,7 @@ requests-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "midea-beautiful-air"; version = "0.10.7"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nbogojevic"; repo = "midea-beautiful-air"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9smuLzgJPO/GoYP8NqfY9Ky9q2E3/cjEQLtWHIx7BxI="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { mainProgram = "midea-beautiful-air-cli"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/midea-local/default.nix b/python/pkgs/midea-local/default.nix index aed9ae9bd..497cc6300 100644 --- a/python/pkgs/midea-local/default.nix +++ b/python/pkgs/midea-local/default.nix @@ -15,7 +15,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "midea-local"; version = "11.0.1"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "midea-lan"; repo = "midea-local"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9Yx3i/zZvVqZrlsbLxkWWFAITFnwOAaaiBoFfjaYbKw="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/midea-lan/midea-local"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/midiutil/default.nix b/python/pkgs/midiutil/default.nix index 559b86efe..a5f7c55a3 100644 --- a/python/pkgs/midiutil/default.nix +++ b/python/pkgs/midiutil/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "midiutil"; version = "1.2.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "MIDIUtil"; - inherit version; + inherit (finalAttrs) version; sha256 = "02m9sqv36zrzgz5zg2w9qmz8snzlm27yg3ways2hgipgs4xriykr"; }; + build-system = [ setuptools ]; + meta = { homepage = "https://github.com/MarkCWirt/MIDIUtil"; description = "Pure python library for creating multi-track MIDI files"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/migen/default.nix b/python/pkgs/migen/default.nix index 6e7f8f286..024749f13 100644 --- a/python/pkgs/migen/default.nix +++ b/python/pkgs/migen/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ colorama ]; + dependencies = [ colorama ]; pythonImportsCheck = [ "migen" ]; diff --git a/python/pkgs/mike/default.nix b/python/pkgs/mike/default.nix index 6ca36b9d7..2ac731838 100644 --- a/python/pkgs/mike/default.nix +++ b/python/pkgs/mike/default.nix @@ -16,7 +16,7 @@ fetchpatch, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mike"; version = "2.2.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jimporter"; repo = "mike"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+QFtInHma433XI4EcMTpFKZVdk+x2JREo73qM35G0pQ="; }; @@ -59,4 +59,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "mike"; }; -} +}) diff --git a/python/pkgs/milc/default.nix b/python/pkgs/milc/default.nix index 6fc012900..25203dc09 100644 --- a/python/pkgs/milc/default.nix +++ b/python/pkgs/milc/default.nix @@ -14,7 +14,7 @@ semver, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "milc"; version = "1.10.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "clueboard"; repo = "milc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-zy62VjtoNhl5hXywJO1p9rO19YAJeKOg+NkfCfgn1Xs="; }; @@ -66,4 +66,4 @@ buildPythonPackage rec { homepage = "https://milc.clueboard.co"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/milksnake/default.nix b/python/pkgs/milksnake/default.nix index 0f1215105..993904412 100644 --- a/python/pkgs/milksnake/default.nix +++ b/python/pkgs/milksnake/default.nix @@ -6,13 +6,13 @@ cffi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "milksnake"; version = "0.1.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AZj4kytOE2wpwNDUkP8brAP4LDp7Lub2ZuNoO2QxT9k="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "Python library that extends setuptools for binary extensions"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/mill-local/default.nix b/python/pkgs/mill-local/default.nix index 8a1449c3d..ea883d3b6 100644 --- a/python/pkgs/mill-local/default.nix +++ b/python/pkgs/mill-local/default.nix @@ -7,7 +7,7 @@ setuptools_80, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mill-local"; version = "0.5.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyMillLocal"; - tag = version; + tag = finalAttrs.version; hash = "sha256-t6nZ6KXX5GFIcdNIXyFxYtSjOuuUJmCekaBITNgcIkU="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "mill_local" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/Danielhiversen/pyMillLocal"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/millheater/default.nix b/python/pkgs/millheater/default.nix index 57bbae0e1..364f34073 100644 --- a/python/pkgs/millheater/default.nix +++ b/python/pkgs/millheater/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "millheater"; version = "012.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pymill"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tR6MZIgCazGcXRIaSXyDYIEp+kD6xyrpOXORbi8LV7E="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "mill" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/Danielhiversen/pymill"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/miltertest/default.nix b/python/pkgs/miltertest/default.nix index 4b3ea20cb..fa025e1d7 100644 --- a/python/pkgs/miltertest/default.nix +++ b/python/pkgs/miltertest/default.nix @@ -6,16 +6,15 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "miltertest"; version = "1.0.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "flowerysong"; repo = "miltertest"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8KpuIR+UxRcJbb2pwKDOkSmyXovlyOa4DpeUDn1oK0Y="; }; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/flowerysong/miltertest"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/minari/default.nix b/python/pkgs/minari/default.nix index 55f66ede6..5da24720f 100644 --- a/python/pkgs/minari/default.nix +++ b/python/pkgs/minari/default.nix @@ -29,7 +29,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "minari"; version = "0.5.3"; pyproject = true; @@ -37,7 +37,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Minari"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LvJwp2dZdGPazJPWQtrk+v7zaPjOlomBu5j9avVdCcA="; }; @@ -80,7 +80,7 @@ buildPythonPackage rec { jaxlib pytestCheckHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; disabledTests = [ # Require internet access @@ -107,4 +107,4 @@ buildPythonPackage rec { ]; mainProgram = "minari"; }; -} +}) diff --git a/python/pkgs/minexr/default.nix b/python/pkgs/minexr/default.nix index c39f5f10b..aa9ae0eaf 100644 --- a/python/pkgs/minexr/default.nix +++ b/python/pkgs/minexr/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, numpy, pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "minexr"; version = "1.0.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "cheind"; repo = "py-minexr"; - tag = version; + tag = finalAttrs.version; hash = "sha256-p42rlhaHq0A9+zk6c0evRDjNR1H/ruWJqPF5+nCTR8o="; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; pythonImportsCheck = [ "minexr" ]; nativeCheckInputs = [ @@ -32,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/cheind/py-minexr"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/miniaudio/default.nix b/python/pkgs/miniaudio/default.nix index 635343351..44f31718d 100644 --- a/python/pkgs/miniaudio/default.nix +++ b/python/pkgs/miniaudio/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "miniaudio"; version = "1.71"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "irmen"; repo = "pyminiaudio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fBdRricV0eqQknOQInB3cj8reZGKS9hrJTMF1ILASpY="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/irmen/pyminiaudio"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/minidb/default.nix b/python/pkgs/minidb/default.nix index dafb1dfb4..2fd37a5a8 100644 --- a/python/pkgs/minidb/default.nix +++ b/python/pkgs/minidb/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "minidb"; version = "2.0.8"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thp"; repo = "minidb"; - tag = version; + tag = finalAttrs.version; hash = "sha256-e7wVR+xr+5phNoRnGIxnmrjB1QU9JmyfQiu88PYapA8="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://thp.io/2010/minidb/"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/minidump/default.nix b/python/pkgs/minidump/default.nix index bbe68cb28..49a45b1bb 100644 --- a/python/pkgs/minidump/default.nix +++ b/python/pkgs/minidump/default.nix @@ -5,28 +5,27 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "minidump"; version = "0.0.24"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-964JuUTzsXzPXOzGb5/1p6RbBTR0oTrrAS9MkgRHBDc="; }; build-system = [ setuptools ]; # Upstream doesn't have tests - doCheck = false; pythonImportsCheck = [ "minidump" ]; meta = { description = "Python library to parse and read Microsoft minidump file format"; homepage = "https://github.com/skelsec/minidump"; - changelog = "https://github.com/skelsec/minidump/releases/tag/${version}"; + changelog = "https://github.com/skelsec/minidump/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "minidump"; }; -} +}) diff --git a/python/pkgs/miniflux/default.nix b/python/pkgs/miniflux/default.nix index 05bc3eeeb..ab2d2dab5 100644 --- a/python/pkgs/miniflux/default.nix +++ b/python/pkgs/miniflux/default.nix @@ -6,7 +6,7 @@ requests, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "miniflux"; version = "1.1.6"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miniflux"; repo = "python-client"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xzQozsf6FURdf5HI6U8/26jbFmVYWDqXFt77iZ7pqP8="; }; build-system = [ setuptools ]; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/miniflux/python-client"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/miniful/default.nix b/python/pkgs/miniful/default.nix index 5954141f7..e8f070f50 100644 --- a/python/pkgs/miniful/default.nix +++ b/python/pkgs/miniful/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, numpy, scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "miniful"; version = "0.0.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZCyfNrh8gbPvwplHN5tbmbjTMYXJBKe8Mg2JqOGHFCk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy scipy ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "miniful" ]; @@ -31,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/aresio/miniful"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/minify-html/default.nix b/python/pkgs/minify-html/default.nix index 04553fe29..99f082846 100644 --- a/python/pkgs/minify-html/default.nix +++ b/python/pkgs/minify-html/default.nix @@ -5,7 +5,7 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "minify-html"; version = "0.18.1"; @@ -13,13 +13,13 @@ buildPythonPackage rec { # Fetching from Pypi, because there is no Cargo.lock in the GitHub repo. src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "minify_html"; hash = "sha256-Q5mFMO9TdwHwA6jpCLdW147/MDyGsEGpWFXikFGLp5w="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-K0m+rM0dcosAOl5jYdh9CSRrL/Vuk1ATWHPQJbLxvRw="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/wilsonzlin/minify-html/tree/master/minify-html-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/minikanren/default.nix b/python/pkgs/minikanren/default.nix index ae93f202c..b3f08388c 100644 --- a/python/pkgs/minikanren/default.nix +++ b/python/pkgs/minikanren/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { pname = "minikanren"; version = "1.0.5"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "pythological"; diff --git a/python/pkgs/minikerberos/default.nix b/python/pkgs/minikerberos/default.nix index 4a0cf7559..7ed42c630 100644 --- a/python/pkgs/minikerberos/default.nix +++ b/python/pkgs/minikerberos/default.nix @@ -11,13 +11,13 @@ unicrypto, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "minikerberos"; version = "0.4.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CVqYChl2rf9Iw94fc9de/ps52nIU3HyJGiNjJAcWqec="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/skelsec/minikerberos"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/minimal-snowplow-tracker/default.nix b/python/pkgs/minimal-snowplow-tracker/default.nix index afc304ac2..de202e689 100644 --- a/python/pkgs/minimal-snowplow-tracker/default.nix +++ b/python/pkgs/minimal-snowplow-tracker/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, requests, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "minimal-snowplow-tracker"; version = "0.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rKv3Vy2w5/XL9pg9SV7vVAgfcb45IzDrOq25zLOdqqQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests six ]; # has no tests - doCheck = false; pythonImportsCheck = [ "snowplow_tracker" ]; @@ -31,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/snowplow-python-tracker"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/minimock/default.nix b/python/pkgs/minimock/default.nix index 00acdaf0b..010e0cd5f 100644 --- a/python/pkgs/minimock/default.nix +++ b/python/pkgs/minimock/default.nix @@ -5,21 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "minimock"; version = "1.2.8"; pyproject = true; src = fetchPypi { pname = "MiniMock"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-X9/f6t8Px4HQWSobkNL8wRWB9oL/fLpiAc/bFcPqWkw="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "minimock" ]; meta = { @@ -27,4 +25,4 @@ buildPythonPackage rec { description = "Minimalistic mocking library"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/minio/default.nix b/python/pkgs/minio/default.nix index f181bd70e..f90e7150a 100644 --- a/python/pkgs/minio/default.nix +++ b/python/pkgs/minio/default.nix @@ -18,7 +18,7 @@ mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "minio"; version = "7.2.20"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "minio"; repo = "minio-py"; - tag = version; + tag = finalAttrs.version; hash = "sha256-k7bMXEwRNqx5a6qz4+Yxs/zMANReHFKU2Ks/GSD4JKo="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/minio/minio-py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/mir-eval/default.nix b/python/pkgs/mir-eval/default.nix index 896e50357..053c374a4 100644 --- a/python/pkgs/mir-eval/default.nix +++ b/python/pkgs/mir-eval/default.nix @@ -12,7 +12,7 @@ pytest-mpl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mir-eval"; version = "0.8.2"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mir-evaluation"; repo = "mir_eval"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Dq/kqoTY8YGATsr6MSgfQxkWvFpmH/Pf1pKBLPApylY="; }; @@ -39,7 +39,7 @@ buildPythonPackage rec { pytest-cov-stub pytest-mpl ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; preCheck = '' pushd tests @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/craffel/mir_eval"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/miraie-ac/default.nix b/python/pkgs/miraie-ac/default.nix index 60b221182..9b9057585 100644 --- a/python/pkgs/miraie-ac/default.nix +++ b/python/pkgs/miraie-ac/default.nix @@ -12,13 +12,13 @@ certifi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "miraie-ac"; version = "1.1.2"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "miraie_ac"; hash = "sha256-q4CXdJrNr9nhkY74eHllmRchrQx770vQJMqRtggxxlw="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { description = "Python library for controlling Panasonic Miraie ACs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mirakuru/default.nix b/python/pkgs/mirakuru/default.nix index 99d5c3799..f42f817ea 100644 --- a/python/pkgs/mirakuru/default.nix +++ b/python/pkgs/mirakuru/default.nix @@ -12,7 +12,7 @@ python-daemon, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mirakuru"; version = "3.0.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ClearcodeHQ"; repo = "mirakuru"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3WyjvHxr+6kG+cLSCEZkHoA70mSoT66ubmp0W9g2yJM="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { description = "Process orchestration tool designed for functional and integration tests"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/misaka/default.nix b/python/pkgs/misaka/default.nix index 249043580..99d2a14e4 100644 --- a/python/pkgs/misaka/default.nix +++ b/python/pkgs/misaka/default.nix @@ -1,25 +1,28 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, cffi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "misaka"; version = "2.1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1mzc29wwyhyardclj1vg2xsfdibg2lzb7f1azjcxi580ama55wv2"; }; + build-system = [ setuptools ]; + propagatedNativeBuildInputs = [ cffi ]; - propagatedBuildInputs = [ cffi ]; + dependencies = [ cffi ]; # The tests require write access to $out - doCheck = false; meta = { description = "CFFI binding for Hoedown, a markdown parsing library"; @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://misaka.61924.nl"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/miss-hit-core/default.nix b/python/pkgs/miss-hit-core/default.nix index fc3936d2b..ef172b479 100644 --- a/python/pkgs/miss-hit-core/default.nix +++ b/python/pkgs/miss-hit-core/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "miss-hit-core"; version = "0.9.44"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "florianschanda"; repo = "miss_hit"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dJZIleDWmdarhmxoKvQxWvI/Tmx9pSCNlgFXj5NFIUc="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://misshit.org/"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/mistletoe/default.nix b/python/pkgs/mistletoe/default.nix index 43dd5a067..cbdb6ff32 100644 --- a/python/pkgs/mistletoe/default.nix +++ b/python/pkgs/mistletoe/default.nix @@ -7,20 +7,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mistletoe"; version = "1.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-kvBmxHIKJfokvyYOZBNwK7/zpbipOvMUy2zYWJcmqOE="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "mistletoe" ]; meta = { @@ -28,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/miyuchina/mistletoe"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mistralai/default.nix b/python/pkgs/mistralai/default.nix index 8cd25876e..d39ef238a 100644 --- a/python/pkgs/mistralai/default.nix +++ b/python/pkgs/mistralai/default.nix @@ -34,7 +34,6 @@ buildPythonPackage (finalAttrs: { pname = "mistralai"; version = "2.9.4"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "mistralai"; diff --git a/python/pkgs/mistune/default.nix b/python/pkgs/mistune/default.nix index 2f946e681..c3fd2a2c9 100644 --- a/python/pkgs/mistune/default.nix +++ b/python/pkgs/mistune/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mistune"; version = "3.3.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lepture"; repo = "mistune"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7N1Kz2lN6GyDVKUhuGrEkbinV8Vpc4aahal/7KhnIXo="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/lepture/mistune"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mitogen/default.nix b/python/pkgs/mitogen/default.nix index a1d4112ce..70c2a4958 100644 --- a/python/pkgs/mitogen/default.nix +++ b/python/pkgs/mitogen/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # Tests require network access and Docker support - doCheck = false; pythonImportsCheck = [ "mitogen" ]; diff --git a/python/pkgs/mixbox/default.nix b/python/pkgs/mixbox/default.nix index 77278db72..f71484b85 100644 --- a/python/pkgs/mixbox/default.nix +++ b/python/pkgs/mixbox/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mixbox"; version = "1.0.5"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CybOXProject"; repo = "mixbox"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qK3cKOf0s345M1pVFro5NFhDj4lch12UegOY1ZUEOBQ="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/CybOXProject/mixbox"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mixins/default.nix b/python/pkgs/mixins/default.nix index dc77168c4..952513b0a 100644 --- a/python/pkgs/mixins/default.nix +++ b/python/pkgs/mixins/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mixins"; version = "0.1.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SmYYRzo6wClQBMc2oRgO0CQEHOxWe8GFL24TPa6A4NQ="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "mixins" ]; meta = { @@ -21,4 +25,4 @@ buildPythonPackage rec { description = "Mixin classes which may be added to your own classes to add certain functionality to them"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mixpanel/default.nix b/python/pkgs/mixpanel/default.nix index 6e6c41b67..f29db9697 100644 --- a/python/pkgs/mixpanel/default.nix +++ b/python/pkgs/mixpanel/default.nix @@ -18,7 +18,7 @@ respx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mixpanel"; version = "5.4.0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mixpanel"; repo = "mixpanel-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0O/VPE9i/ka/pDnSA4jmKriT/jR2l6wqUjLmIesytww="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { description = "Official Mixpanel Python library"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/mkdocs-autolinks-plugin/default.nix b/python/pkgs/mkdocs-autolinks-plugin/default.nix index 841c94143..34e4d7d90 100644 --- a/python/pkgs/mkdocs-autolinks-plugin/default.nix +++ b/python/pkgs/mkdocs-autolinks-plugin/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-autolinks-plugin"; version = "071"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "zachhannum"; repo = "mkdocs-autolinks-plugin"; # The commit messages mention version 0.7.1, but the tag is v_071. - tag = "v_${version}"; + tag = "v_${finalAttrs.version}"; hash = "sha256-mEbuB9VwK7po1TqtJfBSkItOVlI3/W3nD2LYRHgPpTA="; }; @@ -24,7 +24,6 @@ buildPythonPackage rec { dependencies = [ mkdocs ]; # Module has no tests. - doCheck = false; pythonImportsCheck = [ "mkdocs_autolinks_plugin" ]; @@ -33,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/zachhannum/mkdocs-autolinks-plugin"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-autorefs/default.nix b/python/pkgs/mkdocs-autorefs/default.nix index 1832a6292..ec2987b77 100644 --- a/python/pkgs/mkdocs-autorefs/default.nix +++ b/python/pkgs/mkdocs-autorefs/default.nix @@ -8,7 +8,7 @@ markupsafe, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-autorefs"; version = "1.4.4"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkdocstrings"; repo = "autorefs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kEDnCAqn9musqbY4efUrAHcKc/LAhH1zkLAI9fP/7eg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'dynamic = ["version"]' 'version = "${version}"' + --replace 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ pdm-backend ]; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/mkdocstrings/autorefs/"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/mkdocs-backlinks/default.nix b/python/pkgs/mkdocs-backlinks/default.nix index 239244942..c4d055a82 100644 --- a/python/pkgs/mkdocs-backlinks/default.nix +++ b/python/pkgs/mkdocs-backlinks/default.nix @@ -7,7 +7,7 @@ mkdocs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-backlinks"; version = "0.9.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danodic-dev"; repo = "mkdocs-backlinks"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-P3CUm7jpmcgipn/SKpZMWhpEqJSpirADMpud10ULXDs="; }; @@ -33,11 +33,10 @@ buildPythonPackage rec { ]; # No tests available - doCheck = false; meta = { description = "Plugin for adding backlinks to mkdocs"; homepage = "https://github.com/danodic-dev/mkdocs-backlinks/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-custom-tags-attributes/default.nix b/python/pkgs/mkdocs-custom-tags-attributes/default.nix index 72e86e7f3..1f57e2f64 100644 --- a/python/pkgs/mkdocs-custom-tags-attributes/default.nix +++ b/python/pkgs/mkdocs-custom-tags-attributes/default.nix @@ -30,8 +30,6 @@ buildPythonPackage (finalAttrs: { "custom_attributes" ]; - doCheck = false; - meta = { description = "A mkdocs plugin to create custom attributes using hashtags"; homepage = "https://github.com/Mara-Li/mkdocs-custom-tags-attributes"; diff --git a/python/pkgs/mkdocs-drawio-file/default.nix b/python/pkgs/mkdocs-drawio-file/default.nix index 4e8c50855..596f6cde5 100644 --- a/python/pkgs/mkdocs-drawio-file/default.nix +++ b/python/pkgs/mkdocs-drawio-file/default.nix @@ -10,14 +10,14 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-drawio-file"; version = "1.5.2"; pyproject = true; src = fetchPypi { pname = "mkdocs_drawio_file"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-5OPaG98m7ycxtEUyAYWunomHwq+r10VBnzza3kYtHhE="; }; @@ -42,11 +42,10 @@ buildPythonPackage rec { ]; # No tests available - doCheck = false; meta = { description = "Embedding files of Diagrams.net (Draw.io) into MkDocs"; homepage = "https://github.com/onixpro/mkdocs-drawio-file/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-embed-file-plugin/default.nix b/python/pkgs/mkdocs-embed-file-plugin/default.nix index dcbfcb2f5..8955e8916 100644 --- a/python/pkgs/mkdocs-embed-file-plugin/default.nix +++ b/python/pkgs/mkdocs-embed-file-plugin/default.nix @@ -49,7 +49,6 @@ buildPythonPackage (finalAttrs: { ]; # No tests available. - doCheck = false; meta = { description = "A way to embed a file present in your docs"; diff --git a/python/pkgs/mkdocs-gen-files/default.nix b/python/pkgs/mkdocs-gen-files/default.nix index a7be6c617..8971e6672 100644 --- a/python/pkgs/mkdocs-gen-files/default.nix +++ b/python/pkgs/mkdocs-gen-files/default.nix @@ -6,7 +6,7 @@ mkdocs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-gen-files"; version = "0.6.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oprypin"; repo = "mkdocs-gen-files"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2TMQHn6eP+RMjtJ4o/6G8k1TEIlGgr7U/Fim14MJELg="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://oprypin.github.io/mkdocs-gen-files/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-get-deps/default.nix b/python/pkgs/mkdocs-get-deps/default.nix index d68b85404..0187f8f47 100644 --- a/python/pkgs/mkdocs-get-deps/default.nix +++ b/python/pkgs/mkdocs-get-deps/default.nix @@ -9,7 +9,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-get-deps"; version = "0.2.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkdocs"; repo = "get-deps"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DahmSYWYhVch950InYBiCh6qz1pH2Kibf5ixwCNdsTg="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/mkdocs/get-deps"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-git-authors-plugin/default.nix b/python/pkgs/mkdocs-git-authors-plugin/default.nix index 6004d08e9..9338fc60e 100644 --- a/python/pkgs/mkdocs-git-authors-plugin/default.nix +++ b/python/pkgs/mkdocs-git-authors-plugin/default.nix @@ -7,7 +7,7 @@ gitMinimal, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-git-authors-plugin"; version = "0.10.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timvink"; repo = "mkdocs-git-authors-plugin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Uy1XgSJchA7hkc9i4hE8Ws4OWY5GRzvfnhKkZvxT2d0="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/timvink/mkdocs-git-authors-plugin"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-git-committers-plugin-2/default.nix b/python/pkgs/mkdocs-git-committers-plugin-2/default.nix index 90cbf1c54..d115ca53b 100644 --- a/python/pkgs/mkdocs-git-committers-plugin-2/default.nix +++ b/python/pkgs/mkdocs-git-committers-plugin-2/default.nix @@ -13,7 +13,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-git-committers-plugin-2"; version = "2.5.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ojacques"; repo = "mkdocs-git-committers-plugin-2"; - tag = version; + tag = finalAttrs.version; hash = "sha256-PpXgY5RlOeb0mB46gcNVWkSGMZa4WPkCwDUXMxCUjsI="; }; @@ -36,7 +36,6 @@ buildPythonPackage rec { ]; # Upstream has no tests - doCheck = false; pythonImportsCheck = [ "mkdocs_git_committers_plugin_2" ]; meta = { @@ -44,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/ojacques/mkdocs-git-committers-plugin-2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-git-revision-date-localized-plugin/default.nix b/python/pkgs/mkdocs-git-revision-date-localized-plugin/default.nix index 43ba621dc..15a4dcee3 100644 --- a/python/pkgs/mkdocs-git-revision-date-localized-plugin/default.nix +++ b/python/pkgs/mkdocs-git-revision-date-localized-plugin/default.nix @@ -10,7 +10,7 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-git-revision-date-localized-plugin"; version = "1.5.4"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timvink"; repo = "mkdocs-git-revision-date-localized-plugin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0WLSQ2EmW4GUMtjdrUqZdcMt+695eSqxeVwBPCHXXhM="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/timvink/mkdocs-git-revision-date-localized-plugin"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-graphviz/default.nix b/python/pkgs/mkdocs-graphviz/default.nix index 2c307ca63..ff3dad7d2 100644 --- a/python/pkgs/mkdocs-graphviz/default.nix +++ b/python/pkgs/mkdocs-graphviz/default.nix @@ -8,7 +8,7 @@ markdown, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-graphviz"; version = "1.5"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "rod2ik"; repo = "mkdocs-graphviz"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5pc5RpOrDSONZcgIQMNsVxYwFyJ+PMcIt0GXDxCEyOg="; }; @@ -36,11 +36,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "mkdocs_graphviz" ]; # Tests are not available in the source code. - doCheck = false; meta = { description = "Configurable Python markdown extension for graphviz and Mkdocs"; homepage = "https://gitlab.com/rod2ik/mkdocs-graphviz"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/mkdocs-include-markdown-plugin/default.nix b/python/pkgs/mkdocs-include-markdown-plugin/default.nix index e0191fca6..fa9a20d90 100644 --- a/python/pkgs/mkdocs-include-markdown-plugin/default.nix +++ b/python/pkgs/mkdocs-include-markdown-plugin/default.nix @@ -8,14 +8,14 @@ platformdirs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-include-markdown-plugin"; version = "7.3.0"; pyproject = true; src = fetchPypi { pname = "mkdocs_include_markdown_plugin"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-KAASZ0ZFLjHC4yG71DyBkLNW4N41PiDLwWo0o8PWeWw="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/mkdocs-include-markdown-plugin/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/mkdocs-jupyter/default.nix b/python/pkgs/mkdocs-jupyter/default.nix index 2ca0ba4e8..7c016d6e9 100644 --- a/python/pkgs/mkdocs-jupyter/default.nix +++ b/python/pkgs/mkdocs-jupyter/default.nix @@ -14,14 +14,14 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-jupyter"; version = "0.26.3"; pyproject = true; src = fetchPypi { pname = "mkdocs_jupyter"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-4ei9SKG5ZULoTjAo4wZhErrHuU2Vq2n4uRMFyEADyiY="; }; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/danielfrg/mkdocs-jupyter"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/mkdocs-linkcheck/default.nix b/python/pkgs/mkdocs-linkcheck/default.nix index bbd5692cf..eaefeffda 100644 --- a/python/pkgs/mkdocs-linkcheck/default.nix +++ b/python/pkgs/mkdocs-linkcheck/default.nix @@ -3,13 +3,15 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, requests, }: buildPythonPackage { pname = "mkdocs-linkcheck"; version = "unstable-2021-08-24"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "byrnereese"; @@ -18,7 +20,9 @@ buildPythonPackage { hash = "sha256-z59F7zUKZKIQSiTlE6wGbGDecPMeruNgltWUYfDf8jY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp requests ]; diff --git a/python/pkgs/mkdocs-literate-nav/default.nix b/python/pkgs/mkdocs-literate-nav/default.nix index 0ff3082a1..89929e045 100644 --- a/python/pkgs/mkdocs-literate-nav/default.nix +++ b/python/pkgs/mkdocs-literate-nav/default.nix @@ -6,7 +6,7 @@ mkdocs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-literate-nav"; version = "0.6.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oprypin"; repo = "mkdocs-literate-nav"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YsWZhMGmOaZjJpQSPddW3TlBCieefQ42Tne85fdP1t0="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/oprypin/mkdocs-literate-nav"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-macros-plugin/default.nix b/python/pkgs/mkdocs-macros-plugin/default.nix index 839ce175b..69748eae7 100644 --- a/python/pkgs/mkdocs-macros-plugin/default.nix +++ b/python/pkgs/mkdocs-macros-plugin/default.nix @@ -17,7 +17,7 @@ mkdocs-macros-test, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-macros-plugin"; version = "1.3.9"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fralau"; repo = "mkdocs-macros-plugin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bL7oWWDoF+zH34XSwFY2H9op/97zO43HS+oO6lNFEr4="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/fralau/mkdocs-macros-plugin"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-macros-test/default.nix b/python/pkgs/mkdocs-macros-test/default.nix index 2e4628888..9d60f8787 100644 --- a/python/pkgs/mkdocs-macros-test/default.nix +++ b/python/pkgs/mkdocs-macros-test/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-macros-test"; version = "0.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xaujzQYPKKmATRT/Dto4KHyDNzUpqR2+6SIDiurUIvA="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/fralau/mkdocs-macros-test"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-markmap/default.nix b/python/pkgs/mkdocs-markmap/default.nix index 217ac1349..41b519562 100644 --- a/python/pkgs/mkdocs-markmap/default.nix +++ b/python/pkgs/mkdocs-markmap/default.nix @@ -9,7 +9,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-markmap"; version = "2.5.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "markmap"; repo = "mkdocs_markmap"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jC0MgN0CM8VmUR9NYVM5P6J+f8Qplg1DDal7i246slM="; }; @@ -37,11 +37,10 @@ buildPythonPackage rec { ]; # No tests available - doCheck = false; meta = { description = "MkDocs plugin and extension to create mindmaps from markdown using markmap"; homepage = "https://github.com/markmap/mkdocs_markmap"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-material-extensions/default.nix b/python/pkgs/mkdocs-material-extensions/default.nix index 6c8c60364..ea857ebc2 100644 --- a/python/pkgs/mkdocs-material-extensions/default.nix +++ b/python/pkgs/mkdocs-material-extensions/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-material-extensions"; version = "1.3.1"; pyproject = true; @@ -13,14 +13,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "facelessuser"; repo = "mkdocs-material-extensions"; - tag = version; + tag = finalAttrs.version; hash = "sha256-/jU30Ol10/4haR3ZPJWZ3iWRfXG/RUOU1oclOYGjjAY="; }; nativeBuildInputs = [ hatchling ]; - doCheck = false; # Circular dependency - pythonImportsCheck = [ "materialx" ]; meta = { @@ -28,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/facelessuser/mkdocs-material-extensions"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-material/default.nix b/python/pkgs/mkdocs-material/default.nix index e38efa7dc..cf65a6bb3 100644 --- a/python/pkgs/mkdocs-material/default.nix +++ b/python/pkgs/mkdocs-material/default.nix @@ -79,7 +79,6 @@ buildPythonPackage (finalAttrs: { }; # No tests for python - doCheck = false; pythonImportsCheck = [ "mkdocs" ]; diff --git a/python/pkgs/mkdocs-mermaid2-plugin/default.nix b/python/pkgs/mkdocs-mermaid2-plugin/default.nix index 05647a51b..b4f4fa015 100644 --- a/python/pkgs/mkdocs-mermaid2-plugin/default.nix +++ b/python/pkgs/mkdocs-mermaid2-plugin/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, beautifulsoup4, jsbeautifier, mkdocs, @@ -11,19 +13,21 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-mermaid2-plugin"; version = "1.2.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "fralau"; repo = "mkdocs-mermaid2-plugin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EsfcOnfjZpAndYccN8WTpfLoUAlc5JQkgoy1ro1hMRo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ beautifulsoup4 jsbeautifier mkdocs @@ -34,7 +38,6 @@ buildPythonPackage rec { ]; # non-traditional python tests (e.g. nodejs based tests) - doCheck = false; pythonImportsCheck = [ "mermaid2" ]; @@ -43,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/fralau/mkdocs-mermaid2-plugin"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-minify-plugin/default.nix b/python/pkgs/mkdocs-minify-plugin/default.nix index 7845abd90..b2f33a2b3 100644 --- a/python/pkgs/mkdocs-minify-plugin/default.nix +++ b/python/pkgs/mkdocs-minify-plugin/default.nix @@ -2,32 +2,35 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, mkdocs, csscompressor, htmlmin, jsmin, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-minify-plugin"; version = "0.7.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "byrnereese"; repo = "mkdocs-minify-plugin"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LDCAWKVbFsa6Y/tmY2Zne4nOtxe4KvNplZuWxg4e4L8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ csscompressor htmlmin jsmin mkdocs ]; # Some tests fail with an assertion error failure - doCheck = false; pythonImportsCheck = [ "mkdocs" ]; @@ -36,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/byrnereese/mkdocs-minify-plugin"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-puml/default.nix b/python/pkgs/mkdocs-puml/default.nix index 3d5f8f798..b9c9c7d68 100644 --- a/python/pkgs/mkdocs-puml/default.nix +++ b/python/pkgs/mkdocs-puml/default.nix @@ -12,7 +12,7 @@ pytest-httpx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-puml"; version = "2.3.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MikhailKravets"; repo = "mkdocs_puml"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DOGS2lnFIpFdpJxIw9PJ/kvtAOhVtAJOQeMR+CVjkE0="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/MikhailKravets/mkdocs_puml"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-redirects/default.nix b/python/pkgs/mkdocs-redirects/default.nix index b5fe3b059..91b631709 100644 --- a/python/pkgs/mkdocs-redirects/default.nix +++ b/python/pkgs/mkdocs-redirects/default.nix @@ -6,7 +6,7 @@ mkdocs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-redirects"; version = "1.2.2"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkdocs"; repo = "mkdocs-redirects"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YsMA00yajeGSqSB6CdKxGqyClC9Cgc3ImRBTucHEHhs="; }; build-system = [ hatchling ]; - propagatedBuildInputs = [ mkdocs ]; + dependencies = [ mkdocs ]; pythonImportsCheck = [ "mkdocs_redirects" ]; meta = { @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/mkdocs/mkdocs-redirects"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-redoc-tag/default.nix b/python/pkgs/mkdocs-redoc-tag/default.nix index cf9b33f80..6e3e05d19 100644 --- a/python/pkgs/mkdocs-redoc-tag/default.nix +++ b/python/pkgs/mkdocs-redoc-tag/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-redoc-tag"; version = "0.2.0"; pyproject = true; @@ -17,13 +17,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Blueswen"; repo = "mkdocs-redoc-tag"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pgJMcK8LZOj0niyRcbHi8Szsro2iNTj6hz6r24jrtVw="; }; build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ mkdocs beautifulsoup4 ]; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/blueswen/mkdocs-redoc-tag"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-simple-blog/default.nix b/python/pkgs/mkdocs-simple-blog/default.nix index 6d24239e4..132145a6a 100644 --- a/python/pkgs/mkdocs-simple-blog/default.nix +++ b/python/pkgs/mkdocs-simple-blog/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-simple-blog"; version = "0.6.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "FernandoCelmer"; repo = "mkdocs-simple-blog"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-B+vTDwyhP80bCWNn58sUl+411NKUERWpQGESvj8NEEE="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://fernandocelmer.github.io/mkdocs-simple-blog/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-table-reader-plugin/default.nix b/python/pkgs/mkdocs-table-reader-plugin/default.nix index 5e7c4f615..1d0f704a8 100644 --- a/python/pkgs/mkdocs-table-reader-plugin/default.nix +++ b/python/pkgs/mkdocs-table-reader-plugin/default.nix @@ -12,7 +12,7 @@ mkdocs-macros-plugin, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-table-reader-plugin"; version = "3.1.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timvink"; repo = "mkdocs-table-reader-plugin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XyMz0CeLQderzzz/Z3H6rja619wPzx42X3jz30wt6a8="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/timvink/mkdocs-table-reader-plugin"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs-test/default.nix b/python/pkgs/mkdocs-test/default.nix index 2359f0c5f..d9eadec15 100644 --- a/python/pkgs/mkdocs-test/default.nix +++ b/python/pkgs/mkdocs-test/default.nix @@ -12,7 +12,7 @@ super-collections, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs-test"; version = "0.6.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fralau"; repo = "mkdocs-test"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-IP6qL+qR8uYSV5eG7/spiiNtdNghApdiuHBF+8OjPPg="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/fralau/mkdocs-test"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mkdocs/default.nix b/python/pkgs/mkdocs/default.nix index e40d00dbe..6be128027 100644 --- a/python/pkgs/mkdocs/default.nix +++ b/python/pkgs/mkdocs/default.nix @@ -32,7 +32,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocs"; version = "1.6.1"; pyproject = true; @@ -40,7 +40,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkdocs"; repo = "mkdocs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JQSOgV12iYE6FubxdoJpWy9EHKFxyKoxrm/7arCn9Ak="; }; @@ -99,4 +99,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/mktestdocs/default.nix b/python/pkgs/mktestdocs/default.nix index f2ce69815..7711f643a 100644 --- a/python/pkgs/mktestdocs/default.nix +++ b/python/pkgs/mktestdocs/default.nix @@ -9,7 +9,7 @@ # tests }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mktestdocs"; version = "0.2.5"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "koaning"; repo = "mktestdocs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-OiOkU/qfxeLbCT1QywA1rGSwe9Ja8tENTmBo93vo0vc="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/koaning/mktestdocs"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ml-collections/default.nix b/python/pkgs/ml-collections/default.nix index c843cafb9..ae56847c0 100644 --- a/python/pkgs/ml-collections/default.nix +++ b/python/pkgs/ml-collections/default.nix @@ -10,7 +10,7 @@ pytest-xdist, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ml-collections"; version = "1.1.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = "ml_collections"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-G9+UBqHalzI3quR8T5NEgJs+ep60ffFw9vyTTZDeZ9M="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/ml_collections"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ml-dtypes/default.nix b/python/pkgs/ml-dtypes/default.nix index 6a028ba04..b1e8d8632 100644 --- a/python/pkgs/ml-dtypes/default.nix +++ b/python/pkgs/ml-dtypes/default.nix @@ -11,7 +11,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ml-dtypes"; version = "0.5.4"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jax-ml"; repo = "ml_dtypes"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vGCDLs7Te/3fBZmCQVp2Zm5NnP7K/KCkTod0oFVVKN4="; # Since this upstream patch (https://github.com/jax-ml/ml_dtypes/commit/1bfd097e794413b0d465fa34f2eff0f3828ff521), # the attempts to use the nixpkgs packaged eigen dependency have failed. @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/jax-ml/ml_dtypes"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/mlcroissant/default.nix b/python/pkgs/mlcroissant/default.nix index ced1bd171..912b2e784 100644 --- a/python/pkgs/mlcroissant/default.nix +++ b/python/pkgs/mlcroissant/default.nix @@ -33,7 +33,6 @@ buildPythonPackage (finalAttrs: { pname = "mlcroissant"; version = "1.1.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "mlcommons"; diff --git a/python/pkgs/mlflow-skinny/default.nix b/python/pkgs/mlflow-skinny/default.nix index 1dd062ab6..073c70154 100644 --- a/python/pkgs/mlflow-skinny/default.nix +++ b/python/pkgs/mlflow-skinny/default.nix @@ -34,12 +34,11 @@ buildPythonPackage (finalAttrs: { pname = "mlflow-skinny"; inherit (mlflow) version; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "mlflow"; repo = "mlflow"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-e11ZncpvThb1Nt6OH+O6Do74N3dphxBiK/HIeLQMxAw="; }; @@ -73,7 +72,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "mlflow" ]; # No tests in the skinny subtree. - doCheck = false; meta = mlflow.meta // { description = "Lightweight version of MLflow that is designed to minimize package size"; diff --git a/python/pkgs/mlflow-tracing/default.nix b/python/pkgs/mlflow-tracing/default.nix index bc0efad79..81689fe24 100644 --- a/python/pkgs/mlflow-tracing/default.nix +++ b/python/pkgs/mlflow-tracing/default.nix @@ -21,12 +21,11 @@ buildPythonPackage (finalAttrs: { pname = "mlflow-tracing"; inherit (mlflow) version; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "mlflow"; repo = "mlflow"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-e11ZncpvThb1Nt6OH+O6Do74N3dphxBiK/HIeLQMxAw="; }; @@ -48,7 +47,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "mlflow.tracing" ]; # No tests - doCheck = false; meta = { description = "Open-Source SDK for observability and monitoring GenAI applications"; diff --git a/python/pkgs/mlflow/default.nix b/python/pkgs/mlflow/default.nix index b375b38be..775e4ba0e 100644 --- a/python/pkgs/mlflow/default.nix +++ b/python/pkgs/mlflow/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { pname = "mlflow"; version = "3.14.0"; format = "wheel"; - __structuredAttrs = true; # We build from the PyPI wheel rather than fetchFromGitHub, because the mlflow-server # JS UI is absent from GitHub but provided in the wheel. diff --git a/python/pkgs/mlrose/default.nix b/python/pkgs/mlrose/default.nix index d075bb09d..e0ca27e59 100644 --- a/python/pkgs/mlrose/default.nix +++ b/python/pkgs/mlrose/default.nix @@ -9,7 +9,7 @@ pytest-randomly, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mlrose"; version = "1.3.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gkhayes"; repo = "mlrose"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1dn43k3rcypj58ymcj849b37w66jz7fphw8842v6mlbij3x0rxfl"; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/gkhayes/mlrose"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mlxtend/default.nix b/python/pkgs/mlxtend/default.nix index 97514301a..1bca104e1 100644 --- a/python/pkgs/mlxtend/default.nix +++ b/python/pkgs/mlxtend/default.nix @@ -12,7 +12,7 @@ joblib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mlxtend"; version = "0.25.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rasbt"; repo = "mlxtend"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-h0qGvQfsWOCP/9XPlih94nGNp4ppplWJ+89qedYipPk="; }; @@ -69,4 +69,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/mmcif-pdbx/default.nix b/python/pkgs/mmcif-pdbx/default.nix index b0eadf543..f8dd7b9e6 100644 --- a/python/pkgs/mmcif-pdbx/default.nix +++ b/python/pkgs/mmcif-pdbx/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mmcif-pdbx"; version = "2.1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Electrostatics"; repo = "mmcif_pdbx"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HzRJ8bzUHAmF7WA20DefvgSNDxMaqJCxfgqTHrS0BqU="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/Electrostatics/mmcif_pdbx"; license = lib.licenses.cc0; }; -} +}) diff --git a/python/pkgs/mmh3/default.nix b/python/pkgs/mmh3/default.nix index 572e41510..30e84179c 100644 --- a/python/pkgs/mmh3/default.nix +++ b/python/pkgs/mmh3/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mmh3"; version = "5.3.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hajimes"; repo = "mmh3"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RvVsPOB104XovIGP2Fz2l8IIYHbkZYPX8PnA/jSbxCI="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/hajimes/mmh3"; license = lib.licenses.cc0; }; -} +}) diff --git a/python/pkgs/mmtf-python/default.nix b/python/pkgs/mmtf-python/default.nix index bcc778421..d6a9e8da2 100644 --- a/python/pkgs/mmtf-python/default.nix +++ b/python/pkgs/mmtf-python/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, msgpack, numpy, unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mmtf-python"; version = "1.1.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-EqAv4bcTHworjORbRvHgzdKLmBj+RJlVTCaISYfqDDI="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msgpack numpy ]; @@ -36,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/rcsb/mmtf-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/mnemonic/default.nix b/python/pkgs/mnemonic/default.nix index cef2013d0..c7bb19239 100644 --- a/python/pkgs/mnemonic/default.nix +++ b/python/pkgs/mnemonic/default.nix @@ -6,7 +6,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mnemonic"; version = "0.21"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "trezor"; repo = "python-mnemonic"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-D1mS/JQhefYmwrShfWR9SdiGsBUM+jmuCkfWix9tDOU="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/trezor/python-mnemonic"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mnist/default.nix b/python/pkgs/mnist/default.nix index e7ddd7711..0bdf16455 100644 --- a/python/pkgs/mnist/default.nix +++ b/python/pkgs/mnist/default.nix @@ -1,24 +1,28 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lib, numpy, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mnist"; version = "0.2.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "datapythonista"; repo = "mnist"; - rev = "${pname}-${version}"; + rev = "${finalAttrs.pname}-${finalAttrs.version}"; sha256 = "17r37pbxiv5dw857bmg990x836gq6sgww069w3q5jjg9m3xdm7dh"; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -35,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/datapythonista/mnist"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mobi/default.nix b/python/pkgs/mobi/default.nix index 041ed9c01..eb58d0c78 100644 --- a/python/pkgs/mobi/default.nix +++ b/python/pkgs/mobi/default.nix @@ -9,7 +9,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mobi"; version = "0.4.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iscc"; repo = "mobi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Hbw4TX/yKkuxYQ9vZZp/wasDCop8pvyQc5zWloMQbng="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/iscc/mobi"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/mock-django/default.nix b/python/pkgs/mock-django/default.nix index 995df8634..8e582c2b5 100644 --- a/python/pkgs/mock-django/default.nix +++ b/python/pkgs/mock-django/default.nix @@ -31,7 +31,6 @@ buildPythonPackage { ]; # tests are based on nose, which is not supported anymore - doCheck = false; meta = { description = "Simple library for mocking certain Django behavior, such as the ORM"; diff --git a/python/pkgs/mock-open/default.nix b/python/pkgs/mock-open/default.nix index d93088cc1..99b43ca6d 100644 --- a/python/pkgs/mock-open/default.nix +++ b/python/pkgs/mock-open/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mock-open"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-w+y2uMMqWJmk9b9ElQg7WYtSDGmLugDhzirObpwjkQA="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Better mock for file I/O"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mock-services/default.nix b/python/pkgs/mock-services/default.nix index c8e94e076..e1074811f 100644 --- a/python/pkgs/mock-services/default.nix +++ b/python/pkgs/mock-services/default.nix @@ -10,7 +10,7 @@ setuptools_80, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mock-services"; version = "0.3.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "peopledoc"; repo = "mock-services"; - rev = version; + tag = finalAttrs.version; sha256 = "1rqyyfwngi1xsd9a81irjxacinkj1zf6nqfvfxhi55ky34x5phf9"; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/peopledoc/mock-services"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mock-ssh-server/default.nix b/python/pkgs/mock-ssh-server/default.nix index 4d3b92c10..4315468ce 100644 --- a/python/pkgs/mock-ssh-server/default.nix +++ b/python/pkgs/mock-ssh-server/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mock-ssh-server"; version = "0.9.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "carletes"; repo = "mock-ssh-server"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yJd+WDidW5ouofytAKTlSiZhIQg2cLs8BvEp15qwtjo="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ paramiko ]; # Tests are running into a timeout on Hydra, they work locally - doCheck = false; pythonImportsCheck = [ "mockssh" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/carletes/mock-ssh-server"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mocket/default.nix b/python/pkgs/mocket/default.nix index 029883bdf..befc7a671 100644 --- a/python/pkgs/mocket/default.nix +++ b/python/pkgs/mocket/default.nix @@ -15,13 +15,13 @@ pook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mocket"; version = "3.14.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lfEO2gUKkVDNiX4Tz8C2kIXEVdIUmMvdefh2+lHPmtA="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/mindflayer/python-mocket"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mockfs/default.nix b/python/pkgs/mockfs/default.nix index 52d42a4b6..cf4ccc10d 100644 --- a/python/pkgs/mockfs/default.nix +++ b/python/pkgs/mockfs/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mockfs"; version = "2.0.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mockfs"; repo = "mockfs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fTN9HLzlVCn0O8nYy4UUM+JIsYJ3qDPw3h41yhcilJ8="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ importlib-metadata ]; + dependencies = [ importlib-metadata ]; pythonImportsCheck = [ "mockfs" ]; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/mockfs/mockfs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mockito/default.nix b/python/pkgs/mockito/default.nix index 9c160a99b..16d6354b2 100644 --- a/python/pkgs/mockito/default.nix +++ b/python/pkgs/mockito/default.nix @@ -6,13 +6,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mockito"; version = "2.0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-00HyKMW1zPPEc3UfbG8J2Ng8XaSYRqbuMetgtlYH4O8="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/kaste/mockito-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/modbus-tk/default.nix b/python/pkgs/modbus-tk/default.nix index 5661d0a38..99f2b4b15 100644 --- a/python/pkgs/modbus-tk/default.nix +++ b/python/pkgs/modbus-tk/default.nix @@ -6,14 +6,14 @@ pyserial, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "modbus-tk"; version = "1.1.5"; pyproject = true; src = fetchPypi { pname = "modbus_tk"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-d6cqOtnV0yodIRC8BCFmgMpX11IpEuDycem/XxtwGzY="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { dependencies = [ pyserial ]; # Source no tagged anymore and PyPI doesn't ship tests - doCheck = false; pythonImportsCheck = [ "modbus_tk" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/ljean/modbus-tk"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/moddb/default.nix b/python/pkgs/moddb/default.nix index 063139717..386d80736 100644 --- a/python/pkgs/moddb/default.nix +++ b/python/pkgs/moddb/default.nix @@ -34,8 +34,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "moddb" ]; - doCheck = false; # Tests try to access the internet. - meta = { description = "Python scrapper to access ModDB mods, games and more as objects"; homepage = "https://github.com/ClementJ18/moddb"; diff --git a/python/pkgs/modelscope/default.nix b/python/pkgs/modelscope/default.nix index e35cd760d..32b3cb9fb 100644 --- a/python/pkgs/modelscope/default.nix +++ b/python/pkgs/modelscope/default.nix @@ -31,8 +31,6 @@ buildPythonPackage (finalAttrs: { tqdm ]; - doCheck = false; # need network - pythonImportsCheck = [ "modelscope" ]; meta = { diff --git a/python/pkgs/modern-colorthief/default.nix b/python/pkgs/modern-colorthief/default.nix index 23abe4921..4c7e6e082 100644 --- a/python/pkgs/modern-colorthief/default.nix +++ b/python/pkgs/modern-colorthief/default.nix @@ -9,7 +9,7 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "modern-colorthief"; version = "0.3.0"; pyproject = true; @@ -17,12 +17,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "baseplate-admin"; repo = "modern_colorthief"; - tag = version; + tag = finalAttrs.version; hash = "sha256-oQ0ZAL8GyzKfFoSBJS2LIck2Z1IzZCYrkOc9nXfqyyg="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-csGUiJKAZn8OF3lxfw5VPwZxWDXHpFC0rczkD1+P8Sk="; }; @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies; + nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues finalAttrs.optional-dependencies; disabledTestPaths = [ # Requires `fast_colorthief`, which isn't packaged @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://modern-colorthief.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/moehlenhoff-alpha2/default.nix b/python/pkgs/moehlenhoff-alpha2/default.nix index af27c558c..8137a73d3 100644 --- a/python/pkgs/moehlenhoff-alpha2/default.nix +++ b/python/pkgs/moehlenhoff-alpha2/default.nix @@ -9,7 +9,7 @@ pytest-asyncio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "moehlenhoff-alpha2"; version = "1.4.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "j-a-n"; repo = "python-moehlenhoff-alpha2"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bvT7kWFPIEQUgUxLGydd2e7SBA7vPV+YAzDqYLE7X+o="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/j-a-n/python-moehlenhoff-alpha2"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/mohawk/default.nix b/python/pkgs/mohawk/default.nix index 8455068ba..eff583096 100644 --- a/python/pkgs/mohawk/default.nix +++ b/python/pkgs/mohawk/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mohawk"; version = "1.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0qDjqxCiCcx56V4o8t1UvUpz/RmY/+J7e6D5Yra+lyM="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/kumar303/mohawk"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/momonga/default.nix b/python/pkgs/momonga/default.nix index c76e13b21..1c508fd52 100644 --- a/python/pkgs/momonga/default.nix +++ b/python/pkgs/momonga/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "momonga"; version = "0.7.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nbtk"; repo = "momonga"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3Ngm30Bo6hKeLLAOMyYxcgfiwOIessi5S0BB92Ye/rM="; }; @@ -27,11 +27,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "momonga" ]; # tests require access to the API - doCheck = false; meta = { description = "Python Route B Library: A Communicator for Low-voltage Smart Electric Energy Meters"; homepage = "https://github.com/nbtk/momonga"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/monero/default.nix b/python/pkgs/monero/default.nix index f6adf4798..6cf24839b 100644 --- a/python/pkgs/monero/default.nix +++ b/python/pkgs/monero/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pycryptodomex, pysocks, pynacl, @@ -13,24 +15,26 @@ responses, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "monero"; version = "1.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "monero-ecosystem"; repo = "monero-python"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WIF3pFBOLgozYTrQHLzIRgSlT3dTZTe+7sF/dVjVdTo="; }; + build-system = [ setuptools ]; + pythonRelaxDeps = [ "pynacl" ]; pythonRemoveDeps = [ "ipaddress" ]; pythonImportsCheck = [ "monero" ]; - propagatedBuildInputs = [ + dependencies = [ pycryptodomex pynacl pysocks @@ -50,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/monero-ecosystem/monero-python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mongodict/default.nix b/python/pkgs/mongodict/default.nix index ab8c181be..50e4ec9ef 100644 --- a/python/pkgs/mongodict/default.nix +++ b/python/pkgs/mongodict/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pymongo, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mongodict"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0nv5amfs337m0gbxpjb0585s20rndqfc3mfrzq1iwgnds5gxcrlw"; }; - propagatedBuildInputs = [ pymongo ]; + build-system = [ setuptools ]; + + dependencies = [ pymongo ]; meta = { description = "MongoDB-backed Python dict-like interface"; homepage = "https://github.com/turicas/mongodict/"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/mongoengine/default.nix b/python/pkgs/mongoengine/default.nix index 697700a90..ff22fce34 100644 --- a/python/pkgs/mongoengine/default.nix +++ b/python/pkgs/mongoengine/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pymongo, six, blinker, @@ -9,19 +11,21 @@ coverage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mongoengine"; version = "0.29.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "MongoEngine"; repo = "mongoengine"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Y+cRQW29GBGt4aC+ENx8zSocV9A5Exzq1sMDv/wcJ3M="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pymongo six ]; @@ -32,7 +36,6 @@ buildPythonPackage rec { ''; # tests require mongodb running in background - doCheck = false; pythonImportsCheck = [ "mongoengine" ]; @@ -41,4 +44,4 @@ buildPythonPackage rec { homepage = "http://mongoengine.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mongomock/default.nix b/python/pkgs/mongomock/default.nix index edf6cd421..f8591ece3 100644 --- a/python/pkgs/mongomock/default.nix +++ b/python/pkgs/mongomock/default.nix @@ -9,13 +9,13 @@ sentinels, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mongomock"; version = "4.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-MmZ7eQZvq8EtTxfxao/XNhtfRDUgizujLCJuUiEqjDA="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/mongomock/mongomock"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mongoquery/default.nix b/python/pkgs/mongoquery/default.nix index 70f57fe4f..77d2d5017 100644 --- a/python/pkgs/mongoquery/default.nix +++ b/python/pkgs/mongoquery/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mongoquery"; version = "1.4.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-6QH4buWvfvbtovLCb0vSz+g4DYHxeLfjYH27zc7pcjk="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; pythonImportsCheck = [ "mongoquery" ]; @@ -24,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/kapouille/mongoquery"; license = lib.licenses.unlicense; }; -} +}) diff --git a/python/pkgs/monitorcontrol/default.nix b/python/pkgs/monitorcontrol/default.nix index 131a066f5..d8f850f30 100644 --- a/python/pkgs/monitorcontrol/default.nix +++ b/python/pkgs/monitorcontrol/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "monitorcontrol"; version = "4.2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "newAM"; repo = "monitorcontrol"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KyVLNZLpzmxABQQiHGniCcND7DwZwpT4gJC+sJihoag="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ pname ]; + pythonImportsCheck = [ finalAttrs.pname ]; meta = { description = "Python monitor controls using DDC-CI"; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/monkeyhex/default.nix b/python/pkgs/monkeyhex/default.nix index 7d43ff509..b22f4515b 100644 --- a/python/pkgs/monkeyhex/default.nix +++ b/python/pkgs/monkeyhex/default.nix @@ -1,24 +1,27 @@ { buildPythonPackage, fetchPypi, + # build-system + setuptools, future, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "monkeyhex"; version = "1.7.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "a646096dd3114ee8a7c6f30363f38c288ec56c4e032c8fc7e681792b604dd122"; }; - propagatedBuildInputs = [ future ]; + build-system = [ setuptools ]; + + dependencies = [ future ]; # No tests in repo. - doCheck = false; # Verify import still works. pythonImportsCheck = [ "monkeyhex" ]; @@ -28,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/rhelmot/monkeyhex"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/monotonic/default.nix b/python/pkgs/monotonic/default.nix index d6cb4a4bb..1048147c9 100644 --- a/python/pkgs/monotonic/default.nix +++ b/python/pkgs/monotonic/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "monotonic"; version = "1.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OlUge8/tU93VxbrhdFJAYpNe/tF3kuneKtAgXOmtY/c="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "monotonic" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/atdt/monotonic"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/monty/default.nix b/python/pkgs/monty/default.nix index 4392dd30f..62e76b741 100644 --- a/python/pkgs/monty/default.nix +++ b/python/pkgs/monty/default.nix @@ -27,7 +27,7 @@ ipython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "monty"; version = "2026.7.16"; pyproject = true; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = "monty"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-x5FNw7E3rtrgCWVhMsBpnO+uwu+mB3ELNFdd33+uFds="; }; @@ -85,4 +85,4 @@ buildPythonPackage rec { homepage = "https://github.com/materialsvirtuallab/monty"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/monzopy/default.nix b/python/pkgs/monzopy/default.nix index f62bb975f..c62d038ac 100644 --- a/python/pkgs/monzopy/default.nix +++ b/python/pkgs/monzopy/default.nix @@ -23,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ aiohttp ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "monzopy" ]; diff --git a/python/pkgs/moocore/default.nix b/python/pkgs/moocore/default.nix index 972de7d3c..b633ef773 100644 --- a/python/pkgs/moocore/default.nix +++ b/python/pkgs/moocore/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { pname = "moocore"; version = "0.3.2"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "multi-objective"; diff --git a/python/pkgs/moonraker-api/default.nix b/python/pkgs/moonraker-api/default.nix index 336b78cea..329ae5088 100644 --- a/python/pkgs/moonraker-api/default.nix +++ b/python/pkgs/moonraker-api/default.nix @@ -4,29 +4,33 @@ async-timeout, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytest-aiohttp, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "moonraker-api"; version = "4.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "cmroche"; repo = "moonraker-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-I+/c3dVVuNGKWztVsEKi2AErACbhQoU8ZE3ye9B2HxM="; }; + build-system = [ setuptools ]; + postPatch = '' # see comment on https://github.com/cmroche/moonraker-api/commit/e5ca8ab60d2839e150a81182fbe65255d84b4e4e substituteInPlace setup.py \ - --replace 'name="moonraker-api",' 'name="moonraker-api",version="${version}",' + --replace 'name="moonraker-api",' 'name="moonraker-api",version="${finalAttrs.version}",' ''; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout ]; @@ -43,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/cmroche/moonraker-api"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/mopidyapi/default.nix b/python/pkgs/mopidyapi/default.nix index 7de67c0d2..1eb9581a5 100644 --- a/python/pkgs/mopidyapi/default.nix +++ b/python/pkgs/mopidyapi/default.nix @@ -7,13 +7,13 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mopidyapi"; version = "1.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-n1BJGHFZvuGSSumEXWIjH/CiHs5w/8skhz7yfR7Jplw="; }; @@ -33,11 +33,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "mopidyapi" ]; # PyPi does not include tests - doCheck = false; meta = { description = "Module for interacting with Mopidy via its JSON RPC API"; homepage = "https://github.com/AsbjornOlling/mopidyapi"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/more-itertools/default.nix b/python/pkgs/more-itertools/default.nix index 4d329ad31..b33d3be81 100644 --- a/python/pkgs/more-itertools/default.nix +++ b/python/pkgs/more-itertools/default.nix @@ -7,7 +7,7 @@ stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "more-itertools"; version = "11.1.0"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "more-itertools"; repo = "more-itertools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fk2QRwOYgYfANtwRpEtGK5F+rRI2Gj25l0XaP9svJz8="; }; build-system = [ flit-core ]; - propagatedBuildInputs = [ six ]; + dependencies = [ six ]; # iterable = range(10 ** 10) # Is efficiently reversible # OverflowError: Python int too large to convert to C long doCheck = !stdenv.hostPlatform.is32bit; @@ -32,4 +32,4 @@ buildPythonPackage rec { downloadPage = "https://github.com/more-itertools/more-itertools"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/morecantile/default.nix b/python/pkgs/morecantile/default.nix index 9c56f834a..77255c06a 100644 --- a/python/pkgs/morecantile/default.nix +++ b/python/pkgs/morecantile/default.nix @@ -11,7 +11,7 @@ pyproj, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "morecantile"; version = "7.0.3"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "developmentseed"; repo = "morecantile"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Hx4duNbTuRfOmNBLN9J6/6URe57aPc8+3SJA7rbW5zs="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "morecantile"; }; -} +}) diff --git a/python/pkgs/morfessor/default.nix b/python/pkgs/morfessor/default.nix index ac1252178..f2bf2ae1c 100644 --- a/python/pkgs/morfessor/default.nix +++ b/python/pkgs/morfessor/default.nix @@ -7,16 +7,23 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "Morfessor"; version = "2.0.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uzvqwjQ0FyTF9kD2WAMHH2I3OlDbqFTVo5hWf5rvurI="; }; + postPatch = '' + rm -f ez_setup.py + substituteInPlace setup.py \ + --replace-fail "from ez_setup import use_setuptools" "" \ + --replace-fail "use_setuptools()" "" + ''; + build-system = [ setuptools ]; pythonImportsCheck = [ "morfessor" ]; @@ -26,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/aalto-speech/morfessor"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/morphys/default.nix b/python/pkgs/morphys/default.nix index fa21a4ffc..a736d8726 100644 --- a/python/pkgs/morphys/default.nix +++ b/python/pkgs/morphys/default.nix @@ -1,12 +1,14 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lib, }: buildPythonPackage { pname = "morphys"; version = "1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mkalinski"; @@ -15,6 +17,8 @@ buildPythonPackage { sha256 = "1da8s04m5wwih9cvkrks3ymb8v082lia47f274hxmfhi6ma3qc8b"; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "morphys" ]; meta = { diff --git a/python/pkgs/mortgage/default.nix b/python/pkgs/mortgage/default.nix index 2186f59c9..5146b42e0 100644 --- a/python/pkgs/mortgage/default.nix +++ b/python/pkgs/mortgage/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mortgage"; version = "1.0.5"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jlumbroso"; repo = "mortgage"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UwSEKfMQqxpcF+7TF/+qD6l8gEO/qDCUklpZz1Nt/Ok="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/jlumbroso/mortgage"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/motionblinds/default.nix b/python/pkgs/motionblinds/default.nix index 259aaa5ca..2b86b3888 100644 --- a/python/pkgs/motionblinds/default.nix +++ b/python/pkgs/motionblinds/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "motionblinds"; version = "0.6.30"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "starkillerOG"; repo = "motion-blinds"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xV9od7xTKBBE4f4Mqg57Mp0MXO8/lG+bBKzG+jv6gf4="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ pycryptodomex ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "motionblinds" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/starkillerOG/motion-blinds"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/motioneye-client/default.nix b/python/pkgs/motioneye-client/default.nix index 1ccaa8f64..43fdfefc1 100644 --- a/python/pkgs/motioneye-client/default.nix +++ b/python/pkgs/motioneye-client/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "motioneye-client"; version = "0.3.14"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dermotduffy"; repo = "motioneye-client"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kgFSd5RjO+OtnPeAOimPTDVEfJ47rXh2Ku5xEYStHv8="; }; @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; nativeCheckInputs = [ pytest-aiohttp @@ -47,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.mit; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/python/pkgs/moto/default.nix b/python/pkgs/moto/default.nix index a9b48fa6a..9002fbfcb 100644 --- a/python/pkgs/moto/default.nix +++ b/python/pkgs/moto/default.nix @@ -34,7 +34,7 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "moto"; version = "5.2.3"; pyproject = true; @@ -42,7 +42,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "getmoto"; repo = "moto"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7wE44MYdRf9p3/ac2qOPpLaS0bkpoh84R+rdJp5oycU="; }; @@ -301,4 +301,4 @@ buildPythonPackage rec { homepage = "https://github.com/getmoto/moto"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/motor/default.nix b/python/pkgs/motor/default.nix index ea9de955d..f1a4b8c91 100644 --- a/python/pkgs/motor/default.nix +++ b/python/pkgs/motor/default.nix @@ -8,7 +8,7 @@ pymongo, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "motor"; version = "3.7.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mongodb"; repo = "motor"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ul2GKzSiAewwGEuCpQQ61h3cqrJikaJeKs5KlX+aAjo="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { dependencies = [ pymongo ]; # network connections - doCheck = false; pythonImportsCheck = [ "motor" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; homepage = "https://github.com/mongodb/motor"; }; -} +}) diff --git a/python/pkgs/mouseinfo/default.nix b/python/pkgs/mouseinfo/default.nix index d14f5c55a..9c4c9bb69 100644 --- a/python/pkgs/mouseinfo/default.nix +++ b/python/pkgs/mouseinfo/default.nix @@ -3,13 +3,15 @@ buildPythonPackage, pyperclip, fetchFromGitHub, + # build-system + setuptools, python-xlib, pillow, }: buildPythonPackage { pname = "mouseinfo"; version = "0.1.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "asweigart"; @@ -18,16 +20,17 @@ buildPythonPackage { hash = "sha256-UTaHTJE0xFihN9r+DY/WhekZ7S/CXtMFbqAayzexRxk="; }; + build-system = [ setuptools ]; + patches = [ ./fix-xlib-version.patch ./pillow-version.patch ]; - doCheck = false; # Mouseinfo requires a X server running to import successfully # pythonImportsCheck = [ "mouseinfo" ]; - propagatedBuildInputs = [ + dependencies = [ pyperclip python-xlib pillow diff --git a/python/pkgs/mouser/default.nix b/python/pkgs/mouser/default.nix index 0e307b8a3..8eca33858 100644 --- a/python/pkgs/mouser/default.nix +++ b/python/pkgs/mouser/default.nix @@ -18,7 +18,6 @@ buildPythonPackage (finalAttrs: { pname = "mouser"; version = "0.1.6"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "sparkmicro"; diff --git a/python/pkgs/moviepy/default.nix b/python/pkgs/moviepy/default.nix index 2f6c19ff8..f728a5760 100644 --- a/python/pkgs/moviepy/default.nix +++ b/python/pkgs/moviepy/default.nix @@ -18,7 +18,7 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "moviepy"; version = "2.2.1"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Zulko"; repo = "moviepy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3vt/EyEOv6yNPgewkgcWcjM0TbQ6IfkR6nytS/WpRyg="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://zulko.github.io/moviepy/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/moyopy/default.nix b/python/pkgs/moyopy/default.nix index ded54d863..a78fce542 100644 --- a/python/pkgs/moyopy/default.nix +++ b/python/pkgs/moyopy/default.nix @@ -18,7 +18,6 @@ buildPythonPackage (finalAttrs: { pname = "moyopy"; version = "0.15.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "spglib"; diff --git a/python/pkgs/mozart-api/default.nix b/python/pkgs/mozart-api/default.nix index 2c5dfa1d1..559f331d8 100644 --- a/python/pkgs/mozart-api/default.nix +++ b/python/pkgs/mozart-api/default.nix @@ -43,7 +43,6 @@ buildPythonPackage (finalAttrs: { ]; # Package has no tests - doCheck = false; pythonImportsCheck = [ "mozart_api" ]; diff --git a/python/pkgs/mozilla-django-oidc/default.nix b/python/pkgs/mozilla-django-oidc/default.nix index be5aac3ec..571551d83 100644 --- a/python/pkgs/mozilla-django-oidc/default.nix +++ b/python/pkgs/mozilla-django-oidc/default.nix @@ -10,7 +10,7 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mozilla-django-oidc"; version = "5.0.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mozilla"; repo = "mozilla-django-oidc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5J2lzGGdjoXzdzfKdmfUaSM7KQ6Hn7KerBtoKzFsZfY="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/mozilla/mozilla-django-oidc"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/mpegdash/default.nix b/python/pkgs/mpegdash/default.nix index 38a86abac..df6af37a6 100644 --- a/python/pkgs/mpegdash/default.nix +++ b/python/pkgs/mpegdash/default.nix @@ -5,7 +5,7 @@ pytestCheckHook, setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mpegdash"; version = "0.4.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sangwonl"; repo = "python-mpegdash"; - rev = version; + tag = finalAttrs.version; hash = "sha256-WrsTxI6zdPCvzU4bW41kuPpR6B1DcDRUFDbAb9JZnK8="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/sangwonl/python-mpegdash"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mpl-scatter-density/default.nix b/python/pkgs/mpl-scatter-density/default.nix index 56d94e27d..fd01d62bd 100644 --- a/python/pkgs/mpl-scatter-density/default.nix +++ b/python/pkgs/mpl-scatter-density/default.nix @@ -14,7 +14,7 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mpl-scatter-density"; version = "0.8"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astrofrog"; repo = "mpl-scatter-density"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pDiKJAN/4WFf5icNU/ZGOvw0jqN3eGZHgilm2oolpbE="; }; @@ -61,4 +61,4 @@ buildPythonPackage rec { description = "Fast scatter density plots for Matplotlib"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/mplcursors/default.nix b/python/pkgs/mplcursors/default.nix index 8368729b5..01559b9ab 100644 --- a/python/pkgs/mplcursors/default.nix +++ b/python/pkgs/mplcursors/default.nix @@ -14,7 +14,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mplcursors"; version = "0.7.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "anntzer"; repo = "mplcursors"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZHX//AUVSF91cHxyiL4klglJ2Ef3iSE6oOancL+gQbA="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/anntzer/mplcursors"; license = lib.licenses.zlib; }; -} +}) diff --git a/python/pkgs/mpldatacursor/default.nix b/python/pkgs/mpldatacursor/default.nix index dfbabdeae..a8f992735 100644 --- a/python/pkgs/mpldatacursor/default.nix +++ b/python/pkgs/mpldatacursor/default.nix @@ -2,25 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, matplotlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mpldatacursor"; version = "0.7.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "joferkington"; repo = "mpldatacursor"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0i1lwl6x6hgjq4xwsc138i4v5895lmnpfqwpzpnj5mlck6fy6rda"; }; - propagatedBuildInputs = [ matplotlib ]; + build-system = [ setuptools ]; + + dependencies = [ matplotlib ]; # No tests included in archive - doCheck = false; pythonImportsCheck = [ "mpldatacursor" ]; @@ -29,4 +32,4 @@ buildPythonPackage rec { description = "Interactive data cursors for matplotlib"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mplfinance/default.nix b/python/pkgs/mplfinance/default.nix index 81b68e2f2..63d76d66b 100644 --- a/python/pkgs/mplfinance/default.nix +++ b/python/pkgs/mplfinance/default.nix @@ -2,28 +2,31 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, matplotlib, pandas, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mplfinance"; version = "0.12.10b0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-faFQtYUapRGa1uBrVeSDOLYZu2dz8bhd9d5npf/ZF78="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ matplotlib pandas ]; # tests are only included on GitHub where this version misses a tag # and half of them fail - doCheck = false; pythonImportsCheck = [ "mplfinance" ]; @@ -32,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/matplotlib/mplfinance"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mplhep-data/default.nix b/python/pkgs/mplhep-data/default.nix index 7bc79f0eb..5e0491c57 100644 --- a/python/pkgs/mplhep-data/default.nix +++ b/python/pkgs/mplhep-data/default.nix @@ -6,14 +6,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mplhep-data"; version = "0.1.0"; pyproject = true; src = fetchPypi { pname = "mplhep_data"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-v5zcxlw6nOfY8OMHj/ZZ7z/P3hGeYloPcfIbBu2rxMk="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { ofl ]; }; -} +}) diff --git a/python/pkgs/mplleaflet/default.nix b/python/pkgs/mplleaflet/default.nix index b0c48b238..c7170e49e 100644 --- a/python/pkgs/mplleaflet/default.nix +++ b/python/pkgs/mplleaflet/default.nix @@ -2,31 +2,34 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, jinja2, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mplleaflet"; version = "0.0.5"; - format = "setuptools"; + pyproject = true; - propagatedBuildInputs = [ + dependencies = [ jinja2 six ]; # No tests in archive - doCheck = false; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "049e0b91797ce5b462853395138161fed9e8dfc1f4723f482ebb0739a0bbd289"; }; + build-system = [ setuptools ]; + meta = { description = "Convert Matplotlib plots into Leaflet web maps"; homepage = "https://github.com/jwass/mplleaflet"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mpmath/default.nix b/python/pkgs/mpmath/default.nix index 3697a6bb1..bf6b780a8 100644 --- a/python/pkgs/mpmath/default.nix +++ b/python/pkgs/mpmath/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mpmath"; version = "1.4.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mpmath"; repo = "mpmath"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ykfKrpDri+4n9Y26S7nFl6nF0CV6V0A11ijmt8/apvg="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/mpyq/default.nix b/python/pkgs/mpyq/default.nix index 027d9afce..1340bbc1b 100644 --- a/python/pkgs/mpyq/default.nix +++ b/python/pkgs/mpyq/default.nix @@ -2,22 +2,26 @@ buildPythonPackage, lib, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mpyq"; version = "0.2.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "01q0xh2fy3zzsrfr45d2ypj4whs7s060cy1rnprg6sg55fbgbaih"; }; + build-system = [ setuptools ]; + meta = { description = "Python library for extracting MPQ (MoPaQ) files"; mainProgram = "mpyq"; homepage = "https://github.com/eagleflo/mpyq"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/ms-active-directory/default.nix b/python/pkgs/ms-active-directory/default.nix index d13f60aa5..043d6230a 100644 --- a/python/pkgs/ms-active-directory/default.nix +++ b/python/pkgs/ms-active-directory/default.nix @@ -11,7 +11,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ms-active-directory"; version = "1.14.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zorn96"; repo = "ms_active_directory"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZFIeG95+G9ofk54bYZpqu8uVfzjqsOrwWlIZvQgIWRI="; }; @@ -35,7 +35,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "ms_active_directory" ]; @@ -44,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/zorn96/ms_active_directory/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ms-cv/default.nix b/python/pkgs/ms-cv/default.nix index 787cd4153..09a559b19 100644 --- a/python/pkgs/ms-cv/default.nix +++ b/python/pkgs/ms-cv/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ms-cv"; version = "0.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "OpenXbox"; repo = "ms_cv"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0pkna0kvmq1cp4rx3dnzxsvvlxxngryp77k42wkyw2phv19a2mjd"; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace "pytest-runner" "" @@ -29,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/OpenXbox/ms_cv"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/msal-extensions/default.nix b/python/pkgs/msal-extensions/default.nix index af696b046..5e3e71939 100644 --- a/python/pkgs/msal-extensions/default.nix +++ b/python/pkgs/msal-extensions/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "msal-extensions"; version = "1.3.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AzureAD"; repo = "microsoft-authentication-extensions-for-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LRopszB8+8N9EajSmZvz0MTomp/qWZ5O3q00AHimZbY="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/AzureAD/microsoft-authentication-extensions-for-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/msal/default.nix b/python/pkgs/msal/default.nix index 5f08ba086..0dfed24b2 100644 --- a/python/pkgs/msal/default.nix +++ b/python/pkgs/msal/default.nix @@ -27,8 +27,6 @@ buildPythonPackage (finalAttrs: { ] ++ pyjwt.optional-dependencies.crypto; - doCheck = false; - pythonImportsCheck = [ "msal" ]; meta = { diff --git a/python/pkgs/mscerts/default.nix b/python/pkgs/mscerts/default.nix index a019ffb72..933385a41 100644 --- a/python/pkgs/mscerts/default.nix +++ b/python/pkgs/mscerts/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { # extras_require contains signify -> circular dependency # Module has no tests - doCheck = false; pythonImportsCheck = [ "mscerts" ]; diff --git a/python/pkgs/msg-parser/default.nix b/python/pkgs/msg-parser/default.nix index 5a02fd6be..fe470810f 100644 --- a/python/pkgs/msg-parser/default.nix +++ b/python/pkgs/msg-parser/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, # dependencies olefile, # test dependencies @@ -13,7 +15,7 @@ let in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "vikramarsid"; @@ -22,7 +24,9 @@ buildPythonPackage { hash = "sha256-srDk6w8nzt0dyGCFQWfVCnKb4LawHoqoHX6d1l1dAmM="; }; - propagatedBuildInputs = [ olefile ]; + build-system = [ setuptools ]; + + dependencies = [ olefile ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/python/pkgs/msgpack-numpy-opentensor/default.nix b/python/pkgs/msgpack-numpy-opentensor/default.nix index 7cc9d5877..763eef6d0 100644 --- a/python/pkgs/msgpack-numpy-opentensor/default.nix +++ b/python/pkgs/msgpack-numpy-opentensor/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "0.5.0"; pyproject = true; - __structuredAttrs = true; - # The GitHub repo does not tag the same releases as PyPi, so we use PyPi directly instead. src = fetchPypi { inherit (finalAttrs) pname version; diff --git a/python/pkgs/msgpack-numpy/default.nix b/python/pkgs/msgpack-numpy/default.nix index 35a377160..ac37e7587 100644 --- a/python/pkgs/msgpack-numpy/default.nix +++ b/python/pkgs/msgpack-numpy/default.nix @@ -2,25 +2,29 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, cython, msgpack, numpy, python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "msgpack-numpy"; version = "0.4.8"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xmfTGAUTQi+cdUW+XuxdKW3Ls1fgb3LtOcxoN5dVbmk="; }; + build-system = [ setuptools ]; + buildInputs = [ cython ]; - propagatedBuildInputs = [ + dependencies = [ msgpack numpy ]; @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/lebedov/msgpack-numpy"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/msgpack/default.nix b/python/pkgs/msgpack/default.nix index 20b4afdec..7a54537a3 100644 --- a/python/pkgs/msgpack/default.nix +++ b/python/pkgs/msgpack/default.nix @@ -6,7 +6,7 @@ cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "msgpack"; version = "1.2.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MMrgG3NudNVvt7xlsn4vUSIEVRGl/BGmXnpus3keGF8="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/msgpack/msgpack-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/msgraph-core/default.nix b/python/pkgs/msgraph-core/default.nix index 1c86e8951..e2fce3f6e 100644 --- a/python/pkgs/msgraph-core/default.nix +++ b/python/pkgs/msgraph-core/default.nix @@ -9,7 +9,7 @@ microsoft-kiota-http, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "msgraph-core"; version = "1.5.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oF9ipN8jEMFeC4b0jGlNPQWsk8/dTAmLzS4R/xfXZfk="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/microsoftgraph/msgraph-sdk-python-core"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/msgraph-sdk/default.nix b/python/pkgs/msgraph-sdk/default.nix index 3b5c1983b..91d0a2b14 100644 --- a/python/pkgs/msgraph-sdk/default.nix +++ b/python/pkgs/msgraph-sdk/default.nix @@ -41,7 +41,6 @@ buildPythonPackage (finalAttrs: { ]; # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "msgraph" ]; diff --git a/python/pkgs/msgspec/default.nix b/python/pkgs/msgspec/default.nix index 5e6249929..d6f8f529f 100644 --- a/python/pkgs/msgspec/default.nix +++ b/python/pkgs/msgspec/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "msgspec"; version = "0.21.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jcrist"; repo = "msgspec"; - tag = version; + tag = finalAttrs.version; # Note that this hash changes after some time after release because they # use `$Format:%d$` in msgspec/_version.py, and GitHub produces different # tarballs depending on whether tagged commit is the last commit, see @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/jcrist/msgspec"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/msldap/default.nix b/python/pkgs/msldap/default.nix index 59c29283a..f6ff7b6f4 100644 --- a/python/pkgs/msldap/default.nix +++ b/python/pkgs/msldap/default.nix @@ -14,13 +14,13 @@ tabulate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "msldap"; version = "0.5.15"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uAJKLAVZFY7EB8tjFyAezINicki6ruzuXf1EGcp3Pj0="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/skelsec/msldap"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mslex/default.nix b/python/pkgs/mslex/default.nix index c2fba17f4..680026705 100644 --- a/python/pkgs/mslex/default.nix +++ b/python/pkgs/mslex/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mslex"; version = "1.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZByIfR09thDu4q83qOWr2j9wswBs39LQ0p3A0a4oqF0="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/smoofra/mslex"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/msmart-ng/default.nix b/python/pkgs/msmart-ng/default.nix index d69ac53f3..c25eff678 100644 --- a/python/pkgs/msmart-ng/default.nix +++ b/python/pkgs/msmart-ng/default.nix @@ -15,7 +15,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "msmart-ng"; version = "2026.8.1"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mill1000"; repo = "midea-msmart"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WiHUQgiRyrro6uFCfZCiozlF2jFdtdGZP+2ud8LzHGw="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "msmart-ng"; }; -} +}) diff --git a/python/pkgs/msrestazure/default.nix b/python/pkgs/msrestazure/default.nix index 04fe4a0f6..c86a31d54 100644 --- a/python/pkgs/msrestazure/default.nix +++ b/python/pkgs/msrestazure/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "msrestazure"; version = "0.6.4"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Azure"; repo = "msrestazure-for-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZZVZi0v1ucD2g5FpLaNhfNBf6Ab10fUEcEdkY4ELaEY="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ adal msrest ]; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mss/default.nix b/python/pkgs/mss/default.nix index e6a210a7a..40b5ec5cd 100644 --- a/python/pkgs/mss/default.nix +++ b/python/pkgs/mss/default.nix @@ -14,13 +14,13 @@ libx11, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mss"; version = "10.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cYK69+4WylaeKAQCi2q5vL9r5cRvwogIQPM7UTuctPg="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/BoboTiG/python-mss"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/msticpy/default.nix b/python/pkgs/msticpy/default.nix index 2bb7484bf..dc0b263bd 100644 --- a/python/pkgs/msticpy/default.nix +++ b/python/pkgs/msticpy/default.nix @@ -53,7 +53,6 @@ buildPythonPackage (finalAttrs: { pname = "msticpy"; version = "3.0.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "microsoft"; @@ -114,7 +113,6 @@ buildPythonPackage (finalAttrs: { ]; # Test requires network access - doCheck = false; pythonImportsCheck = [ "msticpy" ]; diff --git a/python/pkgs/mt-940/default.nix b/python/pkgs/mt-940/default.nix index d4b97dd8f..f4adffe16 100644 --- a/python/pkgs/mt-940/default.nix +++ b/python/pkgs/mt-940/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mt-940"; version = "4.30.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wolph"; repo = "mt940"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-t6FOMu+KcEib+TZAv5uVAzvrUSt/k/RQn28jpdAY5Y0="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/WoLpH/mt940"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mujson/default.nix b/python/pkgs/mujson/default.nix index 4a315822c..047d9d1b0 100644 --- a/python/pkgs/mujson/default.nix +++ b/python/pkgs/mujson/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mujson"; version = "1.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-J9nPGxDkLQje6AkL9cewNqmQ7Z+00TXBEr3p71E2cnE="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/mattgiles/mujson"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mullvad-api/default.nix b/python/pkgs/mullvad-api/default.nix index c6c860aa2..9b88334fc 100644 --- a/python/pkgs/mullvad-api/default.nix +++ b/python/pkgs/mullvad-api/default.nix @@ -2,24 +2,27 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mullvad-api"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "mullvad_api"; - inherit version; + inherit (finalAttrs) version; sha256 = "0r0hc2d6vky52hxdqxn37w0y42ddh1zal6zz2cvqlxamc53wbiv1"; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "mullvad_api" ]; meta = { @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/meichthys/mullvad-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mulpyplexer/default.nix b/python/pkgs/mulpyplexer/default.nix index 1e58ae6b2..cdb55efcc 100644 --- a/python/pkgs/mulpyplexer/default.nix +++ b/python/pkgs/mulpyplexer/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mulpyplexer"; version = "0.09"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-FE6em/ZtOYj2BULJ09TJSFdDj3kI9g5T9MHLFiL7vTA="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/zardus/mulpyplexer"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/multi-key-dict/default.nix b/python/pkgs/multi-key-dict/default.nix index 67c819896..983d6d099 100644 --- a/python/pkgs/multi-key-dict/default.nix +++ b/python/pkgs/multi-key-dict/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "multi_key_dict"; version = "2.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3uvewXqjChxDLLP0N+gfhiHhwFQqDAYXp09x4jLpk54="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Multi key dictionary implementation"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/multimethod/default.nix b/python/pkgs/multimethod/default.nix index 88fe767ff..3d087cf5d 100644 --- a/python/pkgs/multimethod/default.nix +++ b/python/pkgs/multimethod/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "multimethod"; version = "2.0.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "coady"; repo = "multimethod"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0En3NdLLmS/4bw0I3z9xxKa85tECi1rjmpZyxYuZk3w="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Multiple argument dispatching"; homepage = "https://coady.github.io/multimethod/"; - changelog = "https://github.com/coady/multimethod/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/coady/multimethod/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/multipart/default.nix b/python/pkgs/multipart/default.nix index 7f178054a..fa116fca1 100644 --- a/python/pkgs/multipart/default.nix +++ b/python/pkgs/multipart/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "multipart"; version = "2.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1gdlZ7SJJwJx2ewQPUBHRdoVAa1bcOOn8fB/ViPYKFA="; }; @@ -19,11 +19,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "multipart" ]; - doCheck = false; - meta = { description = "Parser for multipart/form-data"; homepage = "https://github.com/defnull/multipart"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/multipledispatch/default.nix b/python/pkgs/multipledispatch/default.nix index 2a8c232d8..6508fd087 100644 --- a/python/pkgs/multipledispatch/default.nix +++ b/python/pkgs/multipledispatch/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "multipledispatch"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XIOZFUZcaCBsPpxHM1eQghbCg4O0JTYeXRRFlL+Fp+A="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "Relatively sane approach to multiple dispatch in Python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/multiprocess/default.nix b/python/pkgs/multiprocess/default.nix index c358ec437..21465f89e 100644 --- a/python/pkgs/multiprocess/default.nix +++ b/python/pkgs/multiprocess/default.nix @@ -3,24 +3,27 @@ buildPythonPackage, dill, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "multiprocess"; version = "0.70.19"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "uqfoundation"; repo = "multiprocess"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dH6SWecBxBQYqLohCg1gPWu6cQ7iKtRmIet9UlDMkWs="; }; - propagatedBuildInputs = [ dill ]; + build-system = [ setuptools ]; + + dependencies = [ dill ]; # Python-version dependent tests - doCheck = false; pythonImportsCheck = [ "multiprocess" ]; @@ -29,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/uqfoundation/multiprocess"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/multiset/default.nix b/python/pkgs/multiset/default.nix index 8e8532c86..1147b5ef1 100644 --- a/python/pkgs/multiset/default.nix +++ b/python/pkgs/multiset/default.nix @@ -7,13 +7,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "multiset"; version = "3.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fFmnhihLnDOd9PIZ3LtM5fRNOsGyD5ImNsTXieic97U="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/wheerd/multiset"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/multivolumefile/default.nix b/python/pkgs/multivolumefile/default.nix index 20f0788fc..39d162862 100644 --- a/python/pkgs/multivolumefile/default.nix +++ b/python/pkgs/multivolumefile/default.nix @@ -8,7 +8,7 @@ pytest-timeout, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "multivolumefile"; version = "0.2.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromCodeberg { owner = "miurahr"; repo = "multivolume"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7gjfF7biQZOcph2dfwi2ouDn/uIYik/KBQ0k6u5Ne+Q="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://codeberg.org/miurahr/multivolume"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/munch/default.nix b/python/pkgs/munch/default.nix index 077859b47..9e4693d09 100644 --- a/python/pkgs/munch/default.nix +++ b/python/pkgs/munch/default.nix @@ -6,25 +6,23 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "munch"; version = "4.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VCyxUUYSYyFqTjfD/Zr8Ql/urziqowJc0qmB+ttCIjU="; }; - env.PBR_VERSION = version; + env.PBR_VERSION = finalAttrs.version; nativeBuildInputs = [ pbr setuptools ]; - doCheck = false; - pythonImportsCheck = [ "munch" ]; meta = { @@ -32,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/Infinidat/munch"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mung/default.nix b/python/pkgs/mung/default.nix index 0b8452c3e..6c95baa07 100644 --- a/python/pkgs/mung/default.nix +++ b/python/pkgs/mung/default.nix @@ -25,7 +25,7 @@ buildPythonPackage { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ lxml numpy scikit-image diff --git a/python/pkgs/munkres/default.nix b/python/pkgs/munkres/default.nix index ad5d9c83d..b4152473c 100644 --- a/python/pkgs/munkres/default.nix +++ b/python/pkgs/munkres/default.nix @@ -3,22 +3,26 @@ buildPythonPackage, fetchPypi, fetchpatch, + # build-system + setuptools, isPy3k, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "munkres"; version = "1.1.4"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "fc44bf3c3979dada4b6b633ddeeb8ffbe8388ee9409e4d4e8310c2da1792db03"; }; + build-system = [ setuptools ]; + patches = [ # Fixes test on 32-bit systems. # Remove if https://github.com/bmc/munkres/pull/41 is merged. @@ -35,4 +39,4 @@ buildPythonPackage rec { description = "Munkres algorithm for the Assignment Problem"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/murmurhash/default.nix b/python/pkgs/murmurhash/default.nix index a3bd819b3..fe041e2d9 100644 --- a/python/pkgs/murmurhash/default.nix +++ b/python/pkgs/murmurhash/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "murmurhash"; version = "1.0.15"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-WOKye3hH+eKm7fELR6jI3XCkcF9F3Mt792rq2s9WugE="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { buildInputs = [ cython ]; # No test - doCheck = false; pythonImportsCheck = [ "murmurhash" ]; @@ -35,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/murmurhash"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/muscima/default.nix b/python/pkgs/muscima/default.nix index 29ad76cd8..5ad7bb4d0 100644 --- a/python/pkgs/muscima/default.nix +++ b/python/pkgs/muscima/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lxml, matplotlib, numpy, @@ -24,9 +26,11 @@ buildPythonPackage { hash = "sha256-0mRLJATn+6dYswgDg2zs7RHKSvY4+gNt4SBHeF0G3Xg="; }; - format = "setuptools"; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + pyproject = true; + + dependencies = [ lxml numpy scikit-image diff --git a/python/pkgs/music-tag/default.nix b/python/pkgs/music-tag/default.nix index 1e06f2dd2..491050ac7 100644 --- a/python/pkgs/music-tag/default.nix +++ b/python/pkgs/music-tag/default.nix @@ -2,28 +2,31 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, mutagen, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "music-tag"; version = "0.4.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Cqtubu2o3w9TFuwtIZC9dFYbfgNWKrCRzo1Wh828//Y="; }; - propagatedBuildInputs = [ mutagen ]; + build-system = [ setuptools ]; - checkInputs = [ pytestCheckHook ]; + dependencies = [ mutagen ]; + + nativeCheckInputs = [ pytestCheckHook ]; enabledTestPaths = [ "test" ]; # Tests fail: ModuleNotFoundError: No module named '_test_common' - doCheck = false; pythonImportsCheck = [ "music_tag" ]; @@ -32,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/KristoforMaynard/music-tag"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/musicbrainzngs/default.nix b/python/pkgs/musicbrainzngs/default.nix index 7cbf682e9..d8a0e0304 100644 --- a/python/pkgs/musicbrainzngs/default.nix +++ b/python/pkgs/musicbrainzngs/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "musicbrainzngs"; version = "0.7.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-qxwBAP0LMFhS5l8u1BE8beEuaK/VUYaYe47Zfg+Y5ic="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://python-musicbrainzngs.readthedocs.org/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/mutagen/default.nix b/python/pkgs/mutagen/default.nix index 429761916..a539e7a42 100644 --- a/python/pkgs/mutagen/default.nix +++ b/python/pkgs/mutagen/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mutagen"; version = "1.48.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-j5Vjern28wXOxr0SlOGX3r4geZjj4GhZZWPHT4awoXM="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://mutagen.readthedocs.io"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/mutesync/default.nix b/python/pkgs/mutesync/default.nix index efe8d5aec..93195d2a8 100644 --- a/python/pkgs/mutesync/default.nix +++ b/python/pkgs/mutesync/default.nix @@ -4,25 +4,28 @@ async-timeout, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mutesync"; version = "0.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1lz3q3q9lw8qxxb8jyrak77v6hkxwi39akyx96j8hd5jjaq2k5qc"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp async-timeout ]; # Project has not published tests yet - doCheck = false; pythonImportsCheck = [ "mutesync" ]; @@ -31,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/currentoor/pymutesync"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/mutf8/default.nix b/python/pkgs/mutf8/default.nix index d2c8f0c1c..4b6819d71 100644 --- a/python/pkgs/mutf8/default.nix +++ b/python/pkgs/mutf8/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mutf8"; version = "1.1.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "TkTech"; repo = "mutf8"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Vtfdik+g2jnadslfthGXJWJidzR1BJibod10Wla6lSg="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/TkTech/mutf8"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mvg/default.nix b/python/pkgs/mvg/default.nix index b03fc9278..7ea768b13 100644 --- a/python/pkgs/mvg/default.nix +++ b/python/pkgs/mvg/default.nix @@ -32,7 +32,6 @@ buildPythonPackage (finalAttrs: { ]; # tests require network access - doCheck = false; pythonImportsCheck = [ "mvg" ]; diff --git a/python/pkgs/mwclient/default.nix b/python/pkgs/mwclient/default.nix index f22d8f748..06012e80b 100644 --- a/python/pkgs/mwclient/default.nix +++ b/python/pkgs/mwclient/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, mock, pytest-cov-stub, pytestCheckHook, @@ -11,19 +13,21 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.11.0"; pname = "mwclient"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mwclient"; repo = "mwclient"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-qnWVQEG1Ri0z4RYmmG/fxYrlIFFf/6PnP5Dnv0cZb5I="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests requests-oauthlib six @@ -43,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.mit; homepage = "https://github.com/mwclient/mwclient"; }; -} +}) diff --git a/python/pkgs/mwoauth/default.nix b/python/pkgs/mwoauth/default.nix index 702784ae0..0d5a761ef 100644 --- a/python/pkgs/mwoauth/default.nix +++ b/python/pkgs/mwoauth/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, oauthlib, pyjwt, requests, @@ -9,17 +11,19 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mwoauth"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IuNAPnSOcBRvjszBQw/lQsn5xP9nfv9CSlLmRPbY98U="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ oauthlib pyjwt requests @@ -29,7 +33,6 @@ buildPythonPackage rec { # PyPI source has no tests included # https://github.com/mediawiki-utilities/python-mwoauth/issues/44 - doCheck = false; pythonImportsCheck = [ "mwoauth" ]; @@ -38,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/mediawiki-utilities/python-mwoauth"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mwtypes/default.nix b/python/pkgs/mwtypes/default.nix index a2cb1f764..e905f9738 100644 --- a/python/pkgs/mwtypes/default.nix +++ b/python/pkgs/mwtypes/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mwtypes"; version = "0.4.0"; pyproject = true; src = fetchPypi { - inherit version pname; + inherit (finalAttrs) version pname; hash = "sha256-PgcGUk/27cAIvzfLvRoVX2vHOCab59m+4bciDPmtlW8="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/mediawiki-utilities/python-mwtypes"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/myfitnesspal/default.nix b/python/pkgs/myfitnesspal/default.nix index fb3dc3b9b..be9b436dd 100644 --- a/python/pkgs/myfitnesspal/default.nix +++ b/python/pkgs/myfitnesspal/default.nix @@ -18,13 +18,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "myfitnesspal"; version = "2.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eE807M8qFDlSMAcE+GFJyve1YfmlWmB3ML9VJhMUeIE="; }; @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ blessed browser-cookie3 cloudscraper @@ -74,4 +74,4 @@ buildPythonPackage rec { homepage = "https://github.com/coddingtonbear/python-myfitnesspal"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mygene/default.nix b/python/pkgs/mygene/default.nix index 53594013f..de8d8b621 100644 --- a/python/pkgs/mygene/default.nix +++ b/python/pkgs/mygene/default.nix @@ -10,7 +10,7 @@ pandas, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mygene"; version = "3.2.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "biothings"; repo = "mygene.py"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/KxlzOTbZTN5BA0PrJyivVFh4cLtW90/EFwczda61Tg="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/biothings/mygene.py"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mygpoclient/default.nix b/python/pkgs/mygpoclient/default.nix index 88b385716..c2e543320 100644 --- a/python/pkgs/mygpoclient/default.nix +++ b/python/pkgs/mygpoclient/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mygpoclient"; version = "1.10"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gpodder"; repo = "mygpoclient"; - tag = version; + tag = finalAttrs.version; hash = "sha256-g4iPw6i8Gy3kvIjHCyGLJNHNb+osaCmc46hIryrodi8="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/gpodder/mygpoclient"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/myhdl/default.nix b/python/pkgs/myhdl/default.nix index 6d3827ddb..97b432e99 100644 --- a/python/pkgs/myhdl/default.nix +++ b/python/pkgs/myhdl/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "myhdl"; version = "0.11.51"; pyproject = true; # No recent tags on GitHub src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nZEdYLRjk2rgS3byc4iu9oJazodnoNg63MBUMasGZiw="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://www.myhdl.org/"; license = lib.licenses.lgpl21; }; -} +}) diff --git a/python/pkgs/myhome/default.nix b/python/pkgs/myhome/default.nix index a3f826420..3008976a1 100644 --- a/python/pkgs/myhome/default.nix +++ b/python/pkgs/myhome/default.nix @@ -9,7 +9,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "myhome"; version = "0.2.1"; pyproject = true; @@ -17,13 +17,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "speijnik"; repo = "myhome"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DJzwvgvSA9Q0kpueUoQV64pdDDNA7WzGu7r+g5aqutk="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp python-dateutil urllib3 @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/speijnik/myhome"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/mypermobil/default.nix b/python/pkgs/mypermobil/default.nix index b768af912..d34886e08 100644 --- a/python/pkgs/mypermobil/default.nix +++ b/python/pkgs/mypermobil/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mypermobil"; version = "0.1.9"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Permobil-Software"; repo = "mypermobil"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-u/A+UcDXQvqwAaUkVVpj/w5BJn5Oocb5IAzTU0dIuyQ="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/Permobil-Software/mypermobil"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mypy-boto3/default.nix b/python/pkgs/mypy-boto3/default.nix index 894a11497..f36f9456b 100644 --- a/python/pkgs/mypy-boto3/default.nix +++ b/python/pkgs/mypy-boto3/default.nix @@ -27,7 +27,6 @@ let dependencies = [ boto3 ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "mypy_boto3_${toUnderscore serviceName}" ]; diff --git a/python/pkgs/mypy-extensions/default.nix b/python/pkgs/mypy-extensions/default.nix index c8b44609b..9bbc97dd8 100644 --- a/python/pkgs/mypy-extensions/default.nix +++ b/python/pkgs/mypy-extensions/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mypy-extensions"; version = "1.1.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python"; repo = "mypy_extensions"; - tag = version; + tag = finalAttrs.version; hash = "sha256-HNAFsWX4tU9hfZkKxLNJn1J+H3uTesQflbRPlo3GQ4k="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://www.mypy-lang.org"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mypy-protobuf/default.nix b/python/pkgs/mypy-protobuf/default.nix index 6193200c3..0d499b21c 100644 --- a/python/pkgs/mypy-protobuf/default.nix +++ b/python/pkgs/mypy-protobuf/default.nix @@ -32,7 +32,6 @@ buildPythonPackage (finalAttrs: { types-protobuf ]; - doCheck = false; # ModuleNotFoundError: No module named 'testproto' pythonImportsCheck = [ "mypy_protobuf" ]; passthru.tests.version = testers.testVersion { diff --git a/python/pkgs/mypy-protobuf_3_6/default.nix b/python/pkgs/mypy-protobuf_3_6/default.nix index 19b27f161..6adf16baf 100644 --- a/python/pkgs/mypy-protobuf_3_6/default.nix +++ b/python/pkgs/mypy-protobuf_3_6/default.nix @@ -34,8 +34,6 @@ buildPythonPackage (finalAttrs: { types-protobuf ]; - doCheck = false; # ModuleNotFoundError: No module named 'testproto' - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "mypy_protobuf" ]; diff --git a/python/pkgs/mypy/default.nix b/python/pkgs/mypy/default.nix index 414c6a644..3b2c69d56 100644 --- a/python/pkgs/mypy/default.nix +++ b/python/pkgs/mypy/default.nix @@ -33,7 +33,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mypy"; version = "2.1.0"; pyproject = true; @@ -44,7 +44,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python"; repo = "mypy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sm/pxQGxH5XuPH7B8i3fpp30KaFU9aSp6BT67UcDPvU="; }; @@ -107,7 +107,7 @@ buildPythonPackage rec { setuptools tomli ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.optional-dependencies; disabledTests = [ # A change to the base64 decoder in CPython 3.13.13 and 3.14.4 causes this @@ -148,4 +148,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "mypy"; }; -} +}) diff --git a/python/pkgs/mypy/extensions.nix b/python/pkgs/mypy/extensions.nix index a0e6ee6c8..7c94857ad 100644 --- a/python/pkgs/mypy/extensions.nix +++ b/python/pkgs/mypy/extensions.nix @@ -7,7 +7,7 @@ pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mypy-extensions"; version = "1.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python"; repo = "mypy_extensions"; - tag = version; + tag = finalAttrs.version; hash = "sha256-HNAFsWX4tU9hfZkKxLNJn1J+H3uTesQflbRPlo3GQ4k="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://www.mypy-lang.org"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mypyllant/default.nix b/python/pkgs/mypyllant/default.nix index d63963620..50115c83c 100644 --- a/python/pkgs/mypyllant/default.nix +++ b/python/pkgs/mypyllant/default.nix @@ -24,7 +24,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mypyllant"; version = "0.9.17"; pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "signalkraft"; repo = "myPyllant"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-C6/rCpY4Pn8j8dNo1mlz2GRzMBeMo9CZMitlmtuBRE0="; }; @@ -68,4 +68,4 @@ buildPythonPackage rec { homepage = "https://github.com/signalkraft/myPyllant"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/mysqlclient/default.nix b/python/pkgs/mysqlclient/default.nix index 6865151bb..77da3f371 100644 --- a/python/pkgs/mysqlclient/default.nix +++ b/python/pkgs/mysqlclient/default.nix @@ -2,14 +2,16 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, mariadb-connector-c, pkg-config, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mysqlclient"; version = "2.2.8"; - format = "setuptools"; + pyproject = true; nativeBuildInputs = [ pkg-config ]; @@ -17,13 +19,15 @@ buildPythonPackage rec { # Tests need a MySQL database src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jtIMVhWpFdpFG7MIx9AwZkik/ZooCbqVyZJpAAYwYZk="; }; + build-system = [ setuptools ]; + meta = { description = "Python interface to MySQL"; homepage = "https://github.com/PyMySQL/mysqlclient-python"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/myst-docutils/default.nix b/python/pkgs/myst-docutils/default.nix index 1ce4a28c6..b75dc2621 100644 --- a/python/pkgs/myst-docutils/default.nix +++ b/python/pkgs/myst-docutils/default.nix @@ -18,7 +18,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "myst-docutils"; version = "5.1.0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; repo = "MyST-Parser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fZ0ZrzGKQhH3h2BHaAz6gpiMLmgvkLOl4Gu2qROKQ8U="; }; @@ -73,4 +73,4 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/MyST-Parser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/myst-nb/default.nix b/python/pkgs/myst-nb/default.nix index 8b7fe0a0f..2955a3e4e 100644 --- a/python/pkgs/myst-nb/default.nix +++ b/python/pkgs/myst-nb/default.nix @@ -16,20 +16,20 @@ ipykernel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "myst-nb"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "myst_nb"; hash = "sha256-wUVZjeYkRqb9AJdz3QcaQNO3YQas54DeGr38aWH2FMI="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ importlib-metadata ipython jupyter-cache @@ -53,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/MyST-NB"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/myuplink/default.nix b/python/pkgs/myuplink/default.nix index 29963ed9e..088b2535a 100644 --- a/python/pkgs/myuplink/default.nix +++ b/python/pkgs/myuplink/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "myuplink"; version = "0.7.0"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pajzo"; repo = "myuplink"; - tag = version; + tag = finalAttrs.version; hash = "sha256-r06aap8FiRslRRgKKSH7vNzpoVn6rX8ZR0oQ0D68xDo="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace-fail "%%VERSION_NO%%" "${version}" + --replace-fail "%%VERSION_NO%%" "${finalAttrs.version}" ''; build-system = [ setuptools ]; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/pajzo/myuplink"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nagiosplugin/default.nix b/python/pkgs/nagiosplugin/default.nix index f8033d1ba..11b27e092 100644 --- a/python/pkgs/nagiosplugin/default.nix +++ b/python/pkgs/nagiosplugin/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, numpy, pytestCheckHook, twine, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nagiosplugin"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IxabBKI8StRBnvm3Zm1AH0jfMkez38P4dL4sFP0ttAE="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ twine ]; nativeCheckInputs = [ @@ -36,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/mpounsett/nagiosplugin"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/naked/default.nix b/python/pkgs/naked/default.nix index 324af119f..844344293 100644 --- a/python/pkgs/naked/default.nix +++ b/python/pkgs/naked/default.nix @@ -9,7 +9,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "naked"; version = "0.1.32"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chrissimpkins"; repo = "naked"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KhygnURFggvUTR9wwWtORtfQES8ANd5sIaCONvIhfRM="; }; @@ -34,7 +34,7 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ + dependencies = [ requests pyyaml ]; @@ -47,4 +47,4 @@ buildPythonPackage rec { downloadPage = "https://github.com/chrissimpkins/naked/tags"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/name-that-hash/default.nix b/python/pkgs/name-that-hash/default.nix index b1df50a54..1ba1ffdb6 100644 --- a/python/pkgs/name-that-hash/default.nix +++ b/python/pkgs/name-that-hash/default.nix @@ -7,7 +7,7 @@ rich, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "name-that-hash"; version = "1.11.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "HashPals"; repo = "name-that-hash"; - rev = version; + tag = finalAttrs.version; hash = "sha256-zOb4BS3zG1x8GLXAooqqvMOw0fNbw35JuRWOdGP26/8="; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ click rich ]; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/HashPals/Name-That-Hash"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/namedlist/default.nix b/python/pkgs/namedlist/default.nix index 6cab49800..f5c2df333 100644 --- a/python/pkgs/namedlist/default.nix +++ b/python/pkgs/namedlist/default.nix @@ -3,17 +3,21 @@ buildPythonPackage, fetchPypi, fetchpatch, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "namedlist"; version = "1.8"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NPifyZJZLICzmnCeE27c9B6hfyS6Mer4SjFKAsi5vO8="; }; + + build-system = [ setuptools ]; patches = [ # Deprecation warning using collections.abc, https://gitlab.com/ericvsmith/namedlist/-/merge_requests/1 (fetchpatch { @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/ericvsmith/namedlist"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/nameko/default.nix b/python/pkgs/nameko/default.nix index 1d956599d..65f30cc19 100644 --- a/python/pkgs/nameko/default.nix +++ b/python/pkgs/nameko/default.nix @@ -18,13 +18,13 @@ wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nameko"; version = "2.14.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-J1NXi7Tca5KAGuozTSkwuX37dEhucF7daRmDBqlGjIg="; }; @@ -51,7 +51,6 @@ buildPythonPackage rec { # tests depend on RabbitMQ being installed - https://nameko.readthedocs.io/en/stable/contributing.html#running-the-tests # and most of the tests are network based - doCheck = false; pythonImportsCheck = [ "nameko" ]; @@ -61,4 +60,4 @@ buildPythonPackage rec { homepage = "https://www.nameko.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/nameparser/default.nix b/python/pkgs/nameparser/default.nix index d10d16a3f..2c6f1581b 100644 --- a/python/pkgs/nameparser/default.nix +++ b/python/pkgs/nameparser/default.nix @@ -6,13 +6,13 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nameparser"; version = "2.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-EyDHOIYvwXC1oU+plv8QMnfl+HoU2h1C3cJU1w+7ZJE="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/derek73/python-nameparser"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/names/default.nix b/python/pkgs/names/default.nix index 3375d6957..f21153a8e 100644 --- a/python/pkgs/names/default.nix +++ b/python/pkgs/names/default.nix @@ -1,24 +1,28 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lib, # pythonPackages pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "names"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "treyhunner"; repo = "names"; - rev = version; + tag = finalAttrs.version; sha256 = "0jfn11bl05k3qkqw0f4vi2i2lhllxdrbb1732qiisdy9fbvv8611"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' @@ -31,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/treyhunner/names"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/namex/default.nix b/python/pkgs/namex/default.nix index 77a7d51eb..2166858d0 100644 --- a/python/pkgs/namex/default.nix +++ b/python/pkgs/namex/default.nix @@ -5,20 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "namex"; version = "0.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-EX8DzNMCzEjj9cWKKWg49ricg0VauGg6HoXypDCqQwY="; }; build-system = [ setuptools ]; # No tests - doCheck = false; pythonImportsCheck = [ "namex" ]; @@ -27,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/fchollet/namex"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/nanoid/default.nix b/python/pkgs/nanoid/default.nix index 4968d5884..d62be37f9 100644 --- a/python/pkgs/nanoid/default.nix +++ b/python/pkgs/nanoid/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nanoid"; version = "2.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-WoDK1enG6a46Qfovs0rhiffLQgsqXY+CvZ0jRm5O+mg="; }; build-system = [ setuptools ]; - doCheck = false; # tests not in sdist, git not tagged - pythonImportsCheck = [ "nanoid" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/puyuan/py-nanoid"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nanoleaf/default.nix b/python/pkgs/nanoleaf/default.nix index c0e7bd321..6b2ac5eb6 100644 --- a/python/pkgs/nanoleaf/default.nix +++ b/python/pkgs/nanoleaf/default.nix @@ -6,20 +6,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nanoleaf"; version = "0.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GmnwW/IleBlvsGj1YwSPZrOho9uVlWeNzpZX6VbstZ0="; }; prePatch = '' sed -i '/^gitVersion =/d' setup.py substituteInPlace setup.py \ - --replace-fail 'gitVersion' '"${version}"' + --replace-fail 'gitVersion' '"${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -27,7 +27,6 @@ buildPythonPackage rec { dependencies = [ requests ]; # Module has no test - doCheck = false; pythonImportsCheck = [ "nanoleaf" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/software-2/nanoleaf"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nanotime/default.nix b/python/pkgs/nanotime/default.nix index 89f3229c6..ca641829c 100644 --- a/python/pkgs/nanotime/default.nix +++ b/python/pkgs/nanotime/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nanotime"; version = "0.5.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-x8wjH8X220AbRI16tRyW0KRzP0tp+r5Wmldvif/flms="; }; @@ -19,7 +19,6 @@ buildPythonPackage rec { # Tests currently failing # https://github.com/jbenet/nanotime/issues/2 - doCheck = false; pythonImportsCheck = [ "nanotime" ]; @@ -28,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/jbenet/nanotime/tree/master/python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/napari-plugin-engine/default.nix b/python/pkgs/napari-plugin-engine/default.nix index b1e95c3d3..ec5a614fa 100644 --- a/python/pkgs/napari-plugin-engine/default.nix +++ b/python/pkgs/napari-plugin-engine/default.nix @@ -24,7 +24,6 @@ buildPythonPackage (finalAttrs: { ]; # Circular dependency: napari - doCheck = false; pythonImportsCheck = [ "napari_plugin_engine" ]; diff --git a/python/pkgs/narwhals/default.nix b/python/pkgs/narwhals/default.nix index d63415638..7ddb5042b 100644 --- a/python/pkgs/narwhals/default.nix +++ b/python/pkgs/narwhals/default.nix @@ -10,7 +10,7 @@ rich, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "narwhals"; version = "2.16.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "narwhals-dev"; repo = "narwhals"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-k7CeM8Q4JgKbkLisAaVrljro4diOf0K0immek6AI0vM="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/narwhals-dev/narwhals"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nasdaq-data-link/default.nix b/python/pkgs/nasdaq-data-link/default.nix index 7efca0364..29f99d1d5 100644 --- a/python/pkgs/nasdaq-data-link/default.nix +++ b/python/pkgs/nasdaq-data-link/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, inflection, more-itertools, numpy, @@ -11,19 +13,21 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nasdaq-data-link"; version = "1.0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Nasdaq"; repo = "data-link-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Q3Ay9FpJsvSVu0WU2bxFyo3ODKP/ZUo3SqsBtOGrIIE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ inflection more-itertools numpy @@ -40,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/Nasdaq/data-link-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nats-python/default.nix b/python/pkgs/nats-python/default.nix index d299a8bce..04220b202 100644 --- a/python/pkgs/nats-python/default.nix +++ b/python/pkgs/nats-python/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nats-python"; version = "0.8.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Gr1N"; repo = "nats-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7/AGQfPEuSeoRGUXeyDZNbLhapfQa7vhrSPHRruf+sg="; }; @@ -33,7 +33,6 @@ buildPythonPackage rec { dependencies = [ setuptools ]; # Tests require a running NATS server - doCheck = false; pythonImportsCheck = [ "pynats" ]; @@ -42,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/Gr1N/nats-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/natsort/default.nix b/python/pkgs/natsort/default.nix index a39b0a9e8..5328cc0d1 100644 --- a/python/pkgs/natsort/default.nix +++ b/python/pkgs/natsort/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "natsort"; version = "8.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RTEsSg5VB1k9oZPe3QSrsUaSU7YB7K9jRFrYDwoepYE="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Natural sorting for Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/natural/default.nix b/python/pkgs/natural/default.nix index 606ecdaf7..021f27d15 100644 --- a/python/pkgs/natural/default.nix +++ b/python/pkgs/natural/default.nix @@ -6,7 +6,7 @@ six, django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "natural"; version = "0.2.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tehmaze"; repo = "natural"; - tag = version; + tag = finalAttrs.version; hash = "sha256-DERFKDGVUPcjYAxiTYWgWkPp+Myd/9CNytQWgRya570="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/tehmaze/natural"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/naturalsort/default.nix b/python/pkgs/naturalsort/default.nix index 8bc0b09b8..6e1dce7ef 100644 --- a/python/pkgs/naturalsort/default.nix +++ b/python/pkgs/naturalsort/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "naturalsort"; version = "1.5.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "xolox"; repo = "python-naturalsort"; - tag = version; + tag = finalAttrs.version; hash = "sha256-MBb8yCIs9DW77TKiV3qOHidt8/zi9m2dgyfB3xrdg3A="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/xolox/python-naturalsort"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nbclassic/default.nix b/python/pkgs/nbclassic/default.nix index 32e98b07c..3364225fb 100644 --- a/python/pkgs/nbclassic/default.nix +++ b/python/pkgs/nbclassic/default.nix @@ -11,13 +11,13 @@ notebook-shim, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nbclassic"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-c27FBIOlRIWXHbITvpIH405R/BRMeDQ2JbaZF0I2RLo="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/nbclassic"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/nbclient/default.nix b/python/pkgs/nbclient/default.nix index 14d5e2ec8..ba38e0dd2 100644 --- a/python/pkgs/nbclient/default.nix +++ b/python/pkgs/nbclient/default.nix @@ -10,7 +10,7 @@ }: let - nbclient = buildPythonPackage rec { + nbclient = buildPythonPackage (finalAttrs: { pname = "nbclient"; version = "0.11.0"; pyproject = true; @@ -18,7 +18,7 @@ let src = fetchFromGitHub { owner = "jupyter"; repo = "nbclient"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-otKmurWifkLnu6ZwzvopzNnsksodS0jACjrRsxc3dIE="; }; @@ -32,13 +32,12 @@ let ]; # circular dependencies if enabled by default - doCheck = false; meta = { homepage = "https://github.com/jupyter/nbclient"; description = "Client library for executing notebooks"; mainProgram = "jupyter-execute"; license = lib.licenses.bsd3; }; - }; + }); in nbclient diff --git a/python/pkgs/nbconflux/default.nix b/python/pkgs/nbconflux/default.nix index d4de3a1e5..da80af7fe 100644 --- a/python/pkgs/nbconflux/default.nix +++ b/python/pkgs/nbconflux/default.nix @@ -13,7 +13,7 @@ versioneer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nbconflux"; version = "0.7.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vericast"; repo = "nbconflux"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kHIuboFKLVsu5zlZ0bM1BUoQR8f1l0XWcaaVI9bECJw="; }; @@ -65,4 +65,4 @@ buildPythonPackage rec { homepage = "https://github.com/Valassis-Digital-Media/nbconflux"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/nbconvert/default.nix b/python/pkgs/nbconvert/default.nix index 2b8b1adb0..2685acb09 100644 --- a/python/pkgs/nbconvert/default.nix +++ b/python/pkgs/nbconvert/default.nix @@ -18,13 +18,13 @@ traitlets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nbconvert"; version = "7.17.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NNDQp+c848urbFquj09Gh5coCwH9i9LKdG2oVp7d19I="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/nbconvert"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/nbdev/default.nix b/python/pkgs/nbdev/default.nix index 614894df1..06ab5add9 100644 --- a/python/pkgs/nbdev/default.nix +++ b/python/pkgs/nbdev/default.nix @@ -46,7 +46,6 @@ buildPythonPackage (finalAttrs: { ]; # no real tests - doCheck = false; pythonImportsCheck = [ "nbdev" ]; diff --git a/python/pkgs/nbdime/default.nix b/python/pkgs/nbdime/default.nix index c9f4cfd8b..5f5ef2b65 100644 --- a/python/pkgs/nbdime/default.nix +++ b/python/pkgs/nbdime/default.nix @@ -25,13 +25,13 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nbdime"; version = "4.0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jNJez+61EF1WMjfX9k60dIBY+6m7qas4kqH/YeF3zhY="; }; @@ -90,4 +90,4 @@ buildPythonPackage rec { description = "Tools for diffing and merging of Jupyter notebooks"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/nbformat/default.nix b/python/pkgs/nbformat/default.nix index a13dc543b..5cadb7020 100644 --- a/python/pkgs/nbformat/default.nix +++ b/python/pkgs/nbformat/default.nix @@ -13,13 +13,13 @@ testpath, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nbformat"; version = "5.11.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-MtRSHGjG59WynHbe+u7Z9C6nMxQrmxn4gnfOEDkLnE0="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/nbsmoke/default.nix b/python/pkgs/nbsmoke/default.nix index 6fad4a040..c3b5fdea9 100644 --- a/python/pkgs/nbsmoke/default.nix +++ b/python/pkgs/nbsmoke/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytest, jupyter-client, ipykernel, @@ -11,17 +13,19 @@ pyflakes, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nbsmoke"; version = "0.6.1a1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-mIdr4mppQqKGBdlLwLECCvKgwYmGMY1zjq/gzV0urRQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pytest jupyter-client ipykernel @@ -32,7 +36,6 @@ buildPythonPackage rec { ]; # tests not included with pypi release - doCheck = false; pythonImportsCheck = [ "nbsmoke" ]; meta = { @@ -40,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyviz/nbsmoke"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/nbsphinx/default.nix b/python/pkgs/nbsphinx/default.nix index 5ecbd436d..7ead0b19f 100644 --- a/python/pkgs/nbsphinx/default.nix +++ b/python/pkgs/nbsphinx/default.nix @@ -12,13 +12,13 @@ traitlets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nbsphinx"; version = "0.9.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0HZZCDmajuK1e+euiBzy6ljWbbOve78z5utI+DvqVJU="; }; @@ -37,7 +37,6 @@ buildPythonPackage rec { ]; # The package has not tests - doCheck = false; env.JUPYTER_PATH = "${nbconvert}/share/jupyter"; @@ -48,4 +47,4 @@ buildPythonPackage rec { homepage = "https://nbsphinx.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nbtlib/default.nix b/python/pkgs/nbtlib/default.nix index acc733a46..ee502ea8f 100644 --- a/python/pkgs/nbtlib/default.nix +++ b/python/pkgs/nbtlib/default.nix @@ -6,7 +6,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nbtlib"; version = "2.0.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vberlier"; repo = "nbtlib"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-L8eX6/0qiQ4UxbmDicLedzj+oBjYmlK96NpljE/A3eI="; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; pythonImportsCheck = [ "nbtlib" ]; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/vberlier/nbtlib"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nbval/default.nix b/python/pkgs/nbval/default.nix index de3aa0ff0..8f42b897d 100644 --- a/python/pkgs/nbval/default.nix +++ b/python/pkgs/nbval/default.nix @@ -14,13 +14,13 @@ sympy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nbval"; version = "0.11.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-d8lXl2B7CpaLq9JZfuNJQQLSXDrTdDXeu9rA5G43kJQ="; }; @@ -66,4 +66,4 @@ buildPythonPackage rec { homepage = "https://github.com/computationalmodelling/nbval"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/nc-dnsapi/default.nix b/python/pkgs/nc-dnsapi/default.nix index b1eec6151..b70644bf5 100644 --- a/python/pkgs/nc-dnsapi/default.nix +++ b/python/pkgs/nc-dnsapi/default.nix @@ -2,31 +2,34 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nc-dnsapi"; version = "0.1.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "nbuchwitz"; repo = "nc_dnsapi"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OE4+wJbJbUZ+YB5J5OyvytLFCcrnXCeZEqmphHKKprQ="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; pythonImportsCheck = [ "nc_dnsapi" ]; # no tests - doCheck = false; meta = { description = "API wrapper for the netcup DNS api"; homepage = "https://github.com/nbuchwitz/nc_dnsapi"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/ncclient/default.nix b/python/pkgs/ncclient/default.nix index bf1ae11b4..c819bdb7e 100644 --- a/python/pkgs/ncclient/default.nix +++ b/python/pkgs/ncclient/default.nix @@ -8,7 +8,7 @@ paramiko, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ncclient"; version = "0.7.1"; pyproject = true; @@ -16,14 +16,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ncclient"; repo = "ncclient"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; # Upstream uses .gitattributes to inject information about the revision # hash and the refname into `ncclient/_version.py`, see: # # - https://git-scm.com/docs/gitattributes#_export_subst and # - https://github.com/ncclient/ncclient/blob/e056e38af2843de0608da58e2f4662465c96d587/ncclient/_version.py#L25-L28 postFetch = '' - sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/ncclient/_version.py + sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${finalAttrs.src.tag})"/' $out/ncclient/_version.py ''; hash = "sha256-A1e1YE+RW6mkuhF9eEUPiMiKw3YuHqA+4pNqJpYtAJU="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/ncclient/ncclient"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/nclib/default.nix b/python/pkgs/nclib/default.nix index b4ce504aa..ae33526f3 100644 --- a/python/pkgs/nclib/default.nix +++ b/python/pkgs/nclib/default.nix @@ -5,20 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nclib"; version = "1.0.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IVnWqHpoYF5bzek0aWWiKtlWiUaX1jcZq+DfLK0FGoI="; }; build-system = [ setuptools ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "nclib" ]; @@ -28,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "serve-stdio"; }; -} +}) diff --git a/python/pkgs/ndeflib/default.nix b/python/pkgs/ndeflib/default.nix index 79b7e9099..3694ef354 100644 --- a/python/pkgs/ndeflib/default.nix +++ b/python/pkgs/ndeflib/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ndeflib"; version = "0.3.3"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nfcpy"; repo = "ndeflib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cpfztE+/AW7P0J7QeTDfVGYc2gEkr7gzA352hC9bdTM="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Python package for parsing and generating NFC Data Exchange Format messages"; homepage = "https://github.com/nfcpy/ndeflib"; - changelog = "https://github.com/nfcpy/ndeflib/releases/tag/v${version}"; + changelog = "https://github.com/nfcpy/ndeflib/releases/tag/v${finalAttrs.version}"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/ndg-httpsclient/default.nix b/python/pkgs/ndg-httpsclient/default.nix index c461682ae..8d5f35425 100644 --- a/python/pkgs/ndg-httpsclient/default.nix +++ b/python/pkgs/ndg-httpsclient/default.nix @@ -2,29 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pyasn1, pyopenssl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.5.1"; - format = "setuptools"; + pyproject = true; pname = "ndg-httpsclient"; src = fetchFromGitHub { owner = "cedadev"; repo = "ndg_httpsclient"; - rev = version; + tag = finalAttrs.version; sha256 = "0lhsgs4am4xyjssng5p0vkfwqncczj1dpa0vss4lrhzq86mnn5rz"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyasn1 pyopenssl ]; # uses networking - doCheck = false; meta = { homepage = "https://github.com/cedadev/ndg_httpsclient/"; @@ -32,4 +35,4 @@ buildPythonPackage rec { mainProgram = "ndg_httpclient"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/ndindex/default.nix b/python/pkgs/ndindex/default.nix index e8d707dcb..3d9eb7e33 100644 --- a/python/pkgs/ndindex/default.nix +++ b/python/pkgs/ndindex/default.nix @@ -17,7 +17,7 @@ sympy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ndindex"; version = "1.10.1"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Quansight-Labs"; repo = "ndindex"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rjhCysdhLCAofob7yUL7s65hMju13uotrzJ+aY0stzI="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/Quansight-Labs/ndindex"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ndjson/default.nix b/python/pkgs/ndjson/default.nix index 13d557856..af36d0bab 100644 --- a/python/pkgs/ndjson/default.nix +++ b/python/pkgs/ndjson/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytestCheckHook, six, watchdog, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ndjson"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner', " "" @@ -35,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/rhgrant10/ndjson"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/ndspy/default.nix b/python/pkgs/ndspy/default.nix index c83631ca1..211a02961 100644 --- a/python/pkgs/ndspy/default.nix +++ b/python/pkgs/ndspy/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ndspy"; version = "4.2.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "RoadrunnerWMC"; repo = "ndspy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PQONVEuh5Fg2LHr4gq0XTGcOpps/s9FSgoyDn4BCcik="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ndspy" ]; @@ -30,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/RoadrunnerWMC/ndspy"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/nebula3-python/default.nix b/python/pkgs/nebula3-python/default.nix index ee421c0d9..27d2ebd3a 100644 --- a/python/pkgs/nebula3-python/default.nix +++ b/python/pkgs/nebula3-python/default.nix @@ -11,7 +11,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nebula3-python"; version = "5.2.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vesoft-inc"; repo = "nebula-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WVbLywb/uVHWjtzXHSSlvBUwFz0p3VtiYwAl/0CcMDw="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/vesoft-inc/nebula-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/nemosis/default.nix b/python/pkgs/nemosis/default.nix index 6f6db368a..0176cad97 100644 --- a/python/pkgs/nemosis/default.nix +++ b/python/pkgs/nemosis/default.nix @@ -38,7 +38,6 @@ buildPythonPackage (finalAttrs: { ]; pythonImportsCheck = [ "nemosis" ]; - doCheck = false; # require network and patching meta = { description = "Downloader of historical data published by the Australian Energy Market Operator"; diff --git a/python/pkgs/neo/default.nix b/python/pkgs/neo/default.nix index 880f6fe0d..9f44d6748 100644 --- a/python/pkgs/neo/default.nix +++ b/python/pkgs/neo/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "neo"; version = "0.14.5"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NeuralEnsemble"; repo = "python-neo"; - tag = version; + tag = finalAttrs.version; hash = "sha256-IB+RuQBJTu0Ss7PLdBpONBl50xdTiR512ni+w3Z+DEM="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://neuralensemble.org/neo/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/neo4j/default.nix b/python/pkgs/neo4j/default.nix index 219215118..9dfc3e796 100644 --- a/python/pkgs/neo4j/default.nix +++ b/python/pkgs/neo4j/default.nix @@ -41,7 +41,6 @@ buildPythonPackage (finalAttrs: { }; # Missing dependencies - doCheck = false; pythonImportsCheck = [ "neo4j" ]; diff --git a/python/pkgs/neoteroi-mkdocs/default.nix b/python/pkgs/neoteroi-mkdocs/default.nix index 1bab810e6..f4d3d1918 100644 --- a/python/pkgs/neoteroi-mkdocs/default.nix +++ b/python/pkgs/neoteroi-mkdocs/default.nix @@ -14,7 +14,7 @@ setuptools, stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "neoteroi-mkdocs"; version = "1.2.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Neoteroi"; repo = "mkdocs-plugins"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-l5jJCmsBns1bGv+yBA0R6TDlfQuweFr92kNnQalWB7k="; }; @@ -34,7 +34,7 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ + dependencies = [ essentials-openapi click jinja2 @@ -61,4 +61,4 @@ buildPythonPackage rec { description = "Plugins for MkDocs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nest-asyncio/default.nix b/python/pkgs/nest-asyncio/default.nix index bedd643b0..ef3e60982 100644 --- a/python/pkgs/nest-asyncio/default.nix +++ b/python/pkgs/nest-asyncio/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nest-asyncio"; version = "1.6.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "erdewit"; repo = "nest_asyncio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5I5WItOl1QpyI4OXZgZf8GiQ7Jlo+SJbDicIbernaU4="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/erdewit/nest_asyncio"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/nested-lookup/default.nix b/python/pkgs/nested-lookup/default.nix index 7ddd46762..e839f7c0c 100644 --- a/python/pkgs/nested-lookup/default.nix +++ b/python/pkgs/nested-lookup/default.nix @@ -1,22 +1,26 @@ { buildPythonPackage, fetchPypi, + # build-system + setuptools, lib, pytestCheckHook, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nested-lookup"; version = "0.2.25"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-b6gydIyQOB8ikdhQgJ4ySSUZ7l8lPWpay8Kdk37KAug="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -27,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/russellballestrini/nested-lookup"; license = lib.licenses.publicDomain; }; -} +}) diff --git a/python/pkgs/nested-multipart-parser/default.nix b/python/pkgs/nested-multipart-parser/default.nix index 9a9993a84..84d6de11d 100644 --- a/python/pkgs/nested-multipart-parser/default.nix +++ b/python/pkgs/nested-multipart-parser/default.nix @@ -12,7 +12,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nested-multipart-parser"; version = "1.6.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "remigermain"; repo = "nested-multipart-parser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FFALem8Y43tKL32VSZE1pIlOKEPh5Ryzbu509Xjd+VY="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/remigermain/nested-multipart-parser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/netaddr/default.nix b/python/pkgs/netaddr/default.nix index 711974956..2bce28aac 100644 --- a/python/pkgs/netaddr/default.nix +++ b/python/pkgs/netaddr/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netaddr"; version = "1.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XDw9mJW1Ubdjd5un23oDSH3B+OOzha+BmvNBrp725Io="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { downloadPage = "https://github.com/netaddr/netaddr/releases"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/netapp-lib/default.nix b/python/pkgs/netapp-lib/default.nix index 4cc0cbce5..10564277f 100644 --- a/python/pkgs/netapp-lib/default.nix +++ b/python/pkgs/netapp-lib/default.nix @@ -2,29 +2,32 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, lxml, six, xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netapp-lib"; version = "2021.6.25"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1g4FCSMyS8T6F/T8BOqak4h1nJis8g9jaOluA4FTNpA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ lxml six xmltodict ]; # no tests in sdist and no other download available - doCheck = false; pythonImportsCheck = [ "netapp_lib" ]; @@ -33,4 +36,4 @@ buildPythonPackage rec { homepage = "https://netapp.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/netapp-ontap/default.nix b/python/pkgs/netapp-ontap/default.nix index b58c98e12..3117f493f 100644 --- a/python/pkgs/netapp-ontap/default.nix +++ b/python/pkgs/netapp-ontap/default.nix @@ -10,14 +10,14 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netapp-ontap"; version = "9.19.1.0"; pyproject = true; src = fetchPypi { pname = "netapp_ontap"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-YFAY1LBXiZGIlKzex6vtQHi1QN7j9YHHwNar5in8uxo="; }; @@ -37,7 +37,6 @@ buildPythonPackage rec { ]; # No tests in sdist and no other download available - doCheck = false; pythonImportsCheck = [ "netapp_ontap" ]; @@ -47,4 +46,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "ontap-cli"; }; -} +}) diff --git a/python/pkgs/netdisco/default.nix b/python/pkgs/netdisco/default.nix index 72acbb0b5..0639f5c83 100644 --- a/python/pkgs/netdisco/default.nix +++ b/python/pkgs/netdisco/default.nix @@ -7,13 +7,13 @@ zeroconf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netdisco"; version = "3.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-TbtZBILzd8zEYeAXQnB8y+jx0tGyhXivkdybf+vNy9I="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant/netdisco"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/nethsm/default.nix b/python/pkgs/nethsm/default.nix index e89b323b2..d22249e42 100644 --- a/python/pkgs/nethsm/default.nix +++ b/python/pkgs/nethsm/default.nix @@ -12,7 +12,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nethsm"; version = "3.0.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Nitrokey"; repo = "nethsm-sdk-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kOZ/kNvYlnKi/ojv4b4ZGmNZqARZPAT0g12xi6gw39E="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://github.com/Nitrokey/nethsm-sdk-py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/netifaces-plus/default.nix b/python/pkgs/netifaces-plus/default.nix index d5772f041..cf98fea59 100644 --- a/python/pkgs/netifaces-plus/default.nix +++ b/python/pkgs/netifaces-plus/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netifaces-plus"; version = "0.12.5"; pyproject = true; src = fetchPypi { pname = "netifaces_plus"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ZCi9fUMjVW79Sw7GsxUiGHWBL4zytpUBxv2noJ63lSg="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/tsukumijima/netifaces-plus"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/netifaces/default.nix b/python/pkgs/netifaces/default.nix index ae9a1878e..c15df8d00 100644 --- a/python/pkgs/netifaces/default.nix +++ b/python/pkgs/netifaces/default.nix @@ -5,20 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netifaces"; version = "0.11.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BDp5FG6ykH7fQ5iZ8mKz3+QXF9NBJCmO0oETmouTyjI="; }; build-system = [ setuptools ]; # No tests implemented - doCheck = false; pythonImportsCheck = [ "netifaces" ]; @@ -27,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/al45tair/netifaces"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/netio/default.nix b/python/pkgs/netio/default.nix index 41e9fb27d..af3694221 100644 --- a/python/pkgs/netio/default.nix +++ b/python/pkgs/netio/default.nix @@ -7,7 +7,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netio"; version = "1.0.13"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "netioproducts"; repo = "PyNetio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-s/X2WGhQXYsbo+ZPpkVSF/vclaThYYNHu0UY0yCnfPA="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "pyopenssl" ]; - propagatedBuildInputs = [ + dependencies = [ requests pyopenssl ]; @@ -33,7 +33,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "Netio" ]; # Module has no tests - doCheck = false; meta = { description = "Module for interacting with NETIO devices"; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/netioproducts/PyNetio"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/netmiko/default.nix b/python/pkgs/netmiko/default.nix index 47248a227..c86887b82 100644 --- a/python/pkgs/netmiko/default.nix +++ b/python/pkgs/netmiko/default.nix @@ -13,13 +13,13 @@ textfsm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netmiko"; version = "4.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lM97/l2u0dBYREzhY34QF33yL5A2g6U9H77kdVNIjGU="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/ktbyers/netmiko/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/networkx/default.nix b/python/pkgs/networkx/default.nix index 73496776e..8f67eff6e 100644 --- a/python/pkgs/networkx/default.nix +++ b/python/pkgs/networkx/default.nix @@ -15,13 +15,13 @@ sympy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "networkx"; version = "3.6.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JrfDV6zMDIzeVYrUhig3KLZbapXYXuHNZrr6tMgWhQk="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/neurio/default.nix b/python/pkgs/neurio/default.nix index e0b72fac9..cc2160075 100644 --- a/python/pkgs/neurio/default.nix +++ b/python/pkgs/neurio/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "neurio"; version = "0.3.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jordanh"; repo = "neurio-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Kyjx+76OR3fpA9p/Zg7S4/vuGuNU2kb022BijoNMSUI="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ requests ]; # Project has tests but they require actual API credentials - doCheck = false; pythonImportsCheck = [ "neurio" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/jordanh/neurio-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/neurokit2/default.nix b/python/pkgs/neurokit2/default.nix index 6a767309d..be5f8cfd7 100644 --- a/python/pkgs/neurokit2/default.nix +++ b/python/pkgs/neurokit2/default.nix @@ -26,7 +26,7 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "neurokit2"; version = "0.2.12"; pyproject = true; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "neuropsychology"; repo = "NeuroKit"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gn02l0vYl+/7hXp4gFVlgblxC4dewXckW3JL3wPC89Y="; }; @@ -105,4 +105,4 @@ buildPythonPackage rec { homepage = "https://github.com/neuropsychology/NeuroKit"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/newick/default.nix b/python/pkgs/newick/default.nix index 324975dcd..bae3fd670 100644 --- a/python/pkgs/newick/default.nix +++ b/python/pkgs/newick/default.nix @@ -7,7 +7,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "newick"; version = "1.9.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dlce-eva"; repo = "python-newick"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TxyR6RYvy2oIcDNZnHrExtPYGspyWOtZqNy488OmWwk="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/dlce-eva/python-newick"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/newspaper3k/default.nix b/python/pkgs/newspaper3k/default.nix index 6eefbc958..9b7407897 100644 --- a/python/pkgs/newspaper3k/default.nix +++ b/python/pkgs/newspaper3k/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, feedparser, requests, pillow, @@ -12,16 +14,18 @@ python-dateutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "newspaper3k"; version = "0.2.8"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nxvT4ftI9ADHFav4dcx7Cme33c2H9Qya7rj8u72QBPs="; }; + build-system = [ setuptools ]; + dependencies = [ feedparser requests @@ -40,4 +44,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/newspaper3k"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/newversion/default.nix b/python/pkgs/newversion/default.nix index 2357903cb..1baf5b211 100644 --- a/python/pkgs/newversion/default.nix +++ b/python/pkgs/newversion/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "newversion"; version = "3.1.0"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vemel"; repo = "newversion"; - tag = version; + tag = finalAttrs.version; hash = "sha256-R26yZQnQN/+e8XD3YKl+3bJKGnZaVzOVoTlGHOyratg="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ packaging typing-extensions ]; @@ -37,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "newversion"; }; -} +}) diff --git a/python/pkgs/nextcloudmonitor/default.nix b/python/pkgs/nextcloudmonitor/default.nix index ca665c491..d59a9fc90 100644 --- a/python/pkgs/nextcloudmonitor/default.nix +++ b/python/pkgs/nextcloudmonitor/default.nix @@ -6,7 +6,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nextcloudmonitor"; version = "1.6.0"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "meichthys"; repo = "nextcloud_monitor"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-748cDMxPjOQFKdSt1GrQqZHmPgz20HN1+lMzo2vMj6c="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail 'version="1.5.1"' 'version="${version}"' + --replace-fail 'version="1.5.1"' 'version="${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -28,7 +28,6 @@ buildPythonPackage rec { dependencies = [ requests ]; # no tests implemented - doCheck = false; pythonImportsCheck = [ "nextcloudmonitor" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/meichthys/nextcloud_monitor"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nexusrpc/default.nix b/python/pkgs/nexusrpc/default.nix index 5eaf7e240..30d9e1406 100644 --- a/python/pkgs/nexusrpc/default.nix +++ b/python/pkgs/nexusrpc/default.nix @@ -6,7 +6,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nexus-rpc"; version = "1.4.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nexus-rpc"; repo = "sdk-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-il+zCyU0dOlqFHGedyeBKgwQlqx1FLNuriGIw3RV3Gs="; fetchSubmodules = true; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://temporal.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nfcpy/default.nix b/python/pkgs/nfcpy/default.nix index 3012fef93..8c9e2e00a 100644 --- a/python/pkgs/nfcpy/default.nix +++ b/python/pkgs/nfcpy/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, libusb1, mock, ndeflib, @@ -12,19 +14,21 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nfcpy"; version = "1.0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "nfcpy"; repo = "nfcpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HFWOCiz6ISfxEeC6KPKNKGZoHvFjFGUn7QJWnwvJKYw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ libusb1 ndeflib pydes @@ -53,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/nfcpy/nfcpy"; license = lib.licenses.eupl11; }; -} +}) diff --git a/python/pkgs/nh3/default.nix b/python/pkgs/nh3/default.nix index f548e852f..f44c4bf77 100644 --- a/python/pkgs/nh3/default.nix +++ b/python/pkgs/nh3/default.nix @@ -12,7 +12,7 @@ let src = fetchFromGitHub { owner = "messense"; repo = "nh3"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-2D8ZLmVRA+SuMqeUsSXyY+0zlgqp7TSRyQuJMjmRVFk="; }; in diff --git a/python/pkgs/nhc/default.nix b/python/pkgs/nhc/default.nix index ec2a8b6bc..c28bf31dc 100644 --- a/python/pkgs/nhc/default.nix +++ b/python/pkgs/nhc/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nhc"; version = "0.8.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vandeurenglenn"; repo = "nhc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qSNpq21lEKZ0VVS2rN9OoDQymVGnqGCz6oeXjV1I20k="; }; @@ -22,11 +22,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "nhc" ]; # upstream has no test - doCheck = false; meta = { description = "SDK for Niko Home Control"; homepage = "https://github.com/vandeurenglenn/nhc"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/niapy/default.nix b/python/pkgs/niapy/default.nix index 9f1b9aae2..03d1aa5bc 100644 --- a/python/pkgs/niapy/default.nix +++ b/python/pkgs/niapy/default.nix @@ -11,7 +11,7 @@ pytest-xdist, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "niapy"; version = "2.7.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NiaOrg"; repo = "NiaPy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-g3B/jknzMIYP8VJayPktnYwq2WVA2KaCRS/ZzVwc88Q="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://niapy.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nice-go/default.nix b/python/pkgs/nice-go/default.nix index d62037866..7f88549b0 100644 --- a/python/pkgs/nice-go/default.nix +++ b/python/pkgs/nice-go/default.nix @@ -15,7 +15,7 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nice-go"; version = "1.0.3"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "IceBotYT"; repo = "nice-go"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KrsAs5aMkrhxv6PtFTm+8e0h2hAD/bc4ADam2jT2oAc="; }; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/IceBotYT/nice-go"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nidaqmx/default.nix b/python/pkgs/nidaqmx/default.nix index 5cdeccef3..5cda9cf76 100644 --- a/python/pkgs/nidaqmx/default.nix +++ b/python/pkgs/nidaqmx/default.nix @@ -19,7 +19,7 @@ tzlocal, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nidaqmx"; version = "1.4.0"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ni"; repo = "nidaqmx-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Khydb14+yJKWYcO4pROfbainXw3bHceXK5Gc9GCIYNo="; }; @@ -59,7 +59,6 @@ buildPythonPackage rec { }; # Tests require hardware - doCheck = false; pythonImportsCheck = [ "nidaqmx" ]; @@ -68,4 +67,4 @@ buildPythonPackage rec { homepage = "https://github.com/ni/nidaqmx-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/niluclient/default.nix b/python/pkgs/niluclient/default.nix index 2505d4d97..059a8b26e 100644 --- a/python/pkgs/niluclient/default.nix +++ b/python/pkgs/niluclient/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "niluclient"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "11ymn0cr4lchrcnf2xxlgljw223gwln01gxwr7mcgf95yc4006iq"; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "niluclient" ]; @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/hfurubotten/niluclient"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nimfa/default.nix b/python/pkgs/nimfa/default.nix index 043d8c56d..91d622342 100644 --- a/python/pkgs/nimfa/default.nix +++ b/python/pkgs/nimfa/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, isPy3k, numpy, scipy, @@ -9,17 +11,19 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nimfa"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; setuptools = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Oc/yuGhW0Dyoo9nDhZgDTs8adowyX9OnKLuerbjGuRk="; }; + build-system = [ setuptools ]; + dependencies = [ numpy scipy @@ -34,7 +38,7 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace-fail "import imp" "" \ --replace-fail "os.path.exists('.git')" "True" \ - --replace-fail "GIT_REVISION = git_version()" "GIT_REVISION = 'v${version}'" + --replace-fail "GIT_REVISION = git_version()" "GIT_REVISION = 'v${finalAttrs.version}'" ''; doCheck = !isPy3k; # https://github.com/marinkaz/nimfa/issues/42 @@ -44,4 +48,4 @@ buildPythonPackage rec { homepage = "http://nimfa.biolab.si"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/nine/default.nix b/python/pkgs/nine/default.nix index 0fb8752f9..add588a64 100644 --- a/python/pkgs/nine/default.nix +++ b/python/pkgs/nine/default.nix @@ -5,13 +5,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nine"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NSp9/hGVO39NEoqEeuAe50sdnfyVL4Lzyx8dvUHmbKk="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/nandoflorestan/nine"; license = lib.licenses.free; }; -} +}) diff --git a/python/pkgs/nipreps-versions/default.nix b/python/pkgs/nipreps-versions/default.nix index ea6107e7a..4319b2b16 100644 --- a/python/pkgs/nipreps-versions/default.nix +++ b/python/pkgs/nipreps-versions/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nipreps-versions"; version = "1.0.4"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nipreps"; repo = "version-schemes"; - tag = version; + tag = finalAttrs.version; hash = "sha256-B2wtLurzgk59kTooH51a2dewK7aEyA0dAm64Wp+tqhM="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ packaging ]; + dependencies = [ packaging ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "nipreps_versions" ]; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/nipreps/version-schemes"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/nixpkgs-pytools/default.nix b/python/pkgs/nixpkgs-pytools/default.nix index 7dcaeb3d6..a0ff909f4 100644 --- a/python/pkgs/nixpkgs-pytools/default.nix +++ b/python/pkgs/nixpkgs-pytools/default.nix @@ -26,7 +26,6 @@ buildPythonPackage (finalAttrs: { ]; # tests require network .. - doCheck = false; meta = { description = "Tools for removing the tedious nature of creating nixpkgs derivations"; diff --git a/python/pkgs/nkdfu/default.nix b/python/pkgs/nkdfu/default.nix index f7e03fc2a..f34341163 100644 --- a/python/pkgs/nkdfu/default.nix +++ b/python/pkgs/nkdfu/default.nix @@ -9,19 +9,19 @@ libusb1, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nkdfu"; version = "0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8l913dOCxHKFtpQ83p9RV3sUlu0oT5PVi14FSuYJ9fg="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ fire tqdm intelhex @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # no tests - doCheck = false; pythonImportsCheck = [ "nkdfu" ]; @@ -39,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Nitrokey/nkdfu"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/nlpcloud/default.nix b/python/pkgs/nlpcloud/default.nix index 96742329d..fb7ebf48d 100644 --- a/python/pkgs/nlpcloud/default.nix +++ b/python/pkgs/nlpcloud/default.nix @@ -6,13 +6,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nlpcloud"; version = "1.1.47"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zj6hurPEzNlbrD6trq+zQHBNg4lJMGw+XHV51rBa9Mk="; }; @@ -21,7 +21,6 @@ buildPythonPackage rec { dependencies = [ requests ]; # upstream has no tests - doCheck = false; pythonImportsCheck = [ "nlpcloud" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://nlpcloud.com/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nltk/default.nix b/python/pkgs/nltk/default.nix index dc6fc3ba3..2c7f202a3 100644 --- a/python/pkgs/nltk/default.nix +++ b/python/pkgs/nltk/default.nix @@ -3,6 +3,8 @@ buildPythonPackage, fetchPypi, fetchpatch, + # build-system + setuptools, click, defusedxml, joblib, @@ -10,16 +12,18 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nltk"; version = "3.10.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-u5MnpGHDgRwvpJAOA4QEAfISat+zDABygnxDO9JETqQ="; }; + build-system = [ setuptools ]; + patches = [ # https://github.com/nltk/nltk/security/advisories/GHSA-jm6w-m3j8-898g # https://github.com/nltk/nltk/security/advisories/GHSA-469j-vmhf-r6v7 @@ -41,4 +45,4 @@ buildPythonPackage rec { homepage = "http://nltk.org/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/nmapthon2/default.nix b/python/pkgs/nmapthon2/default.nix index 183246481..ace3e1e46 100644 --- a/python/pkgs/nmapthon2/default.nix +++ b/python/pkgs/nmapthon2/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nmapthon2"; version = "0.1.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "cblopez"; repo = "nmapthon2"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4Na75TdKDywUomJF4tDWUWwCCtcOSxBUMOF7+FDhbpY="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; enabledTestPaths = [ "tests/scanner_tests.py" ]; @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/cblopez/nmapthon2"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/noaa-coops/default.nix b/python/pkgs/noaa-coops/default.nix index 4c4f8dc55..25587020b 100644 --- a/python/pkgs/noaa-coops/default.nix +++ b/python/pkgs/noaa-coops/default.nix @@ -9,14 +9,14 @@ zeep, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "noaa-coops"; version = "0.4.0"; pyproject = true; src = fetchPypi { pname = "noaa_coops"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-m3hTzUspYTMukwcj3uBbRahTmXbL1aJVD9NXfjwghB8="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # The package does not include tests in the PyPI source distribution - doCheck = false; pythonImportsCheck = [ "noaa_coops" @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/GClunies/noaa_coops"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/nocaselist/default.nix b/python/pkgs/nocaselist/default.nix index 8a134eac6..147a4ea69 100644 --- a/python/pkgs/nocaselist/default.nix +++ b/python/pkgs/nocaselist/default.nix @@ -7,13 +7,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nocaselist"; version = "2.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ut4OlqEErI3a5JwmGqfCe1ro2UNGYcbNjsFvPNXGd6E="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/pywbem/nocaselist"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/node-semver/default.nix b/python/pkgs/node-semver/default.nix index 73acbe981..b2bec6f82 100644 --- a/python/pkgs/node-semver/default.nix +++ b/python/pkgs/node-semver/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "node-semver"; version = "0.9.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "podhmo"; repo = "python-node-semver"; - tag = version; + tag = finalAttrs.version; hash = "sha256-akeFBF0za4DjcYfR4/M06D5M19o+4xqfyuG74FPSDBU="; }; @@ -22,9 +22,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "nodesemver" ]; meta = { - changelog = "https://github.com/podhmo/python-node-semver/blob/${version}/CHANGES.txt"; + changelog = "https://github.com/podhmo/python-node-semver/blob/${finalAttrs.version}/CHANGES.txt"; description = "Port of node-semver"; homepage = "https://github.com/podhmo/python-semver"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nodeenv/default.nix b/python/pkgs/nodeenv/default.nix index 7c643cbe9..e34e37ff4 100644 --- a/python/pkgs/nodeenv/default.nix +++ b/python/pkgs/nodeenv/default.nix @@ -8,7 +8,7 @@ which, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nodeenv"; version = "1.10.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ekalinin"; repo = "nodeenv"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CosZOTWxXFGrc2ZvPPUwFcUv1blZhyl8MWPnoRCpBBo="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/ekalinin/nodeenv"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/nodepy-runtime/default.nix b/python/pkgs/nodepy-runtime/default.nix index 830b740be..a54adbdbf 100644 --- a/python/pkgs/nodepy-runtime/default.nix +++ b/python/pkgs/nodepy-runtime/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, localimport, pathlib2, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nodepy-runtime"; version = "2.1.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6tSsD76EpCZxkdulv1BcUZtIXGWLG6PuII25J8STygE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ localimport pathlib2 six @@ -43,4 +47,4 @@ buildPythonPackage rec { ''; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nodriver/default.nix b/python/pkgs/nodriver/default.nix index b92941fab..ad7931b26 100644 --- a/python/pkgs/nodriver/default.nix +++ b/python/pkgs/nodriver/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nodriver"; version = "0.50.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JMpojYZG74/61cjOZYBOXnZxp3mtJqJNdvZGXVZmxjE="; }; @@ -33,7 +33,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "nodriver" ]; # no tests in upstream - doCheck = false; meta = { homepage = "https://github.com/ultrafunkamsterdam/nodriver"; @@ -45,4 +44,4 @@ buildPythonPackage rec { hindered by annoying anti bot systems like Captcha / CloudFlare / Imperva / hCaptcha ''; }; -} +}) diff --git a/python/pkgs/noise/default.nix b/python/pkgs/noise/default.nix index 6c0d2485b..ef3130531 100644 --- a/python/pkgs/noise/default.nix +++ b/python/pkgs/noise/default.nix @@ -5,20 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "noise"; version = "1.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-V6J5dDZXQ5H/Y6ER6FLlOkFk7Nga0jY5ZBdDzRogm2U="; }; build-system = [ setuptools ]; # PyPI release don't contain tests - doCheck = false; pythonImportsCheck = [ "noise" ]; @@ -27,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/caseman/noise"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/noiseprotocol/default.nix b/python/pkgs/noiseprotocol/default.nix index c9bfd3cae..4df02c856 100644 --- a/python/pkgs/noiseprotocol/default.nix +++ b/python/pkgs/noiseprotocol/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "noiseprotocol"; version = "0.3.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "plizonczyk"; repo = "noiseprotocol"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VZkKNxeSxLhRDhrj4VKV/1eXl7RtcsnCHru5KC/OYNY="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/plizonczyk/noiseprotocol/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/noneprompt/default.nix b/python/pkgs/noneprompt/default.nix index 3d2cf807b..76744bf2f 100644 --- a/python/pkgs/noneprompt/default.nix +++ b/python/pkgs/noneprompt/default.nix @@ -6,13 +6,13 @@ prompt-toolkit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "noneprompt"; version = "0.1.11"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aCJpGPKhVDqjgMqtpcOArlyjj1cpInjFv9O3KJ8axts="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { dependencies = [ prompt-toolkit ]; # no test - doCheck = false; pythonImportsCheck = [ "noneprompt" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "noneprompt"; }; -} +}) diff --git a/python/pkgs/nonestorage/default.nix b/python/pkgs/nonestorage/default.nix index 53d84013a..381ae2210 100644 --- a/python/pkgs/nonestorage/default.nix +++ b/python/pkgs/nonestorage/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nonestorage"; version = "0.1.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nonebot"; repo = "nonestorage"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Y8Ywpp5/FRT8jIhSaMtuzMXs3UJROh5SrFdIZD7ysBA="; }; @@ -22,11 +22,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "nonestorage" ]; # no test - doCheck = false; meta = { description = "Simple library that provides local storage folder detect"; homepage = "https://github.com/nonebot/nonestorage"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nose2/default.nix b/python/pkgs/nose2/default.nix index 01e47f0ee..7c1927be1 100644 --- a/python/pkgs/nose2/default.nix +++ b/python/pkgs/nose2/default.nix @@ -14,13 +14,13 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nose2"; version = "0.16.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Gdta0g4mRQGo7mTj4VejdmpedEFw5Uzuy05coJsIZVo="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/nose-devs/nose2"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/nose2pytest/default.nix b/python/pkgs/nose2pytest/default.nix index 29f971df2..fffb72ea4 100644 --- a/python/pkgs/nose2pytest/default.nix +++ b/python/pkgs/nose2pytest/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "pytest-dev"; repo = "nose2pytest"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-BYyj2ZOZvWBpmzQACpmxAzCdQhlZlDYt+HLMdft+wYY="; }; @@ -42,7 +42,6 @@ buildPythonPackage { ]; # Tests depend on nose! - doCheck = false; pythonImportsCheck = [ "nose2pytest.assert_tools" ]; diff --git a/python/pkgs/notebook-shim/default.nix b/python/pkgs/notebook-shim/default.nix index 57fd49c9d..f31bb52f0 100644 --- a/python/pkgs/notebook-shim/default.nix +++ b/python/pkgs/notebook-shim/default.nix @@ -6,7 +6,7 @@ jupyter-server, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "notebook-shim"; version = "0.2.4"; pyproject = true; @@ -14,12 +14,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter"; repo = "notebook_shim"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CWnXOKE1xvr+a/qWNY6XCTB5+G/fg2O/glgeLzYD+Zc="; }; nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ jupyter-server ]; + dependencies = [ jupyter-server ]; # TODO: understand & possibly fix why tests fail. On github most testfiles # have been committed with msgs "wip" though. pythonImportsCheck = [ "notebook_shim" ]; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/notebook_shim"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/notebook/default.nix b/python/pkgs/notebook/default.nix index a76812056..8617253f4 100644 --- a/python/pkgs/notebook/default.nix +++ b/python/pkgs/notebook/default.nix @@ -20,7 +20,7 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "notebook"; version = "7.5.6"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter"; repo = "notebook"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xEwXiYQ7OiQ4dEL4ewP+yr3tGsWqa1hAUIl0Th48aiU="; }; @@ -48,7 +48,7 @@ buildPythonPackage rec { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_3.fetchYarnBerryDeps { - inherit src missingHashes; + inherit (finalAttrs) src missingHashes; hash = "sha256-BdoAtG7Dc+ZTBn4bCraAIazvXiZyvG5u97pcwvptjBY="; }; @@ -77,4 +77,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "jupyter-notebook"; }; -} +}) diff --git a/python/pkgs/notifications-android-tv/default.nix b/python/pkgs/notifications-android-tv/default.nix index 862d92b1f..29b737435 100644 --- a/python/pkgs/notifications-android-tv/default.nix +++ b/python/pkgs/notifications-android-tv/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "notifications-android-tv"; version = "1.2.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "engrbm87"; repo = "notifications_android_tv"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JUvxxVCiQtywAWU5AYnPm4SueIWIXkzLxPYveVXpc2E="; }; @@ -25,13 +25,12 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ httpx ]; + dependencies = [ httpx ]; pythonImportsCheck = [ "notifications_android_tv" ]; - nativeCheckInputs = [ pytestCheckHook ]; - - checkInputs = [ + nativeCheckInputs = [ + pytestCheckHook pytest-asyncio pytest-httpx ]; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/engrbm87/notifications_android_tv"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/notify-events/default.nix b/python/pkgs/notify-events/default.nix index 12040fb04..13c569697 100644 --- a/python/pkgs/notify-events/default.nix +++ b/python/pkgs/notify-events/default.nix @@ -2,25 +2,28 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "notify-events"; version = "1.1.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "notify_events"; - inherit version; + inherit (finalAttrs) version; sha256 = "e63ba935c3300ff7f48cba115f7cb4474906e83c2e9b60b95a0881eb949701e7"; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # upstream has no tests - doCheck = false; pythonImportsCheck = [ "notify_events" ]; @@ -29,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/notify-events/python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/notion-client/default.nix b/python/pkgs/notion-client/default.nix index bb6c3290d..b423f2a64 100644 --- a/python/pkgs/notion-client/default.nix +++ b/python/pkgs/notion-client/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "notion-client"; version = "3.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ramnes"; repo = "notion-sdk-py"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TdBynMSx8VWzJY9j/AeKLivVzpSoCWavn6bW9p804Jw="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/ramnes/notion-sdk-py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/notus-scanner/default.nix b/python/pkgs/notus-scanner/default.nix index 5fa48fb26..17ff3e867 100644 --- a/python/pkgs/notus-scanner/default.nix +++ b/python/pkgs/notus-scanner/default.nix @@ -10,7 +10,7 @@ sentry-sdk, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "notus-scanner"; version = "23.0.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "greenbone"; repo = "notus-scanner"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OgfJyQPmkV1nRYIQZJpyptbPdf7L6amuLP9pIz0Btbk="; }; @@ -30,7 +30,7 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ paho-mqtt psutil python-gnupg @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/greenbone/notus-scanner"; license = lib.licenses.agpl3Plus; }; -} +}) diff --git a/python/pkgs/nox/default.nix b/python/pkgs/nox/default.nix index d0d340f64..cceaa7da7 100644 --- a/python/pkgs/nox/default.nix +++ b/python/pkgs/nox/default.nix @@ -13,13 +13,13 @@ virtualenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nox"; version = "2026.8.17"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jZxpybmWpZ2x6yxpaN6uvC7bxVMX0gWYG7xKNzUdPy4="; }; @@ -38,11 +38,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "nox" ]; - doCheck = false; - meta = { description = "Flexible test automation for Python"; homepage = "https://github.com/wntrblm/nox"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/nptyping/default.nix b/python/pkgs/nptyping/default.nix index 514da881e..7a9388bfd 100644 --- a/python/pkgs/nptyping/default.nix +++ b/python/pkgs/nptyping/default.nix @@ -16,8 +16,6 @@ buildPythonPackage (finalAttrs: { version = "2.5.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "ramonhagenaars"; repo = "nptyping"; diff --git a/python/pkgs/npyscreen/default.nix b/python/pkgs/npyscreen/default.nix index a53a164af..26e7ae244 100644 --- a/python/pkgs/npyscreen/default.nix +++ b/python/pkgs/npyscreen/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "npyscreen"; version = "5.0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PWxyB8zNCNkmmATu7ZYLQGeOmeiRiAov2TbyPGbVwVY="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://www.npcole.com/npyscreen/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/nsapi/default.nix b/python/pkgs/nsapi/default.nix index 35130a126..07c0416fd 100644 --- a/python/pkgs/nsapi/default.nix +++ b/python/pkgs/nsapi/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nsapi"; version = "3.2.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aquatix"; repo = "ns-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eZT6DU68wcEYyoFejECuluzit9MDA269zaKVFWpSuc8="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ pytz ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "ns_api" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/aquatix/ns-api/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nskeyedunarchiver/default.nix b/python/pkgs/nskeyedunarchiver/default.nix index 0cf2c3f43..950f8361c 100644 --- a/python/pkgs/nskeyedunarchiver/default.nix +++ b/python/pkgs/nskeyedunarchiver/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nskeyedunarchiver"; version = "1.5.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2aLV1I6p4seNMb+/xKl8AnlBkvO0VINC1yfVS90gvro="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/avibrazil/NSKeyedUnArchiver"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/nsw-fuel-api-client/default.nix b/python/pkgs/nsw-fuel-api-client/default.nix index 0522d2ea6..2d0bf8a5a 100644 --- a/python/pkgs/nsw-fuel-api-client/default.nix +++ b/python/pkgs/nsw-fuel-api-client/default.nix @@ -8,7 +8,7 @@ requests-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nsw-fuel-api-client"; version = "1.1.3"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nickw444"; repo = "nsw-fuel-api-client"; - tag = version; + tag = finalAttrs.version; hash = "sha256-3nkBDLmFOfYLvG5fi2subA9zxb51c7zWlhT4GaCQo9I="; }; postPatch = '' substituteInPlace nsw_fuel/__init__.py \ - --replace-fail '__version__ = "0.0.0-dev"' '__version__ = "${version}"' + --replace-fail '__version__ = "0.0.0-dev"' '__version__ = "${finalAttrs.version}"' ''; build-system = [ @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/nickw444/nsw-fuel-api-client"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ntc-templates/default.nix b/python/pkgs/ntc-templates/default.nix index 71753aaf8..67ffd6436 100644 --- a/python/pkgs/ntc-templates/default.nix +++ b/python/pkgs/ntc-templates/default.nix @@ -6,7 +6,7 @@ textfsm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ntc-templates"; version = "9.2.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "networktocode"; repo = "ntc-templates"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iKG1+sc/J+PdFNNmmqCR9xmw7KVuP0P2mNPqHiZDe7M="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/networktocode/ntc-templates"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ntfy-webpush/default.nix b/python/pkgs/ntfy-webpush/default.nix index f54386dc6..9c47032b6 100644 --- a/python/pkgs/ntfy-webpush/default.nix +++ b/python/pkgs/ntfy-webpush/default.nix @@ -7,7 +7,7 @@ py-vapid, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ntfy-webpush"; version = "0.1.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dschep"; repo = "ntfy-webpush"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VvQ/kCrq7KSMQdYb8p5P0REdek5oNhjslB45+gbetLc="; }; @@ -33,11 +33,10 @@ buildPythonPackage rec { ]; # no tests, just a script - doCheck = false; meta = { description = "Cloudbell webpush notification support for ntfy"; homepage = "https://dschep.github.io/ntfy-webpush/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ntplib/default.nix b/python/pkgs/ntplib/default.nix index 97c9f9ce4..8c208d70c 100644 --- a/python/pkgs/ntplib/default.nix +++ b/python/pkgs/ntplib/default.nix @@ -5,20 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ntplib"; version = "0.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iZ2PtfjCVVITrqle/KApNMc0Pfas6ddiilF2sXaQYmc="; }; build-system = [ setuptools ]; # Requires networking - doCheck = false; pythonImportsCheck = [ "ntplib" ]; @@ -27,4 +26,4 @@ buildPythonPackage rec { homepage = "http://code.google.com/p/ntplib/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nuclear/default.nix b/python/pkgs/nuclear/default.nix index 0c22b79ec..6b2b211e6 100644 --- a/python/pkgs/nuclear/default.nix +++ b/python/pkgs/nuclear/default.nix @@ -12,7 +12,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nuclear"; version = "2.8.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "igrek51"; repo = "nuclear"; - rev = version; + tag = finalAttrs.version; hash = "sha256-hoOvISKjl5XTxtv8I3BSkOI7oZFSL+yA3NiYceJGcIY="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { description = "Binding glue for CLI Python applications"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nuheat/default.nix b/python/pkgs/nuheat/default.nix index bbbe25a2a..afd96c21f 100644 --- a/python/pkgs/nuheat/default.nix +++ b/python/pkgs/nuheat/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, mock, parameterized, pytestCheckHook, @@ -9,19 +11,21 @@ responses, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nuheat"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "broox"; repo = "python-nuheat"; - tag = version; + tag = finalAttrs.version; hash = "sha256-EsPuwILfKc1Bpvu0Qos7yooC3dBaqf46lWhiSZdu3sc="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ mock @@ -37,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/broox/python-nuheat"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nuitka/default.nix b/python/pkgs/nuitka/default.nix index 268e825b5..b373b511d 100644 --- a/python/pkgs/nuitka/default.nix +++ b/python/pkgs/nuitka/default.nix @@ -11,7 +11,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nuitka"; version = "2.8.10"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Nuitka"; repo = "Nuitka"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+CevWpYvqY3SX3/QE7SPlbsFtXkdlNTg9m91VtZCHvM="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { # never built on darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/python/pkgs/nulltype/default.nix b/python/pkgs/nulltype/default.nix index 910ce054c..98a42b288 100644 --- a/python/pkgs/nulltype/default.nix +++ b/python/pkgs/nulltype/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nulltype"; version = "2.3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; sha256 = "0wpjbsmm0c9ifg9y6cnfz49qq9pa5f99nnqp6wdlv42ymfr3rak4"; }; + + build-system = [ setuptools ]; pythonImportsCheck = [ "nulltype" ]; meta = { @@ -21,4 +25,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/nulltype/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/num2words/default.nix b/python/pkgs/num2words/default.nix index ed5ce3a6d..df26dd104 100644 --- a/python/pkgs/num2words/default.nix +++ b/python/pkgs/num2words/default.nix @@ -6,13 +6,13 @@ docopt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "num2words"; version = "0.5.14"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-sGbsGOVrZhajs4CGtXR9qvuqiGiyJqNhJ+BFHAzzecY="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/savoirfairelinux/num2words"; license = lib.licenses.lgpl21; }; -} +}) diff --git a/python/pkgs/numato-gpio/default.nix b/python/pkgs/numato-gpio/default.nix index 7525d50dc..c09060b20 100644 --- a/python/pkgs/numato-gpio/default.nix +++ b/python/pkgs/numato-gpio/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "numato-gpio"; version = "0.14.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "clssn"; repo = "numato-gpio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9kbPEtJOQhCxYh8cjyCAufV63mV7ZF1x7CdUyJLfqII="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/clssn/numato-gpio"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/numba-scipy/default.nix b/python/pkgs/numba-scipy/default.nix index 63559b16e..d4d0ff1a9 100644 --- a/python/pkgs/numba-scipy/default.nix +++ b/python/pkgs/numba-scipy/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, scipy, numba, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "numba-scipy"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RDZF1mNcZnrcOzjQpjbZq8yXHnjeLAeAjYmvzXvFhEQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ scipy numba ]; @@ -37,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/numba/numba-scipy"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/numbagg/default.nix b/python/pkgs/numbagg/default.nix index 424db5194..99b32e404 100644 --- a/python/pkgs/numbagg/default.nix +++ b/python/pkgs/numbagg/default.nix @@ -20,7 +20,7 @@ tabulate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.9.4"; pname = "numbagg"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "numbagg"; repo = "numbagg"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JYgjeExpL+rbiaFPO9IHsm4Qh6GTLdTWB5dO3zIIPbs="; }; @@ -67,4 +67,4 @@ buildPythonPackage rec { homepage = "https://github.com/numbagg/numbagg"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/numcodecs/default.nix b/python/pkgs/numcodecs/default.nix index 41f749fd9..f09260988 100644 --- a/python/pkgs/numcodecs/default.nix +++ b/python/pkgs/numcodecs/default.nix @@ -24,13 +24,13 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "numcodecs"; version = "0.16.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-DQ+2CFL4TAvZVDzE0que79N/yO/MQQrNR3fmKh0wAxg="; }; @@ -65,4 +65,4 @@ buildPythonPackage rec { license = lib.licenses.mit; description = "Buffer compression and transformation codecs for use in data storage and communication applications"; }; -} +}) diff --git a/python/pkgs/numdifftools/default.nix b/python/pkgs/numdifftools/default.nix index 391e6da9b..acdcdf988 100644 --- a/python/pkgs/numdifftools/default.nix +++ b/python/pkgs/numdifftools/default.nix @@ -7,7 +7,7 @@ pdm-backend, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "numdifftools"; version = "0.9.42"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pbrod"; repo = "numdifftools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tNPv+KJuSmMHItHfRUjMIFtAFB+vC530sp+Am0VRG44="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # Tests requires algopy and other modules which are optional and/or not available - doCheck = false; pythonImportsCheck = [ "numdifftools" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/pbrod/numdifftools"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/numexpr/default.nix b/python/pkgs/numexpr/default.nix index 75c59b255..64e11e891 100644 --- a/python/pkgs/numexpr/default.nix +++ b/python/pkgs/numexpr/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "numexpr"; version = "2.14.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5xROg+qeWB8ic+AwTxWDZzbE5HDivS43jOYXZiocong="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydata/numexpr"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/numpy-financial/default.nix b/python/pkgs/numpy-financial/default.nix index b60cba6a6..8f8246068 100644 --- a/python/pkgs/numpy-financial/default.nix +++ b/python/pkgs/numpy-financial/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "numpy-financial"; version = "1.0.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "numpy"; repo = "numpy-financial"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6hSi5Y292Ikfb2m2SLvIHJS0nZcGKgGzvybgmpxReWI="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { description = "Collection of elementary financial functions"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/numpy-groupies/default.nix b/python/pkgs/numpy-groupies/default.nix index 74a6a23ed..50151b69b 100644 --- a/python/pkgs/numpy-groupies/default.nix +++ b/python/pkgs/numpy-groupies/default.nix @@ -10,7 +10,7 @@ pandas, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "numpy-groupies"; version = "0.11.3"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ml31415"; repo = "numpy-groupies"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pg9hOtIgS8pB/Y9Xqto9Omsdg8TxaA5ZGE1Qh1DCceU="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { description = "Optimised tools for group-indexing operations: aggregated sum and more"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/numpy-quaternion/default.nix b/python/pkgs/numpy-quaternion/default.nix index c7605945c..c48a6a658 100644 --- a/python/pkgs/numpy-quaternion/default.nix +++ b/python/pkgs/numpy-quaternion/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { pname = "numpy-quaternion"; version = "2024.0.13"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "moble"; diff --git a/python/pkgs/numpy-stl/default.nix b/python/pkgs/numpy-stl/default.nix index 79dfc4cbb..cab17e1ee 100644 --- a/python/pkgs/numpy-stl/default.nix +++ b/python/pkgs/numpy-stl/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "numpy-stl"; version = "3.2.0"; pyproject = true; src = fetchPypi { pname = "numpy_stl"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-WiDD95zdqgq8akuZ9Uhqzu1PiBUvKbGaV6zIROGD/U0="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/WoLpH/numpy-stl/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/numpy-typing-compat/default.nix b/python/pkgs/numpy-typing-compat/default.nix index 12485ccf5..2fd448517 100644 --- a/python/pkgs/numpy-typing-compat/default.nix +++ b/python/pkgs/numpy-typing-compat/default.nix @@ -6,14 +6,14 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "numpy-typing-compat"; version = "20251206.2.4"; pyproject = true; src = fetchPypi { pname = "numpy_typing_compat"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-WYgtI6r/BUolNtqAVkASzc4zSHZXvk15xZJbuHBfyrw="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/numpy-typing-compat/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/numpydoc/default.nix b/python/pkgs/numpydoc/default.nix index 843533052..cc546a2c7 100644 --- a/python/pkgs/numpydoc/default.nix +++ b/python/pkgs/numpydoc/default.nix @@ -8,13 +8,13 @@ tabulate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "numpydoc"; version = "1.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-P3lw9u7jCRImCmsxrHK7okMoMM1nIlaewX7o0+9f+gE="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/numpy/numpydoc"; license = lib.licenses.free; }; -} +}) diff --git a/python/pkgs/nvdlib/default.nix b/python/pkgs/nvdlib/default.nix index ca0b4346a..14a59fb44 100644 --- a/python/pkgs/nvdlib/default.nix +++ b/python/pkgs/nvdlib/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nvdlib"; version = "0.8.3"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Vehemont"; repo = "nvdlib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FjeYJMMccao9KJMcJBKtt5QhpQEEbcPyNunj+VqMdx0="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Vehemont/nvdlib/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/nwdiag/default.nix b/python/pkgs/nwdiag/default.nix index 1491a52a5..59b495d87 100644 --- a/python/pkgs/nwdiag/default.nix +++ b/python/pkgs/nwdiag/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nwdiag"; version = "3.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "blockdiag"; repo = "nwdiag"; - tag = version; + tag = finalAttrs.version; hash = "sha256-uKrdkXpL5YBr953sRsHknYg+2/WwrZmyDf8BMA2+0tU="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { mainProgram = "rackdiag"; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/oath/default.nix b/python/pkgs/oath/default.nix index 8a45feed4..b68217524 100644 --- a/python/pkgs/oath/default.nix +++ b/python/pkgs/oath/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oath"; version = "1.4.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-DFxT7SW1LvYh18CPNZwhIH/i42qJ34s80m+1S0/2E7g="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/bdauvergne/python-oath"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/oathtool/default.nix b/python/pkgs/oathtool/default.nix index 555f165ce..812f730f8 100644 --- a/python/pkgs/oathtool/default.nix +++ b/python/pkgs/oathtool/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oathtool"; version = "2.4.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaraco"; repo = "oathtool"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Qa4/fVa7Ws8t42MxZpEVKI7Wyux/uN77VP0JBnrmgq0="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/oathtool"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/oauth2-client/default.nix b/python/pkgs/oauth2-client/default.nix index 8f93afdf1..8178795f8 100644 --- a/python/pkgs/oauth2-client/default.nix +++ b/python/pkgs/oauth2-client/default.nix @@ -7,13 +7,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oauth2-client"; version = "1.4.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-U4GQBEj/Gudi63xlxQEALqxGu1yi9JR3/f6vnplp8oQ="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/oauth2-client/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/oauth2client/default.nix b/python/pkgs/oauth2client/default.nix index dbacdf2af..153557f9f 100644 --- a/python/pkgs/oauth2client/default.nix +++ b/python/pkgs/oauth2client/default.nix @@ -9,13 +9,13 @@ rsa, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oauth2client"; version = "4.1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1IZ0HkUSh/aVaKTSbXDZrNc6K7+idXRsU1tCCYkczMY="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/oauth2client/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/oauthlib/default.nix b/python/pkgs/oauthlib/default.nix index bd328fd51..77aea107a 100644 --- a/python/pkgs/oauthlib/default.nix +++ b/python/pkgs/oauthlib/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oauthlib"; version = "3.3.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oauthlib"; repo = "oauthlib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZTmR+pTNQaRQMnUA+8hXM5VACRd8Hn62KTNooy5FQyk="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/oauthlib/oauthlib"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/objgraph/default.nix b/python/pkgs/objgraph/default.nix index bc5a17963..da0bb4240 100644 --- a/python/pkgs/objgraph/default.nix +++ b/python/pkgs/objgraph/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "objgraph"; version = "3.6.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ALny9A90IuPH9FphxNr9r4HwP/BknW6uyGbwEDDlGtg="; }; @@ -19,11 +19,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "objgraph" ]; - doCheck = false; - meta = { homepage = "https://mg.pov.lt/objgraph/"; description = "Draws Python object reference graphs with graphviz"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/objprint/default.nix b/python/pkgs/objprint/default.nix index 0b23f65d1..147dacce2 100644 --- a/python/pkgs/objprint/default.nix +++ b/python/pkgs/objprint/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "objprint"; version = "0.3.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gaogaotiantian"; repo = "objprint"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+OS034bikrKy4F27b6ic97fHTW6rSMxQ0dx4caF6cUM="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/gaogaotiantian/objprint"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/objsize/default.nix b/python/pkgs/objsize/default.nix index 6cb4974ef..614f82598 100644 --- a/python/pkgs/objsize/default.nix +++ b/python/pkgs/objsize/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "objsize"; version = "0.8.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "liran-funaro"; repo = "objsize"; - tag = version; + tag = finalAttrs.version; hash = "sha256-u4PTUk3K3ZCNZ87xM+PoCabsw+EjOoDgNySDWWB7yho="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/liran-funaro/objsize"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/obsidian-callouts/default.nix b/python/pkgs/obsidian-callouts/default.nix index 275f6c303..eef370ca4 100644 --- a/python/pkgs/obsidian-callouts/default.nix +++ b/python/pkgs/obsidian-callouts/default.nix @@ -31,7 +31,6 @@ buildPythonPackage (finalAttrs: { ]; # No tests are available - doCheck = false; meta = { description = "A plugin for Python-Markdown that allows you to use callouts as in Obsidian"; diff --git a/python/pkgs/obsidian-media/default.nix b/python/pkgs/obsidian-media/default.nix index 32a40e477..df957fb1d 100644 --- a/python/pkgs/obsidian-media/default.nix +++ b/python/pkgs/obsidian-media/default.nix @@ -31,7 +31,6 @@ buildPythonPackage (finalAttrs: { ]; # No tests are available - doCheck = false; meta = { description = ""; diff --git a/python/pkgs/obspec/default.nix b/python/pkgs/obspec/default.nix index fe6bce7eb..e8f1ad1fa 100644 --- a/python/pkgs/obspec/default.nix +++ b/python/pkgs/obspec/default.nix @@ -39,9 +39,6 @@ buildPythonPackage (finalAttrs: { nativeCheckInputs = [ pytestCheckHook mypy - ]; - - checkInputs = [ pytest-mypy-plugins ]; diff --git a/python/pkgs/obspy/default.nix b/python/pkgs/obspy/default.nix index 115a1a8a8..b5b32b4b4 100644 --- a/python/pkgs/obspy/default.nix +++ b/python/pkgs/obspy/default.nix @@ -43,7 +43,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests require Internet access. - doCheck = false; pythonImportsCheck = [ "obspy" ]; diff --git a/python/pkgs/obstore/default.nix b/python/pkgs/obstore/default.nix index a44f35fce..78b8c6a29 100644 --- a/python/pkgs/obstore/default.nix +++ b/python/pkgs/obstore/default.nix @@ -12,7 +12,6 @@ buildPythonPackage (finalAttrs: { pname = "obstore"; version = "0.9.4"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "developmentseed"; diff --git a/python/pkgs/obsws-python/default.nix b/python/pkgs/obsws-python/default.nix index 512160b33..d2872c242 100644 --- a/python/pkgs/obsws-python/default.nix +++ b/python/pkgs/obsws-python/default.nix @@ -25,8 +25,6 @@ buildPythonPackage (finalAttrs: { websocket-client ]; - doCheck = false; # attempts to connect to OBS - meta = { description = "Python SDK for OBS Studio WebSocket v5.0"; homepage = "https://github.com/aatikturk/obsws-python"; diff --git a/python/pkgs/ochre/default.nix b/python/pkgs/ochre/default.nix index 233a3d3a0..a51c9fe10 100644 --- a/python/pkgs/ochre/default.nix +++ b/python/pkgs/ochre/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ochre"; version = "0.4.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "getcuia"; repo = "ochre"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-U6qycLnldwNze3XMAn6DS3XGX4RaCZgW0pH/y/FEAkk="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/getcuia/ochre"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/oci/default.nix b/python/pkgs/oci/default.nix index 4ca3e8965..35f8adcbb 100644 --- a/python/pkgs/oci/default.nix +++ b/python/pkgs/oci/default.nix @@ -15,7 +15,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oci"; version = "2.185.1"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oracle"; repo = "oci-python-sdk"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nmfTEbY9tVxhkFk6gEaJ7ntetpe2XVhflrY8YmJuL2Y="; }; @@ -48,7 +48,6 @@ buildPythonPackage rec { ]; # Tests fail: https://github.com/oracle/oci-python-sdk/issues/164 - doCheck = false; pythonImportsCheck = [ "oci" ]; @@ -60,4 +59,4 @@ buildPythonPackage rec { upl ]; }; -} +}) diff --git a/python/pkgs/ocifs/default.nix b/python/pkgs/ocifs/default.nix index 8eb35c9ad..7cef7eeaf 100644 --- a/python/pkgs/ocifs/default.nix +++ b/python/pkgs/ocifs/default.nix @@ -8,7 +8,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ocifs"; version = "1.3.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oracle"; repo = "ocifs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-IGl9G4NyzhcqrfYfgeZin+wt1OwHmh6780MPfZBwsXA="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "ocifs" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://ocifs.readthedocs.io"; license = lib.licenses.upl; }; -} +}) diff --git a/python/pkgs/od/default.nix b/python/pkgs/od/default.nix index b0fd23023..3c7aade39 100644 --- a/python/pkgs/od/default.nix +++ b/python/pkgs/od/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, repeated-test, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "od"; version = "2.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ repeated-test ]; pythonImportsCheck = [ "od" ]; @@ -24,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/epsy/od"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/odfpy/default.nix b/python/pkgs/odfpy/default.nix index 13a95cd9f..26eb52480 100644 --- a/python/pkgs/odfpy/default.nix +++ b/python/pkgs/odfpy/default.nix @@ -6,13 +6,13 @@ defusedxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "odfpy"; version = "1.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-23ZqblnFEDIS88yS7I3VCg86AnkCM+0LUhSLcNPEOOw="; }; @@ -22,11 +22,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "odf" ]; - doCheck = false; - meta = { homepage = "https://github.com/eea/odfpy"; description = "Python API and tools to manipulate OpenDocument files"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/oemthermostat/default.nix b/python/pkgs/oemthermostat/default.nix index d7ea3cc27..f8d55fc9a 100644 --- a/python/pkgs/oemthermostat/default.nix +++ b/python/pkgs/oemthermostat/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oemthermostat"; version = "1.1.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Cadair"; repo = "openenergymonitor_thermostat"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vrMw3/X8MtejO1WyUA1DOlfVCPTCPgcK5p3+OlTWcM4="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/Cadair/openenergymonitor_thermostat"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/offtrac/default.nix b/python/pkgs/offtrac/default.nix index 3b794f4fb..389f5af8d 100644 --- a/python/pkgs/offtrac/default.nix +++ b/python/pkgs/offtrac/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "offtrac"; version = "0.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ptC9aW5nxqsTUEuLKeSfJDv3cQRD2SCdp+cHdUEAbRs="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "http://fedorahosted.org/offtrac"; license = lib.licenses.gpl2; }; -} +}) diff --git a/python/pkgs/ofxhome/default.nix b/python/pkgs/ofxhome/default.nix index e7bce0039..01eac3c3e 100644 --- a/python/pkgs/ofxhome/default.nix +++ b/python/pkgs/ofxhome/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.3.3"; pname = "ofxhome"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "captin411"; repo = "ofxhome"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-i16bE9iuafhAKco2jYfg5T5QCWFHdnYVztf1z2XbO9g="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { description = "ofxhome.com financial institution lookup REST client"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ofxparse/default.nix b/python/pkgs/ofxparse/default.nix index 3401313a2..cb2de2915 100644 --- a/python/pkgs/ofxparse/default.nix +++ b/python/pkgs/ofxparse/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, six, beautifulsoup4, lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ofxparse"; version = "0.21"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "19y4sp5l9jqiqzzlbqdfiab42qx7d84n4xm4s7jfq397666vcyh5"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ six beautifulsoup4 lxml @@ -28,4 +32,4 @@ buildPythonPackage rec { description = "Tools for working with the OFX (Open Financial Exchange) file format"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ofxtools/default.nix b/python/pkgs/ofxtools/default.nix index b7d1d73e5..26814460d 100644 --- a/python/pkgs/ofxtools/default.nix +++ b/python/pkgs/ofxtools/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ofxtools"; version = "1.1.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "csingley"; repo = "ofxtools"; - rev = version; + tag = finalAttrs.version; hash = "sha256-874xcs5M5K6JxYoz9xhbZM/VZICZshHe9nb2C3HAQLA="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { mainProgram = "ofxget"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/ogmios/default.nix b/python/pkgs/ogmios/default.nix index 3079e9a5b..bfe83d084 100644 --- a/python/pkgs/ogmios/default.nix +++ b/python/pkgs/ogmios/default.nix @@ -13,14 +13,14 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ogmios"; version = "1.4.3"; pyproject = true; src = fetchPypi { pname = "ogmios"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-+edW34O+OF+JyCoZSjxRwKS6JeXfaZ38+ykUpXwBJ1Q="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/viperscience/ogmios-python"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/ohme/default.nix b/python/pkgs/ohme/default.nix index 41252b3ac..d7547990d 100644 --- a/python/pkgs/ohme/default.nix +++ b/python/pkgs/ohme/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "ohme" ]; # Module has no tests - doCheck = false; meta = { description = "Module for interacting with the Ohme API"; diff --git a/python/pkgs/okonomiyaki/default.nix b/python/pkgs/okonomiyaki/default.nix index 27b618056..4182bd88b 100644 --- a/python/pkgs/okonomiyaki/default.nix +++ b/python/pkgs/okonomiyaki/default.nix @@ -9,7 +9,7 @@ zipfile2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "okonomiyaki"; version = "3.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "enthought"; repo = "okonomiyaki"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xAF9Tdr+IM3lU+mcNcAWATJLZOVvbx0llqznqHLVqDc="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/enthought/okonomiyaki"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/okta/default.nix b/python/pkgs/okta/default.nix index 0f6758660..9da3efc35 100644 --- a/python/pkgs/okta/default.nix +++ b/python/pkgs/okta/default.nix @@ -24,13 +24,13 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "okta"; version = "3.4.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fwL2QtieS2j8rplGKXHHTjRWXZsZFHf0JqRL81iW9+8="; }; @@ -53,7 +53,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ pyfakefs pytest-asyncio pytest-mock @@ -88,4 +88,4 @@ buildPythonPackage rec { homepage = "https://github.com/okta/okta-sdk-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/oldest-supported-numpy/default.nix b/python/pkgs/oldest-supported-numpy/default.nix index a6c401b07..a05377c81 100644 --- a/python/pkgs/oldest-supported-numpy/default.nix +++ b/python/pkgs/oldest-supported-numpy/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oldest-supported-numpy"; version = "2023.12.21"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cdicMbtWeBTkfi4mjrLpK2+Z9c529MPbMIM2JOnvKeA="; }; + build-system = [ setuptools ]; + # The purpose of oldest-supported-numpy is to build a project against the # oldest version of numpy for a given Python distribution in order to build # a binary that is compatible with the largest possible versions of numpy. @@ -26,14 +30,13 @@ buildPythonPackage rec { --replace 'numpy==' 'numpy>=' ''; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; # package has no tests - doCheck = false; meta = { description = "Meta-package providing the oldest supported Numpy for a given Python version and platform"; homepage = "https://github.com/scipy/oldest-supported-numpy"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/olefile/default.nix b/python/pkgs/olefile/default.nix index d48f70858..18186c2f5 100644 --- a/python/pkgs/olefile/default.nix +++ b/python/pkgs/olefile/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "olefile"; version = "0.47"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-WZODOBoL89+9kyygymUVrNF07UiHDL9/7hI9aYwZLBw="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { hpnd ]; }; -} +}) diff --git a/python/pkgs/ollama/default.nix b/python/pkgs/ollama/default.nix index 69049f8c0..06a36d50e 100644 --- a/python/pkgs/ollama/default.nix +++ b/python/pkgs/ollama/default.nix @@ -11,7 +11,7 @@ pytest-httpserver, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ollama"; version = "0.6.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ollama"; repo = "ollama-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kPFimI9h8BL3qQ+puZy70AYnX3zpbZ2nV5revmYPjIY="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/ollama/ollama-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/omegaconf/default.nix b/python/pkgs/omegaconf/default.nix index 3db9a0228..3ce5b3c3f 100644 --- a/python/pkgs/omegaconf/default.nix +++ b/python/pkgs/omegaconf/default.nix @@ -13,7 +13,7 @@ let antlr4 = pkgs.antlr4; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "omegaconf"; version = "2.3.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "omry"; repo = "omegaconf"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HvK6bNInPIkfdpNh8DifH7Wxt8m9uR+Y/qL3voIUw6w="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://github.com/omry/omegaconf"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/omemo-dr/default.nix b/python/pkgs/omemo-dr/default.nix index 987b87a0c..6cf4e3456 100644 --- a/python/pkgs/omemo-dr/default.nix +++ b/python/pkgs/omemo-dr/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "omemo-dr"; version = "1.2.0"; pyproject = true; @@ -17,13 +17,13 @@ buildPythonPackage rec { domain = "dev.gajim.org"; owner = "gajim"; repo = "omemo-dr"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8+uBO7Nl6YcEwthWmChqCTLvUelF8QJl+dHzkqbPVqM="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cryptography protobuf ]; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://dev.gajim.org/gajim/omemo-dr/"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/omitempty/default.nix b/python/pkgs/omitempty/default.nix index 4bb60ecb6..cf4975b8c 100644 --- a/python/pkgs/omitempty/default.nix +++ b/python/pkgs/omitempty/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "omitempty" ]; # Tests are outdated - doCheck = false; meta = { description = "Go's omitempty for Python"; diff --git a/python/pkgs/omnilogic/default.nix b/python/pkgs/omnilogic/default.nix index b39fa4c2b..84157294a 100644 --- a/python/pkgs/omnilogic/default.nix +++ b/python/pkgs/omnilogic/default.nix @@ -4,27 +4,30 @@ xmltodict, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "omnilogic"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "djtimca"; repo = "omnilogic-api"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ySK2T5T+Qdq8nVQqluIARR89KmM1N3oD44oLydwcs7E="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp xmltodict ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "omnilogic" ]; @@ -33,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/djtimca/omnilogic-api"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/omrdatasettools/default.nix b/python/pkgs/omrdatasettools/default.nix index 99c4af521..dde10d499 100644 --- a/python/pkgs/omrdatasettools/default.nix +++ b/python/pkgs/omrdatasettools/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, h5py, ipython, lxml, @@ -19,17 +21,19 @@ twine, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "omrdatasettools"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-kUUcbti29uDnSEvCubMAUnptlaZGpEsW2IBGSAGnGyQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pillow scikit-image h5py @@ -69,4 +73,4 @@ buildPythonPackage rec { homepage = "https://github.com/apacha/OMR-Datasets"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/oncalendar/default.nix b/python/pkgs/oncalendar/default.nix index ffa2daab0..7e267069b 100644 --- a/python/pkgs/oncalendar/default.nix +++ b/python/pkgs/oncalendar/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oncalendar"; version = "1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "cuu508"; repo = "oncalendar"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MPKzC2QYA3tWxg19URKheAbPaiS0jXP96xR0Hyl58V0="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "oncalendar" ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/cuu508/oncalendar"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ondilo/default.nix b/python/pkgs/ondilo/default.nix index cc022f0c4..9795d59f6 100644 --- a/python/pkgs/ondilo/default.nix +++ b/python/pkgs/ondilo/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ondilo"; version = "0.5.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JeromeHXP"; repo = "ondilo"; - tag = version; + tag = finalAttrs.version; hash = "sha256-l9pmamJbB/FAqB49S4vQAan9Wgj3qu1J2pboQO1Hg/Q="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "ondilo" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/JeromeHXP/ondilo"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/onecache/default.nix b/python/pkgs/onecache/default.nix index 9da39c66b..67c45e673 100644 --- a/python/pkgs/onecache/default.nix +++ b/python/pkgs/onecache/default.nix @@ -9,7 +9,7 @@ stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "onecache"; version = "0.8.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sonic182"; repo = "onecache"; - tag = version; + tag = finalAttrs.version; hash = "sha256-jhyszGKzmMdtPfnjc3VllfF6Zd0MkV66CpL6HiAof/A="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.mit; homepage = "https://github.com/sonic182/onecache"; }; -} +}) diff --git a/python/pkgs/onedrive-personal-sdk/default.nix b/python/pkgs/onedrive-personal-sdk/default.nix index 549472d4c..07e2864db 100644 --- a/python/pkgs/onedrive-personal-sdk/default.nix +++ b/python/pkgs/onedrive-personal-sdk/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "onedrive-personal-sdk"; version = "0.1.7"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zweckj"; repo = "onedrive-personal-sdk"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-V95lfq8GnuitdFbY8MPpX0kyvj8Gx24W2NFeKp0FsSo="; }; @@ -31,11 +31,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "onedrive_personal_sdk" ]; # upstream has no tests - doCheck = false; meta = { description = "Package to interact with the Microsoft Graph API for personal OneDrives"; homepage = "https://github.com/zweckj/onedrive-personal-sdk"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/onepassword-sdk/default.nix b/python/pkgs/onepassword-sdk/default.nix index 789ef39e3..0c5a4f04c 100644 --- a/python/pkgs/onepassword-sdk/default.nix +++ b/python/pkgs/onepassword-sdk/default.nix @@ -31,7 +31,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests require a live 1Password service account token. - doCheck = false; pythonImportsCheck = [ "onepassword" ]; diff --git a/python/pkgs/onetimepad/default.nix b/python/pkgs/onetimepad/default.nix index 140b13714..db960e7cf 100644 --- a/python/pkgs/onetimepad/default.nix +++ b/python/pkgs/onetimepad/default.nix @@ -2,21 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "onetimepad"; version = "1.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1eaade76d8036e1cb79e944b75874bfe5ee4046a571c0724564e1721565c73fd"; }; + build-system = [ setuptools ]; + # upstream has no tests - doCheck = false; pythonImportsCheck = [ "onetimepad" ]; @@ -26,4 +29,4 @@ buildPythonPackage rec { homepage = "https://jailuthra.in/onetimepad"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/onetimepass/default.nix b/python/pkgs/onetimepass/default.nix index 35063398f..d4f29784d 100644 --- a/python/pkgs/onetimepass/default.nix +++ b/python/pkgs/onetimepass/default.nix @@ -6,7 +6,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "onetimepass"; version = "1.0.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tadeck"; repo = "onetimepass"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cHJg3vdUpWp5+HACIeTGrqkHKUDS//aQICSjPKgwu3I="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/tadeck/onetimepass"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/onigurumacffi/default.nix b/python/pkgs/onigurumacffi/default.nix index 4bcb64a22..53e4de7d1 100644 --- a/python/pkgs/onigurumacffi/default.nix +++ b/python/pkgs/onigurumacffi/default.nix @@ -6,13 +6,13 @@ setuptools, cffi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "onigurumacffi"; version = "1.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1Pqb7kSm04qYsiN8Z9ms3yftDDLWwhgSX+RmgaXt6k0="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/asottile/onigurumacffi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/onkyo-eiscp/default.nix b/python/pkgs/onkyo-eiscp/default.nix index 762768bcf..c35b205da 100644 --- a/python/pkgs/onkyo-eiscp/default.nix +++ b/python/pkgs/onkyo-eiscp/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, docopt, netifaces, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "onkyo-eiscp"; version = "1.2.7"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "761abb16c654a1136763b927d094174d41f282809e44ea32cd47e199dd79d9c9"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ docopt netifaces ]; @@ -27,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/miracle2k/onkyo-eiscp"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/onlinepayments-sdk-python3/default.nix b/python/pkgs/onlinepayments-sdk-python3/default.nix index b198fcb11..5c89e7b22 100644 --- a/python/pkgs/onlinepayments-sdk-python3/default.nix +++ b/python/pkgs/onlinepayments-sdk-python3/default.nix @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "wl-online-payments-direct"; repo = "sdk-python3"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-GGMDAeIErVjx2hJMhKWS/ysXi2izHI3LIKfbvGr+Gds="; }; diff --git a/python/pkgs/onlykey-solo-python/default.nix b/python/pkgs/onlykey-solo-python/default.nix index bfb528e9f..034c0464a 100644 --- a/python/pkgs/onlykey-solo-python/default.nix +++ b/python/pkgs/onlykey-solo-python/default.nix @@ -4,6 +4,8 @@ ecdsa, fetchpatch, fetchPypi, + # build-system + setuptools, fido2, intelhex, lib, @@ -12,16 +14,18 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "onlykey-solo-python"; version = "0.0.32"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-88DuhgX4FCwzIKzw4RqWgMtjRdf5huVlKEHAAEminuQ="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace "fido2 == 0.9.3" "fido2" @@ -35,7 +39,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + dependencies = [ click ecdsa fido2 @@ -46,7 +50,6 @@ buildPythonPackage rec { ]; # no tests - doCheck = false; pythonImportsCheck = [ "solo" ]; meta = { @@ -55,4 +58,4 @@ buildPythonPackage rec { mainProgram = "solo"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/onvif-zeep-async/default.nix b/python/pkgs/onvif-zeep-async/default.nix index e9f112c8a..18d1b7465 100644 --- a/python/pkgs/onvif-zeep-async/default.nix +++ b/python/pkgs/onvif-zeep-async/default.nix @@ -39,7 +39,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "onvif" ]; # Tests are not shipped - doCheck = false; meta = { description = "ONVIF Client Implementation in Python"; diff --git a/python/pkgs/onvif-zeep/default.nix b/python/pkgs/onvif-zeep/default.nix index 31965928f..c67b072b2 100644 --- a/python/pkgs/onvif-zeep/default.nix +++ b/python/pkgs/onvif-zeep/default.nix @@ -6,25 +6,24 @@ zeep, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "onvif-zeep"; version = "0.2.12"; pyproject = true; src = fetchPypi { pname = "onvif_zeep"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-qou8Aqc+qlCJSwwY45+o0xilg6ZkxlvzWzyAKdHEC0k="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ zeep ]; + dependencies = [ zeep ]; pythonImportsCheck = [ "onvif" ]; # Tests require hardware - doCheck = false; meta = { description = "Python Client for ONVIF Camera"; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/quatanium/python-onvif"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/oocsi/default.nix b/python/pkgs/oocsi/default.nix index 16e4817ad..a7567ad95 100644 --- a/python/pkgs/oocsi/default.nix +++ b/python/pkgs/oocsi/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oocsi"; version = "0.4.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AgDBsPoi0aQ6uglc7Zl4gxVmeyDCysoef5vZpxgwE/Q="; }; + build-system = [ setuptools ]; + # Tests are not shipped - doCheck = false; pythonImportsCheck = [ "oocsi" ]; @@ -24,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/iddi/oocsi-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/opack2/default.nix b/python/pkgs/opack2/default.nix index c3e85c489..d35697972 100644 --- a/python/pkgs/opack2/default.nix +++ b/python/pkgs/opack2/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opack2"; version = "0.0.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "doronz88"; repo = "opack2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7kRR4KOR3Wrya2YE8nL5laXrsnI1lSVZMBEij44J+T0="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/doronz88/opack2"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/open-garage/default.nix b/python/pkgs/open-garage/default.nix index 322ecc44b..3d89af935 100644 --- a/python/pkgs/open-garage/default.nix +++ b/python/pkgs/open-garage/default.nix @@ -4,27 +4,30 @@ async-timeout, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "open-garage"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyOpenGarage"; - rev = version; + tag = finalAttrs.version; hash = "sha256-iJ7HcJhpTceFpHTUdNZOYDuxUWZGWPmZ9lxD3CyGvk8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp async-timeout ]; # Project has no tests - doCheck = false; pythonImportsCheck = [ "opengarage" ]; @@ -33,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Danielhiversen/pyOpenGarage"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/open-hypergraphs/default.nix b/python/pkgs/open-hypergraphs/default.nix index 76eced80c..baa96352f 100644 --- a/python/pkgs/open-hypergraphs/default.nix +++ b/python/pkgs/open-hypergraphs/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "open-hypergraphs"; version = "0.1.3"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "statusfailed"; repo = "open-hypergraphs"; - tag = "pypi-${version}"; + tag = "pypi-${finalAttrs.version}"; hash = "sha256-sBF/+VENDajLN72UJ6iHekmk11pOqfxeKs8Kqszy6mQ="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/statusfailed/open-hypergraphs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/openai-harmony/default.nix b/python/pkgs/openai-harmony/default.nix index 58ebe67f8..9102f898a 100644 --- a/python/pkgs/openai-harmony/default.nix +++ b/python/pkgs/openai-harmony/default.nix @@ -14,7 +14,7 @@ uvicorn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openai-harmony"; version = "0.0.8"; pyproject = true; @@ -22,12 +22,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openai"; repo = "harmony"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CaEldCrjBkjwsVeTzpiAFl/llAnUwJGTlU8Pt8YTV1E="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-HeUK/S9nUDRTVkLf8CPrHfjBbyGZezZGu5P8XkfStVQ="; }; @@ -50,11 +50,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "openai_harmony" ]; # Tests require internet access - doCheck = false; meta = { description = "Renderer for the harmony response format to be used with gpt-oss"; homepage = "https://github.com/openai/harmony"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/openai/default.nix b/python/pkgs/openai/default.nix index f766bb87c..c1c50a69d 100644 --- a/python/pkgs/openai/default.nix +++ b/python/pkgs/openai/default.nix @@ -34,7 +34,7 @@ withRealtime ? true, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openai"; version = "2.48.0"; pyproject = true; @@ -42,7 +42,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openai"; repo = "openai-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LB88y4psz1yxtNcw+MeDW3IRn4zGF8U9DRImLbT/Xxk="; }; @@ -63,9 +63,9 @@ buildPythonPackage rec { tqdm typing-extensions ] - ++ lib.optionals withAiohttp optional-dependencies.aiohttp - ++ lib.optionals withDatalib optional-dependencies.datalib - ++ lib.optionals withRealtime optional-dependencies.realtime; + ++ lib.optionals withAiohttp finalAttrs.optional-dependencies.aiohttp + ++ lib.optionals withDatalib finalAttrs.optional-dependencies.datalib + ++ lib.optionals withRealtime finalAttrs.optional-dependencies.realtime; optional-dependencies = { aiohttp = [ @@ -89,4 +89,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "openai"; }; -} +}) diff --git a/python/pkgs/openapi-core/default.nix b/python/pkgs/openapi-core/default.nix index fde858b42..adabfc2c6 100644 --- a/python/pkgs/openapi-core/default.nix +++ b/python/pkgs/openapi-core/default.nix @@ -27,7 +27,7 @@ werkzeug, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openapi-core"; version = "0.23.1"; pyproject = true; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "p1c2u"; repo = "openapi-core"; - tag = version; + tag = finalAttrs.version; hash = "sha256-wGaRx+IEqsvs7ygCDgh1H4di662SQhjmpB9LMP/YGKM="; }; @@ -82,4 +82,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-openapi/openapi-core"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/openapi-pydantic/default.nix b/python/pkgs/openapi-pydantic/default.nix index 51f31750d..1c13e4af1 100644 --- a/python/pkgs/openapi-pydantic/default.nix +++ b/python/pkgs/openapi-pydantic/default.nix @@ -6,7 +6,7 @@ pydantic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openapi-pydantic"; version = "0.5.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mike-oakley"; repo = "openapi-pydantic"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SMAjzHGuu+QVWe/y8jQ4UWJI9f+pLR2BxgjvE6vOT0Q="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/mike-oakley/openapi-pydantic"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/openapi-schema-validator/default.nix b/python/pkgs/openapi-schema-validator/default.nix index ac8932997..fb9149172 100644 --- a/python/pkgs/openapi-schema-validator/default.nix +++ b/python/pkgs/openapi-schema-validator/default.nix @@ -15,7 +15,7 @@ rfc3339-validator, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openapi-schema-validator"; version = "0.9.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "p1c2u"; repo = "openapi-schema-validator"; - tag = version; + tag = finalAttrs.version; hash = "sha256-fqVmVdlZsHPH/C0LWXyeGDpSYVoIf63qIj1R7JeFi4I="; }; @@ -38,8 +38,6 @@ buildPythonPackage rec { rfc3339-validator ]; - doCheck = false; - pythonImportsCheck = [ "openapi_schema_validator" ]; meta = { @@ -47,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-openapi/openapi-schema-validator"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/openapi-spec-validator/default.nix b/python/pkgs/openapi-spec-validator/default.nix index 6f2d6d615..0139b7780 100644 --- a/python/pkgs/openapi-spec-validator/default.nix +++ b/python/pkgs/openapi-spec-validator/default.nix @@ -13,7 +13,7 @@ openapi-schema-validator, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openapi-spec-validator"; version = "0.9.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-openapi"; repo = "openapi-spec-validator"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ykcoSXXlhxmUpXx86mc8GT3UolmH/sjBpa5lEViwJrk="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/p1c2u/openapi-spec-validator"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/openapi3/default.nix b/python/pkgs/openapi3/default.nix index 08cb42656..a5e69f3a6 100644 --- a/python/pkgs/openapi3/default.nix +++ b/python/pkgs/openapi3/default.nix @@ -13,7 +13,7 @@ pydantic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openapi3"; version = "1.8.2"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Dorthu"; repo = "openapi3"; - rev = version; + tag = finalAttrs.version; hash = "sha256-Crn+nRbptRycnWJzH8Tm/BBLcBSRCcNtLX8NoKnSDdA="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/Dorthu/openapi3"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/opencc/default.nix b/python/pkgs/opencc/default.nix index 88d3b8f36..932640196 100644 --- a/python/pkgs/opencc/default.nix +++ b/python/pkgs/opencc/default.nix @@ -4,25 +4,22 @@ fetchPypi, cmake, setuptools, - wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opencc"; version = "1.4.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "opencc"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-R5d5BfEx19nPzsKful2EEVSQfh2nMQMQWkpodE4PTxo="; }; - nativeBuildInputs = [ - cmake - setuptools - wheel - ]; + build-system = [ setuptools ]; + + nativeBuildInputs = [ cmake ]; dontUseCmakeConfigure = true; @@ -35,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/BYVoid/OpenCC"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/openccu-loom-types/default.nix b/python/pkgs/openccu-loom-types/default.nix index 146665195..c304a52d3 100644 --- a/python/pkgs/openccu-loom-types/default.nix +++ b/python/pkgs/openccu-loom-types/default.nix @@ -12,7 +12,6 @@ buildPythonPackage (finalAttrs: { pname = "openccu-loom-types"; version = "0.1.53"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "SukramJ"; diff --git a/python/pkgs/opencensus-context/default.nix b/python/pkgs/opencensus-context/default.nix index 44cd8a0a2..0d4f550fc 100644 --- a/python/pkgs/opencensus-context/default.nix +++ b/python/pkgs/opencensus-context/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opencensus-context"; version = "0.1.3"; pyproject = true; src = fetchPypi { pname = "opencensus-context"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-oDEIw8ENjIC7Xd9cih8DMWH6YZcqmRf5ubOhhRfwCIw="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/census-instrumentation/opencensus-python/tree/master/context/opencensus-context"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/opencensus-ext-azure/default.nix b/python/pkgs/opencensus-ext-azure/default.nix index 27f186e13..74edbb893 100644 --- a/python/pkgs/opencensus-ext-azure/default.nix +++ b/python/pkgs/opencensus-ext-azure/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opencensus-ext-azure"; version = "1.1.15"; pyproject = true; @@ -18,11 +18,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "census-instrumentation"; repo = "opencensus-python"; - tag = "opencensus-ext-azure@${version}"; + tag = "opencensus-ext-azure@${finalAttrs.version}"; hash = "sha256-fnqflSyNnkEy9XYoirk4iDZI1zYTRMbrYMyQ/4ge3Rs="; }; - sourceRoot = "${src.name}/contrib/opencensus-ext-azure"; + sourceRoot = "${finalAttrs.src.name}/contrib/opencensus-ext-azure"; build-system = [ setuptools ]; @@ -36,11 +36,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "opencensus.ext.azure" ]; - doCheck = false; # tests are not included in the PyPi tarball - meta = { homepage = "https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-azure"; description = "OpenCensus Azure Monitor Exporter"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/opencensus/default.nix b/python/pkgs/opencensus/default.nix index 540db7cd7..986e2835d 100644 --- a/python/pkgs/opencensus/default.nix +++ b/python/pkgs/opencensus/default.nix @@ -8,13 +8,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opencensus"; version = "0.11.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-y++H2Lh3MGSrYOXCoc7Vi7qjim0FLEGuwiSVjOVE7/I="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/census-instrumentation/opencensus-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/opencontainers/default.nix b/python/pkgs/opencontainers/default.nix index e25fb0ac5..e4b4e0a76 100644 --- a/python/pkgs/opencontainers/default.nix +++ b/python/pkgs/opencontainers/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytestCheckHook, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opencontainers"; version = "0.0.15"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-o6QBJMxo7aVse0xauSTxi1UEW4RYrKlhH1v6g/fvrv4="; }; + build-system = [ setuptools ]; + postPatch = '' sed -i "/pytest-runner/d" setup.py ''; @@ -24,7 +28,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "opencontainers" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.reggie; + nativeCheckInputs = [ pytestCheckHook ] ++ finalAttrs.optional-dependencies.reggie; __darwinAllowLocalNetworking = true; @@ -33,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/vsoch/oci-python"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/openerz-api/default.nix b/python/pkgs/openerz-api/default.nix index 4cc7347df..b9218ae77 100644 --- a/python/pkgs/openerz-api/default.nix +++ b/python/pkgs/openerz-api/default.nix @@ -8,7 +8,7 @@ testfixtures, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openerz-api"; version = "0.3.0"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "misialq"; repo = "openerz-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CwK61StspZJt0TALv76zfibUzlriwp9HRoYOtX9bU+c="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/misialq/openerz-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/openevsewifi/default.nix b/python/pkgs/openevsewifi/default.nix index 228115dab..a76a998b6 100644 --- a/python/pkgs/openevsewifi/default.nix +++ b/python/pkgs/openevsewifi/default.nix @@ -11,7 +11,7 @@ requests-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openevsewifi"; version = "1.1.2"; pyproject = true; @@ -19,13 +19,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miniconfig"; repo = "python-openevse-wifi"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7+BC5WG0JoyHNjgsoJBQRVDpmdXMJCV4bMf6pIaS5qo="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ deprecated requests ]; @@ -52,4 +52,4 @@ buildPythonPackage rec { homepage = "https://github.com/miniconfig/python-openevse-wifi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/openfga-sdk/default.nix b/python/pkgs/openfga-sdk/default.nix index ad335dfb1..6bb5a590e 100644 --- a/python/pkgs/openfga-sdk/default.nix +++ b/python/pkgs/openfga-sdk/default.nix @@ -15,7 +15,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openfga-sdk"; version = "0.10.4"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openfga"; repo = "python-sdk"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+LVlA+YPDCULpV+1jA+GTNh2YBLD7UrtbYVZemfB0kM="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/openfga/python-sdk"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/openidc-client/default.nix b/python/pkgs/openidc-client/default.nix index d6ee8f534..e34303da7 100644 --- a/python/pkgs/openidc-client/default.nix +++ b/python/pkgs/openidc-client/default.nix @@ -6,13 +6,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openidc-client"; version = "0.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aA6WnK4Ywwrb3dagh+0J9qKWtJN7TIvGm+gTvbv6mEc="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/puiterwijk"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/openinference-instrumentation-claude-agent-sdk/default.nix b/python/pkgs/openinference-instrumentation-claude-agent-sdk/default.nix index b8e2fef6d..9fb4f2d39 100644 --- a/python/pkgs/openinference-instrumentation-claude-agent-sdk/default.nix +++ b/python/pkgs/openinference-instrumentation-claude-agent-sdk/default.nix @@ -24,8 +24,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.7"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "Arize-ai"; repo = "openinference"; diff --git a/python/pkgs/openinference-instrumentation-openai/default.nix b/python/pkgs/openinference-instrumentation-openai/default.nix index 6a53fce6e..ea1a2d91a 100644 --- a/python/pkgs/openinference-instrumentation-openai/default.nix +++ b/python/pkgs/openinference-instrumentation-openai/default.nix @@ -25,8 +25,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.52"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "Arize-ai"; repo = "openinference"; diff --git a/python/pkgs/openinference-instrumentation/default.nix b/python/pkgs/openinference-instrumentation/default.nix index 8b39ac34a..93fea18f1 100644 --- a/python/pkgs/openinference-instrumentation/default.nix +++ b/python/pkgs/openinference-instrumentation/default.nix @@ -20,8 +20,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.54"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "Arize-ai"; repo = "openinference"; diff --git a/python/pkgs/openinference-semantic-conventions/default.nix b/python/pkgs/openinference-semantic-conventions/default.nix index 100045c40..8a40bd262 100644 --- a/python/pkgs/openinference-semantic-conventions/default.nix +++ b/python/pkgs/openinference-semantic-conventions/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.30"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "Arize-ai"; repo = "openinference"; diff --git a/python/pkgs/openpyxl/default.nix b/python/pkgs/openpyxl/default.nix index bccacf6af..b054a6cf8 100644 --- a/python/pkgs/openpyxl/default.nix +++ b/python/pkgs/openpyxl/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openpyxl"; version = "3.1.5"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { domain = "foss.heptapod.net"; owner = "openpyxl"; repo = "openpyxl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vp+TIWcHCAWlDaBcmC7w/kV7DZTZpa6463NusaJmqKo="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://openpyxl.readthedocs.org"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/openrgb-python/default.nix b/python/pkgs/openrgb-python/default.nix index 7f8f0e48a..943558d56 100644 --- a/python/pkgs/openrgb-python/default.nix +++ b/python/pkgs/openrgb-python/default.nix @@ -5,20 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openrgb-python"; version = "0.3.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-86jy8hoOgQocdCeapjaRFO9PKx/TW9kcN16UKSWNVps="; }; build-system = [ setuptools ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "openrgb" ]; @@ -27,4 +26,4 @@ buildPythonPackage rec { homepage = "https://openrgb-python.readthedocs.io/"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/opensearch-py/default.nix b/python/pkgs/opensearch-py/default.nix index 2eed4ca75..e3eecdda0 100644 --- a/python/pkgs/opensearch-py/default.nix +++ b/python/pkgs/opensearch-py/default.nix @@ -18,7 +18,7 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opensearch-py"; version = "3.0.0"; pyproject = true; @@ -26,13 +26,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "opensearch-project"; repo = "opensearch-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-IAEh+rB26Zqv7j5g2YIRZRCAtFbBngoh+w8Z4e2bY+M="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ certifi events python-dateutil @@ -43,11 +43,9 @@ buildPythonPackage rec { optional-dependencies.async = [ aiohttp ]; - doCheck = false; - meta = { description = "Python low-level client for OpenSearch"; homepage = "https://github.com/opensearch-project/opensearch-py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/openshift/default.nix b/python/pkgs/openshift/default.nix index 831eabd5d..e215169d2 100644 --- a/python/pkgs/openshift/default.nix +++ b/python/pkgs/openshift/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, jinja2, kubernetes, ruamel-yaml, @@ -9,21 +11,23 @@ python-string-utils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openshift"; version = "0.13.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "openshift"; repo = "openshift-restclient-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uLfewj7M8KNs3oL1AM18sR/WhAR2mvBfqadyhR73FP0="; }; + build-system = [ setuptools ]; + pythonRelaxDeps = [ "kubernetes" ]; - propagatedBuildInputs = [ + dependencies = [ jinja2 kubernetes python-string-utils @@ -38,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/openshift/openshift-restclient-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/openstackdocstheme/default.nix b/python/pkgs/openstackdocstheme/default.nix index 776a68833..e0d20b89b 100644 --- a/python/pkgs/openstackdocstheme/default.nix +++ b/python/pkgs/openstackdocstheme/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openstackdocstheme"; version = "3.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3h1dXtIMk1/CgbUP30ppUo+Q8qdb7PQtGIRD9eGWwJ8="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/openstackdocstheme"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/openstep-plist/default.nix b/python/pkgs/openstep-plist/default.nix index 0b1e64a78..758c5cc5b 100644 --- a/python/pkgs/openstep-plist/default.nix +++ b/python/pkgs/openstep-plist/default.nix @@ -7,14 +7,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "openstep-plist"; version = "0.5.2"; pyproject = true; src = fetchPypi { pname = "openstep_plist"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Kg1w/3oDzOZKcnBitkuy9cmvn9SmNqqkM5tqqiz2UZU="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/fonttools/openstep-plist"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/opentelemetry-api/default.nix b/python/pkgs/opentelemetry-api/default.nix index 6994b2155..84be34d21 100644 --- a/python/pkgs/opentelemetry-api/default.nix +++ b/python/pkgs/opentelemetry-api/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opentelemetry-api"; version = "1.44.0"; pyproject = true; @@ -17,11 +17,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-e0JJL2fpDPDE/REyb0QptTYe4a6/smLrV88oKwOeG4M="; }; - sourceRoot = "${src.name}/opentelemetry-api"; + sourceRoot = "${finalAttrs.src.name}/opentelemetry-api"; build-system = [ hatchling ]; @@ -35,11 +35,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry" ]; - doCheck = false; - meta = { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api"; description = "OpenTelemetry Python API"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/opentelemetry-distro/default.nix b/python/pkgs/opentelemetry-distro/default.nix index f09f5d009..1661b503f 100644 --- a/python/pkgs/opentelemetry-distro/default.nix +++ b/python/pkgs/opentelemetry-distro/default.nix @@ -13,12 +13,12 @@ opentelemetry-test-utils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opentelemetry-distro"; inherit (opentelemetry-instrumentation) src version; pyproject = true; - sourceRoot = "${src.name}/opentelemetry-distro"; + sourceRoot = "${finalAttrs.src.name}/opentelemetry-distro"; build-system = [ hatchling ]; @@ -35,4 +35,4 @@ buildPythonPackage rec { description = "OpenTelemetry Python Distro"; homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-distro"; }; -} +}) diff --git a/python/pkgs/opentelemetry-instrumentation-aiohttp-client/default.nix b/python/pkgs/opentelemetry-instrumentation-aiohttp-client/default.nix index cb0cfb497..c1996a82b 100644 --- a/python/pkgs/opentelemetry-instrumentation-aiohttp-client/default.nix +++ b/python/pkgs/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -29,7 +29,6 @@ buildPythonPackage { # missing https://github.com/ezequielramos/http-server-mock # which looks unmaintained - doCheck = false; pythonImportsCheck = [ "opentelemetry.instrumentation.aiohttp_client" ]; meta = opentelemetry-instrumentation.meta // { diff --git a/python/pkgs/opentelemetry-instrumentation-asgi/default.nix b/python/pkgs/opentelemetry-instrumentation-asgi/default.nix index e1134ea08..0f8d826b2 100644 --- a/python/pkgs/opentelemetry-instrumentation-asgi/default.nix +++ b/python/pkgs/opentelemetry-instrumentation-asgi/default.nix @@ -27,8 +27,6 @@ buildPythonPackage { opentelemetry-util-http ]; - doCheck = false; - pythonImportsCheck = [ "opentelemetry.instrumentation.asgi" ]; meta = opentelemetry-instrumentation.meta // { diff --git a/python/pkgs/opentelemetry-instrumentation-django/default.nix b/python/pkgs/opentelemetry-instrumentation-django/default.nix index e1e9f198c..fe31ecd72 100644 --- a/python/pkgs/opentelemetry-instrumentation-django/default.nix +++ b/python/pkgs/opentelemetry-instrumentation-django/default.nix @@ -11,7 +11,7 @@ opentelemetry-util-http, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-django"; pyproject = true; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-django"; description = "OpenTelemetry Instrumentation for Django"; }; -} +}) diff --git a/python/pkgs/opentelemetry-instrumentation/default.nix b/python/pkgs/opentelemetry-instrumentation/default.nix index df9b63e48..437ab3279 100644 --- a/python/pkgs/opentelemetry-instrumentation/default.nix +++ b/python/pkgs/opentelemetry-instrumentation/default.nix @@ -9,7 +9,7 @@ wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opentelemetry-instrumentation"; version = "0.55b0"; pyproject = true; @@ -17,11 +17,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UM9ezCh3TVwyj257O0rvTCIgfrddobWcVIgJmBUj/Vo="; }; - sourceRoot = "${src.name}/opentelemetry-instrumentation"; + sourceRoot = "${finalAttrs.src.name}/opentelemetry-instrumentation"; build-system = [ hatchling ]; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/opentelemetry-resourcedetector-gcp/default.nix b/python/pkgs/opentelemetry-resourcedetector-gcp/default.nix index b910850cf..1a0fd6ea9 100644 --- a/python/pkgs/opentelemetry-resourcedetector-gcp/default.nix +++ b/python/pkgs/opentelemetry-resourcedetector-gcp/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opentelemetry-resourcedetector-gcp"; version = "1.14.0"; pyproject = true; src = fetchPypi { pname = "opentelemetry_resourcedetector_gcp"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ELQYAqz4FYOKhcn+Ha4C9dJ+vBdSe3dEERHAEL6tlbw="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/opentelemetry-resourcedetector-gcp"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/opentelemetry-sdk/default.nix b/python/pkgs/opentelemetry-sdk/default.nix index cf98eff90..5fda56652 100644 --- a/python/pkgs/opentelemetry-sdk/default.nix +++ b/python/pkgs/opentelemetry-sdk/default.nix @@ -23,8 +23,6 @@ buildPythonPackage { pythonImportsCheck = [ "opentelemetry.sdk" ]; - doCheck = false; - meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-sdk"; description = "OpenTelemetry Python SDK"; diff --git a/python/pkgs/opt-einsum/default.nix b/python/pkgs/opt-einsum/default.nix index a8bec895a..92bf7972b 100644 --- a/python/pkgs/opt-einsum/default.nix +++ b/python/pkgs/opt-einsum/default.nix @@ -8,14 +8,14 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "3.4.0"; pname = "opt-einsum"; pyproject = true; src = fetchPypi { pname = "opt_einsum"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-lspy8biG0UgkE0h4NJgZTFd/owqPqsEIWGsU8bpEc6w="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/dgasmith/opt_einsum"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/optax/default.nix b/python/pkgs/optax/default.nix index d5bba99b4..e10f91eb3 100644 --- a/python/pkgs/optax/default.nix +++ b/python/pkgs/optax/default.nix @@ -36,8 +36,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "optax" ]; - doCheck = false; - meta = { description = "Gradient processing and optimization library for JAX"; homepage = "https://github.com/deepmind/optax"; diff --git a/python/pkgs/optree/default.nix b/python/pkgs/optree/default.nix index e4feca2e5..2c535d1c5 100644 --- a/python/pkgs/optree/default.nix +++ b/python/pkgs/optree/default.nix @@ -8,7 +8,7 @@ pybind11, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "optree"; version = "0.20.0"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "metaopt"; repo = "optree"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zV7DAzMXVk3xv3hL57EdxoJ89tgLm/O+9VoMKDMRnMI="; }; dontUseCmakeConfigure = true; - propagatedBuildInputs = [ typing-extensions ]; + dependencies = [ typing-extensions ]; nativeBuildInputs = [ setuptools pybind11 @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/metaopt/optree"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/oracledb/default.nix b/python/pkgs/oracledb/default.nix index ae93cfe1c..f83dcb976 100644 --- a/python/pkgs/oracledb/default.nix +++ b/python/pkgs/oracledb/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oracledb"; version = "4.0.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oracle"; repo = "python-oracledb"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-xT2PWP6kQ0K+9kxe0vNWY5+kMyKZ1J7toiEZBxfsAGE="; }; @@ -32,7 +32,6 @@ buildPythonPackage rec { ]; # Checks need an Oracle database - doCheck = false; pythonImportsCheck = [ "oracledb" ]; @@ -44,4 +43,4 @@ buildPythonPackage rec { upl ]; }; -} +}) diff --git a/python/pkgs/orbax-checkpoint/default.nix b/python/pkgs/orbax-checkpoint/default.nix index 0e43d448c..64123d997 100644 --- a/python/pkgs/orbax-checkpoint/default.nix +++ b/python/pkgs/orbax-checkpoint/default.nix @@ -28,7 +28,6 @@ buildPythonPackage (finalAttrs: { pname = "orbax-checkpoint"; version = "0.12.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "google"; @@ -66,8 +65,6 @@ buildPythonPackage (finalAttrs: { "orbax.checkpoint" ]; - doCheck = false; - meta = { description = "Orbax provides common utility libraries for JAX users"; homepage = "https://github.com/google/orbax/tree/main/checkpoint"; diff --git a/python/pkgs/ordered-set/default.nix b/python/pkgs/ordered-set/default.nix index 6cf9f30fa..50a81f2d1 100644 --- a/python/pkgs/ordered-set/default.nix +++ b/python/pkgs/ordered-set/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ordered-set"; version = "4.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aUqORMh2V8WSku3nKJHrkdNBMfZTFGOqswCRkcdzZKg="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/rspeer/ordered-set"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/orderedmultidict/default.nix b/python/pkgs/orderedmultidict/default.nix index edf258186..73747a2fb 100644 --- a/python/pkgs/orderedmultidict/default.nix +++ b/python/pkgs/orderedmultidict/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "orderedmultidict"; version = "1.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-FqeuhDLgLMmH0tbVry31k4JY+HyHBnXHPud6CSDm9KY="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { dependencies = [ six ]; - doCheck = false; - pythonImportsCheck = [ "orderedmultidict" ]; meta = { @@ -29,4 +27,4 @@ buildPythonPackage rec { description = "Ordered Multivalue Dictionary"; license = lib.licenses.unlicense; }; -} +}) diff --git a/python/pkgs/orderly-set/default.nix b/python/pkgs/orderly-set/default.nix index 5e2fcc9c1..f0ac0f2e9 100644 --- a/python/pkgs/orderly-set/default.nix +++ b/python/pkgs/orderly-set/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "orderly-set"; version = "5.5.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "seperman"; repo = "orderly-set"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xrxH/LB+cyZlVf+sVwOtAf9+DojYPDnudHpqlVuARLg="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/seperman/orderly-set"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/orjson/default.nix b/python/pkgs/orjson/default.nix index dd35b8b53..a532be782 100644 --- a/python/pkgs/orjson/default.nix +++ b/python/pkgs/orjson/default.nix @@ -12,7 +12,7 @@ libiconv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "orjson"; version = "3.11.7"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ijl"; repo = "orjson"; - tag = version; + tag = finalAttrs.version; hash = "sha256-4a8vNQEe1P1t2BcqSL+d+GLHi1lhUtbA7p5/vj/J0Lc="; }; @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-eB7jVTsvBSUjtaKsbRnRtYSd+SqnCaoDyG76iExmSHc="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/ormsgpack/default.nix b/python/pkgs/ormsgpack/default.nix index db35a77e6..74c3a3a8a 100644 --- a/python/pkgs/ormsgpack/default.nix +++ b/python/pkgs/ormsgpack/default.nix @@ -15,7 +15,7 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ormsgpack"; version = "1.12.2"; pyproject = true; @@ -23,12 +23,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aviramha"; repo = "ormsgpack"; - tag = version; + tag = finalAttrs.version; hash = "sha256-a2PgCCIPPJt6YNW7UFl9urYZkAoVj5Np0lbv4QfzMAs="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit (finalAttrs) src; hash = "sha256-PLLSVoQLsbTOIMqOsaaei/dm8SybfyqP0WLJW8hTOoo="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/os-service-types/default.nix b/python/pkgs/os-service-types/default.nix index f6d7a59bc..e55e3b0a4 100644 --- a/python/pkgs/os-service-types/default.nix +++ b/python/pkgs/os-service-types/default.nix @@ -7,14 +7,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "os-service-types"; version = "1.9.0"; pyproject = true; src = fetchPypi { pname = "os_service_types"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Hy5ftx0fb0/zHYmSZ08jaEZbwvJc2UAYAVw92/xcYX8="; }; @@ -30,11 +30,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "os_service_types" ]; - doCheck = false; - meta = { description = "Python library for consuming OpenStack service-types-authority data"; homepage = "https://github.com/openstack/os-service-types"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/osc-lib/default.nix b/python/pkgs/osc-lib/default.nix index 29811eac1..5b58e374d 100644 --- a/python/pkgs/osc-lib/default.nix +++ b/python/pkgs/osc-lib/default.nix @@ -13,7 +13,7 @@ stevedore, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "osc-lib"; version = "4.6.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openstack"; repo = "osc-lib"; - tag = version; + tag = finalAttrs.version; hash = "sha256-XwOJSd3k/74FvSZGveSTjH+KGLlQ2jNbk8GrTzFhbL0="; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { ./fix-pyproject.diff ]; - env.PBR_VERSION = version; + env.PBR_VERSION = finalAttrs.version; build-system = [ pbr @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/osc-lib"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/osc-placement/default.nix b/python/pkgs/osc-placement/default.nix index 898fcc7f9..a7d4dc02f 100644 --- a/python/pkgs/osc-placement/default.nix +++ b/python/pkgs/osc-placement/default.nix @@ -11,7 +11,7 @@ sphinxHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "osc-placement"; version = "4.8.0"; pyproject = true; @@ -19,11 +19,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openstack"; repo = "osc-placement"; - tag = version; + tag = finalAttrs.version; hash = "sha256-txxLtg3fDrkPqU0k/PlwvpJJBzVLtJXz82mhPWo+rKc="; }; - env.PBR_VERSION = version; + env.PBR_VERSION = finalAttrs.version; build-system = [ pbr @@ -51,4 +51,4 @@ buildPythonPackage rec { description = "OpenStackClient plugin for the Placement service"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/oscrypto/default.nix b/python/pkgs/oscrypto/default.nix index 0864de2d5..64bb67a70 100644 --- a/python/pkgs/oscrypto/default.nix +++ b/python/pkgs/oscrypto/default.nix @@ -5,21 +5,25 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + # build-system + setuptools, openssl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oscrypto"; version = "1.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "wbond"; repo = "oscrypto"; - rev = version; + tag = finalAttrs.version; hash = "sha256-CmDypmlc/kb6ONCUggjT1Iqd29xNSLRaGh5Hz36dvOw="; }; + build-system = [ setuptools ]; + patches = [ ./support-openssl-3.0.10.patch @@ -38,7 +42,7 @@ buildPythonPackage rec { done ''; - propagatedBuildInputs = [ asn1crypto ]; + dependencies = [ asn1crypto ]; pythonImportsCheck = [ "oscrypto" ]; doCheck = !stdenv.hostPlatform.isDarwin; @@ -47,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/wbond/oscrypto"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/oset/default.nix b/python/pkgs/oset/default.nix index c2742e82f..3e7b9b44f 100644 --- a/python/pkgs/oset/default.nix +++ b/python/pkgs/oset/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oset"; version = "0.1.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "017rr1m72s2fh9bmz5vrvc5mshczgzisi5894v9zkvvfr7gdf7sc"; }; + build-system = [ setuptools ]; + meta = { description = "Ordered set"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/oslo-concurrency/default.nix b/python/pkgs/oslo-concurrency/default.nix index 1dac0c7cb..d5d95cb36 100644 --- a/python/pkgs/oslo-concurrency/default.nix +++ b/python/pkgs/oslo-concurrency/default.nix @@ -13,7 +13,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oslo-concurrency"; version = "7.4.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openstack"; repo = "oslo.concurrency"; - tag = version; + tag = finalAttrs.version; hash = "sha256-NZ6OsaDwqEsW2FZEi8cjXkLa7EwVqt3mYPRkG/jGiFM="; }; @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace-fail '"oslo_concurrency"' '"oslo_concurrency", "oslo_concurrency.fixture", "oslo_concurrency.tests"' ''; - env.PBR_VERSION = version; + env.PBR_VERSION = finalAttrs.version; build-system = [ setuptools ]; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/oslo.concurrency"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/oslo-config/default.nix b/python/pkgs/oslo-config/default.nix index c71164c7f..01ba8eb39 100644 --- a/python/pkgs/oslo-config/default.nix +++ b/python/pkgs/oslo-config/default.nix @@ -12,14 +12,14 @@ stevedore, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oslo-config"; version = "10.7.0"; pyproject = true; src = fetchPypi { pname = "oslo_config"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Tw/Uyn7P5RH7wOAS08Y/zlcAnzYBmenpzCMp7VXskR4="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/oslo.config"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/oslo-context/default.nix b/python/pkgs/oslo-context/default.nix index e9e31472b..dff3cef93 100644 --- a/python/pkgs/oslo-context/default.nix +++ b/python/pkgs/oslo-context/default.nix @@ -7,13 +7,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oslo-context"; version = "6.5.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "oslo_context"; hash = "sha256-fh+wPGqXFnlZ832TAwAVTg7oN+zbhXmMK76IeLVsqq8="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/oslo.context"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/oslo-db/default.nix b/python/pkgs/oslo-db/default.nix index 0a049b5c6..0b063abe4 100644 --- a/python/pkgs/oslo-db/default.nix +++ b/python/pkgs/oslo-db/default.nix @@ -13,14 +13,14 @@ stevedore, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oslo-db"; version = "18.1.0"; pyproject = true; src = fetchPypi { pname = "oslo_db"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-B16GziPAwh2x01CR8dyyGwVEnInDpDJtpPLT+4MwIj8="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/oslo.db"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/oslo-i18n/default.nix b/python/pkgs/oslo-i18n/default.nix index d0dc48106..7f1d1a4c3 100644 --- a/python/pkgs/oslo-i18n/default.nix +++ b/python/pkgs/oslo-i18n/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oslo-i18n"; version = "6.9.0"; pyproject = true; src = fetchPypi { pname = "oslo_i18n"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-V0vPIYc7GFBovOyVHeHsCTFY/9/wWoBV/Rjdy2n2nmU="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/oslo.i18n"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/oslo-log/default.nix b/python/pkgs/oslo-log/default.nix index a34f48473..61e8ddf88 100644 --- a/python/pkgs/oslo-log/default.nix +++ b/python/pkgs/oslo-log/default.nix @@ -14,7 +14,7 @@ python-dateutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oslo-log"; version = "8.1.0"; pyproject = true; @@ -22,13 +22,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openstack"; repo = "oslo.log"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ThRJ2rfVStnVOwcu8ZaKDjqb4jT6YE+n+iOFtmR8rwQ="; }; # Manually set version because prb wants to get it from the git upstream repository (and we are # installing from tarball instead) - env.PBR_VERSION = version; + env.PBR_VERSION = finalAttrs.version; build-system = [ setuptools ]; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/oslo.log"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/oslo-serialization/default.nix b/python/pkgs/oslo-serialization/default.nix index b64489a9f..30f785e4c 100644 --- a/python/pkgs/oslo-serialization/default.nix +++ b/python/pkgs/oslo-serialization/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oslo-serialization"; version = "5.11.0"; pyproject = true; src = fetchPypi { pname = "oslo_serialization"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-gyboWoCFbBBoAHQj/Pb+Kd0v5Xoy9dh//wEgtVW0tnw="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/oslo.serialization"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/oslo-utils/default.nix b/python/pkgs/oslo-utils/default.nix index 8073fdb26..62c2de4b2 100644 --- a/python/pkgs/oslo-utils/default.nix +++ b/python/pkgs/oslo-utils/default.nix @@ -18,14 +18,14 @@ stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oslo-utils"; version = "10.2.0"; pyproject = true; src = fetchPypi { pname = "oslo_utils"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-uoOd6iwetBXj7hUcTMaI9S4oP1m8H3fMhnchkKizQlk="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/oslo.utils"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ospd/default.nix b/python/pkgs/ospd/default.nix index 37187ba9d..af47fb55b 100644 --- a/python/pkgs/ospd/default.nix +++ b/python/pkgs/ospd/default.nix @@ -5,24 +5,28 @@ defusedxml, deprecated, fetchFromGitHub, + # build-system + setuptools, lxml, paramiko, psutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ospd"; version = "21.4.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "ospd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dZgs+G2vJQIKnN9xHcNeNViG7mOIdKb+Ms2AKE+FC4M="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ defusedxml deprecated lxml @@ -38,4 +42,4 @@ buildPythonPackage rec { license = lib.licenses.agpl3Plus; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/python/pkgs/osprofiler/default.nix b/python/pkgs/osprofiler/default.nix index a6af4f465..64587f257 100644 --- a/python/pkgs/osprofiler/default.nix +++ b/python/pkgs/osprofiler/default.nix @@ -13,13 +13,13 @@ webob, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "osprofiler"; version = "4.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bgjffu9q/A0tAngT1A5DyyKPDrPrNEHWFJXCgA6/oyA="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "osprofiler"; }; -} +}) diff --git a/python/pkgs/osqp/default.nix b/python/pkgs/osqp/default.nix index a23aa4afc..29655a2d7 100644 --- a/python/pkgs/osqp/default.nix +++ b/python/pkgs/osqp/default.nix @@ -46,7 +46,6 @@ buildPythonPackage (finalAttrs: { pname = "osqp"; version = "1.1.3"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "osqp"; diff --git a/python/pkgs/outcome/default.nix b/python/pkgs/outcome/default.nix index 0915d5963..f2df6864a 100644 --- a/python/pkgs/outcome/default.nix +++ b/python/pkgs/outcome/default.nix @@ -6,13 +6,13 @@ attrs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "outcome"; version = "1.3.0.post0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nc8C5l8pcbgAR7N3Ro5yomjhXArzzxI45v8U9/kRQ7g="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { dependencies = [ attrs ]; - doCheck = false; - pythonImportsCheck = [ "outcome" ]; meta = { @@ -32,4 +30,4 @@ buildPythonPackage rec { asl20 ]; }; -} +}) diff --git a/python/pkgs/outdated/default.nix b/python/pkgs/outdated/default.nix index 15b664d43..b6c9c0ab4 100644 --- a/python/pkgs/outdated/default.nix +++ b/python/pkgs/outdated/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "outdated"; version = "0.2.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alexmojaki"; repo = "outdated"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5VpPmgIcVtY97F0Hb0m9MuSW0zjaUJ18ATA4GBRw+jc="; }; @@ -26,8 +26,6 @@ buildPythonPackage rec { requests ]; - doCheck = false; - pythonImportsCheck = [ "outdated" ]; meta = { @@ -35,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/alexmojaki/outdated"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/overpy/default.nix b/python/pkgs/overpy/default.nix index 8782d8330..448360272 100644 --- a/python/pkgs/overpy/default.nix +++ b/python/pkgs/overpy/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "overpy"; version = "0.7"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DinoTools"; repo = "python-overpy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+bMpA4xDvnQl6Q0M2iGrsUHGLuR/gLimJgmZCMzsLvA="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/DinoTools/python-overpy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/overrides/default.nix b/python/pkgs/overrides/default.nix index cabb8e971..d7f4e5c42 100644 --- a/python/pkgs/overrides/default.nix +++ b/python/pkgs/overrides/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "overrides"; version = "7.7.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkorpela"; repo = "overrides"; - tag = version; + tag = finalAttrs.version; hash = "sha256-gQDw5/RpAFNYWFOuxIAArPkCOoBYWUnsDtv1FEFteHo="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/mkorpela/overrides"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ovh/default.nix b/python/pkgs/ovh/default.nix index c786d46a0..d18f1498b 100644 --- a/python/pkgs/ovh/default.nix +++ b/python/pkgs/ovh/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ovh"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0xHwjsF7YsxhIWs9rPA+6J+VodqQNqWV2sKfydeYuCc="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/ovh/python-ovh"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/owslib/default.nix b/python/pkgs/owslib/default.nix index abdf14e79..a191dac76 100644 --- a/python/pkgs/owslib/default.nix +++ b/python/pkgs/owslib/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "owslib"; version = "0.36.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "geopython"; repo = "OWSLib"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Of/CSLcNnpTYHRm4toQK4/HXTWNcuEMkW6obWpg96Tc="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://www.osgeo.org/projects/owslib/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pa-ringbuffer/default.nix b/python/pkgs/pa-ringbuffer/default.nix index bac40a0c6..759ab06ec 100644 --- a/python/pkgs/pa-ringbuffer/default.nix +++ b/python/pkgs/pa-ringbuffer/default.nix @@ -1,24 +1,28 @@ { fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pa-ringbuffer"; version = "0.1.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "spatialaudio"; repo = "python-pa-ringbuffer"; - rev = version; + tag = finalAttrs.version; sha256 = "1d4k6z13mc1f88m6wbhfx8hillb7q78n33ws5bmyblsdkv1gx607"; }; + build-system = [ setuptools ]; + meta = { description = "Adds ring buffer functionality"; homepage = "https://github.com/spatialaudio/python-pa-ringbuffer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/packageurl-python/default.nix b/python/pkgs/packageurl-python/default.nix index 95ab5eb76..b71d61b62 100644 --- a/python/pkgs/packageurl-python/default.nix +++ b/python/pkgs/packageurl-python/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "packageurl-python"; version = "0.17.6"; pyproject = true; src = fetchPypi { pname = "packageurl_python"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ElLOOhAjcspvhuuWjhb5AUxLpRHFw32Vp/Aj4spuXCU="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/package-url/packageurl-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/packaging-legacy/default.nix b/python/pkgs/packaging-legacy/default.nix index ca9b5be25..5b324e4e8 100644 --- a/python/pkgs/packaging-legacy/default.nix +++ b/python/pkgs/packaging-legacy/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "packaging-legacy"; version = "23.0.post0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "di"; repo = "packaging_legacy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2TnJjxasC8+c+qHY60e6Jyqhf1nQJfj/tmIA/LvUsT8="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/di/packaging_legacy"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/packaging/default.nix b/python/pkgs/packaging/default.nix index 052cc5f12..47255f2b4 100644 --- a/python/pkgs/packaging/default.nix +++ b/python/pkgs/packaging/default.nix @@ -31,7 +31,6 @@ buildPythonPackage (finalAttrs: { ]; # Prevent circular dependency with pytest - doCheck = false; passthru.tests = packaging.overridePythonAttrs (_: { doCheck = true; diff --git a/python/pkgs/packbits/default.nix b/python/pkgs/packbits/default.nix index a95efa3fe..84e475250 100644 --- a/python/pkgs/packbits/default.nix +++ b/python/pkgs/packbits/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "packbits"; version = "0.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vGs3C7NOBKyM+oNeBsBIQ4Cv/G1ZOtuACd1sD3v/8DQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "PackBits encoder/decoder for Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/paginate/default.nix b/python/pkgs/paginate/default.nix index 2aa40bb29..518daab2a 100644 --- a/python/pkgs/paginate/default.nix +++ b/python/pkgs/paginate/default.nix @@ -10,7 +10,7 @@ # tests }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "paginate"; version = "0.5.7"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Pylons"; repo = "paginate"; - rev = version; + tag = finalAttrs.version; hash = "sha256-+zX9uGNWcV4BWbD2lcd1u9zZ4m7CnbsYZnc99HNaF8I="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/Pylons/paginate"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/paho-mqtt/default.nix b/python/pkgs/paho-mqtt/default.nix index e09390c70..477da7ef6 100644 --- a/python/pkgs/paho-mqtt/default.nix +++ b/python/pkgs/paho-mqtt/default.nix @@ -5,21 +5,19 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "paho-mqtt"; version = "2.1.0"; pyproject = true; src = fetchPypi { pname = "paho_mqtt"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-EtbnUR1BN1VaP26hZ66EavLHNXsQvG+k98OWj8FyODQ="; }; build-system = [ hatchling ]; - doCheck = false; - pythonImportsCheck = [ "paho.mqtt" ]; meta = { @@ -27,4 +25,4 @@ buildPythonPackage rec { homepage = "https://eclipse.org/paho"; license = lib.licenses.epl20; }; -} +}) diff --git a/python/pkgs/palettable/default.nix b/python/pkgs/palettable/default.nix index cd1e6cf11..c07b02966 100644 --- a/python/pkgs/palettable/default.nix +++ b/python/pkgs/palettable/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "palettable"; version = "3.3.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CU3X2aX8HMpIVHc+XB/GoxWzO9WzqPRwZJKPrK8EkKg="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://jiffyclub.github.io/palettable/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pallets-sphinx-themes/default.nix b/python/pkgs/pallets-sphinx-themes/default.nix index c2af324ed..69a32c8b4 100644 --- a/python/pkgs/pallets-sphinx-themes/default.nix +++ b/python/pkgs/pallets-sphinx-themes/default.nix @@ -8,7 +8,7 @@ sphinx-notfound-page, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pallets-sphinx-themes"; version = "2.5.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pallets"; repo = "pallets-sphinx-themes"; - tag = version; + tag = finalAttrs.version; hash = "sha256-nmukg/h6DMv6t0wl84VEvHIHzk0G0VDaHZsb8y+OO4M="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { description = "Sphinx theme for Pallets projects"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pamela/default.nix b/python/pkgs/pamela/default.nix index bd4b7dbe9..49fc53f84 100644 --- a/python/pkgs/pamela/default.nix +++ b/python/pkgs/pamela/default.nix @@ -13,7 +13,6 @@ buildPythonPackage (finalAttrs: { pname = "pamela"; version = "1.2.0"; pyproject = true; - __structuredAttrs = true; src = fetchPypi { inherit (finalAttrs) pname version; diff --git a/python/pkgs/pandas-flavor/default.nix b/python/pkgs/pandas-flavor/default.nix index b2c654634..4dece0559 100644 --- a/python/pkgs/pandas-flavor/default.nix +++ b/python/pkgs/pandas-flavor/default.nix @@ -13,7 +13,6 @@ buildPythonPackage (finalAttrs: { pname = "pandas-flavor"; version = "0.8.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "pyjanitor-devs"; diff --git a/python/pkgs/pandas-stubs/default.nix b/python/pkgs/pandas-stubs/default.nix index a4e4fa0f3..75b23e8b6 100644 --- a/python/pkgs/pandas-stubs/default.nix +++ b/python/pkgs/pandas-stubs/default.nix @@ -11,7 +11,7 @@ types-pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pandas-stubs"; version = "2.3.3.260113"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pandas-dev"; repo = "pandas-stubs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DJS3aG79IZowiTqHeOEgDdlH9Z1SXrbZ7yplCrFTtzw="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/pandas-dev/pandas-stubs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pandas/default.nix b/python/pkgs/pandas/default.nix index 2831f3a8a..a9123f99e 100644 --- a/python/pkgs/pandas/default.nix +++ b/python/pkgs/pandas/default.nix @@ -38,7 +38,7 @@ zstandard, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pandas"; version = "3.0.5"; pyproject = true; @@ -46,7 +46,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pandas-dev"; repo = "pandas"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6Oo6086DAmgONadGyNLg9RvtibsSlR0EJmjoKTbRtM0="; }; @@ -126,8 +126,6 @@ buildPythonPackage rec { in extras // { all = lib.concatLists (lib.attrValues extras); }; - doCheck = false; - pythonImportsCheck = [ "pandas" ]; meta = { @@ -141,4 +139,4 @@ buildPythonPackage rec { objects, statistical functions, and much more. ''; }; -} +}) diff --git a/python/pkgs/pandocfilters/default.nix b/python/pkgs/pandocfilters/default.nix index aa8b3c09a..109568ff8 100644 --- a/python/pkgs/pandocfilters/default.nix +++ b/python/pkgs/pandocfilters/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "1.5.1"; - format = "setuptools"; + pyproject = true; pname = "pandocfilters"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ACtKVV7k68A/i2Ywfih/pJLkp3tOoU0/k0MoKXu0k54="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "pandocfilters" ]; meta = { @@ -21,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/jgm/pandocfilters"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/panel/default.nix b/python/pkgs/panel/default.nix index 99b918127..d8254a80a 100644 --- a/python/pkgs/panel/default.nix +++ b/python/pkgs/panel/default.nix @@ -19,7 +19,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "panel"; version = "1.9.4"; @@ -29,7 +29,7 @@ buildPythonPackage rec { # artifacts using npm, the bundling invoked in setup.py # tries to fetch even more artifacts src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; format = "wheel"; hash = "sha256-yJxMHnKCl9rwYo6lBw+w2orXd4HioxQtMCR5U3wd5qQ="; dist = "py3"; @@ -46,7 +46,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "bokeh" ]; - propagatedBuildInputs = [ + dependencies = [ bleach bokeh linkify-it-py @@ -67,7 +67,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "panel" ]; # infinite recursion in test dependencies (hvplot) - doCheck = false; meta = { description = "High level dashboarding library for python visualization libraries"; @@ -75,4 +74,4 @@ buildPythonPackage rec { homepage = "https://github.com/holoviz/panel"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/panflute/default.nix b/python/pkgs/panflute/default.nix index baa3715f7..0dd7a1883 100644 --- a/python/pkgs/panflute/default.nix +++ b/python/pkgs/panflute/default.nix @@ -7,13 +7,13 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "panflute"; version = "2.3.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XxvQKjTvOYLuAl7FtY+zpu7fwx2ZS4rjnY3JkVotjx8="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://scorreia.com/software/panflute"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/papermill/default.nix b/python/pkgs/papermill/default.nix index cf01fd23c..4e6822d01 100644 --- a/python/pkgs/papermill/default.nix +++ b/python/pkgs/papermill/default.nix @@ -30,7 +30,7 @@ boto3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "papermill"; version = "2.6.0"; pyproject = true; @@ -38,7 +38,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nteract"; repo = "papermill"; - tag = version; + tag = finalAttrs.version; hash = "sha256-NxC5+hRDdMCl/7ZIho5ml4hdENrgO+wzi87GRPeMv8Q="; }; @@ -75,4 +75,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "papermill"; }; -} +}) diff --git a/python/pkgs/param/default.nix b/python/pkgs/param/default.nix index f23056377..612a1b372 100644 --- a/python/pkgs/param/default.nix +++ b/python/pkgs/param/default.nix @@ -6,13 +6,13 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "param"; version = "2.4.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QMqUtyyXvxmYMlc44ALVic4xp8+0zFZUnwXapsz5gEM="; }; @@ -21,8 +21,6 @@ buildPythonPackage rec { hatch-vcs ]; - doCheck = false; - pythonImportsCheck = [ "param" ]; meta = { @@ -30,4 +28,4 @@ buildPythonPackage rec { description = "Declarative Python programming using Parameters"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/parameterized/default.nix b/python/pkgs/parameterized/default.nix index 56252d2d0..04e3cfa5b 100644 --- a/python/pkgs/parameterized/default.nix +++ b/python/pkgs/parameterized/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "parameterized"; version = "0.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-f8kFJyzvpPNkwaNCnLvpwPmLeTmI77W/kKrIDwjbCbE="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/wolever/parameterized"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/paramiko/default.nix b/python/pkgs/paramiko/default.nix index b5a65e219..caee3cb4b 100644 --- a/python/pkgs/paramiko/default.nix +++ b/python/pkgs/paramiko/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "paramiko"; version = "5.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NnY7W5XCoNz98avEjkgVbuQlsh7+Lw54fC3VqVwOXnk="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { supported. SFTP client and server mode are both supported too. ''; }; -} +}) diff --git a/python/pkgs/parse-type/default.nix b/python/pkgs/parse-type/default.nix index fff3fff39..9474272d1 100644 --- a/python/pkgs/parse-type/default.nix +++ b/python/pkgs/parse-type/default.nix @@ -8,14 +8,14 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "parse-type"; version = "0.6.6"; pyproject = true; src = fetchPypi { pname = "parse_type"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-UTo3hBBIOXcNaQ4EM5qLTTNDn81d2Z8uRYD5/BCXv7I="; }; @@ -31,11 +31,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "parse_type" ]; - doCheck = false; - meta = { homepage = "https://github.com/jenisys/parse_type"; description = "Simplifies to build parse types based on the parse module"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/parse/default.nix b/python/pkgs/parse/default.nix index 1dc24ab66..bfe38cb4a 100644 --- a/python/pkgs/parse/default.nix +++ b/python/pkgs/parse/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "parse"; version = "1.22.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-06R0DsPaM44rJYstaXQbcx6t/dylniShS8TuX844yRE="; }; @@ -19,11 +19,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "parse" ]; - doCheck = false; - meta = { homepage = "https://github.com/r1chardj0n3s/parse"; description = "parse() is the opposite of format()"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/parsedatetime/default.nix b/python/pkgs/parsedatetime/default.nix index 6aa3784e6..7c479037a 100644 --- a/python/pkgs/parsedatetime/default.nix +++ b/python/pkgs/parsedatetime/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "parsedatetime"; version = "2.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-TLNo+7GKC3Ix9NdhGRZUUcjS41lRRV3+6XxiqHsE1FU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Parse human-readable date/time text"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/parsel/default.nix b/python/pkgs/parsel/default.nix index c37d7fb46..8953821a9 100644 --- a/python/pkgs/parsel/default.nix +++ b/python/pkgs/parsel/default.nix @@ -10,13 +10,13 @@ w3lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "parsel"; version = "1.11.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-WSX+CH6xb8QEp+2R4x4sHiqbIw2ktk802BNYwNDifog="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { description = "Python library to extract data from HTML and XML using XPath and CSS selectors"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/parsimonious/default.nix b/python/pkgs/parsimonious/default.nix index e2565c20f..d3b581353 100644 --- a/python/pkgs/parsimonious/default.nix +++ b/python/pkgs/parsimonious/default.nix @@ -11,13 +11,13 @@ regex, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "parsimonious"; version = "0.11.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4IA3fZiVe+7AU1gNOK5U/N98Rw+3hnC6S/i1+dXK0qk="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/erikrose/parsimonious"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/parsley/default.nix b/python/pkgs/parsley/default.nix index 26701afaf..9efa3bffc 100644 --- a/python/pkgs/parsley/default.nix +++ b/python/pkgs/parsley/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "parsley"; version = "1.3"; pyproject = true; src = fetchPypi { pname = "Parsley"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-lEQnjUcWHV8r52p2eAmjy+bbTbgi9GpP10gdQFcgjUE="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://launchpad.net/parsley"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/partd/default.nix b/python/pkgs/partd/default.nix index b027d2195..877536b29 100644 --- a/python/pkgs/partd/default.nix +++ b/python/pkgs/partd/default.nix @@ -20,7 +20,7 @@ # tests }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "partd"; version = "1.4.2"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dask"; repo = "partd"; - tag = version; + tag = finalAttrs.version; hash = "sha256-GtIo6n87TmM5aRgtRyxhhXXAINpPCFbjZ/sQz/vkcoA="; }; @@ -37,7 +37,7 @@ buildPythonPackage rec { versioneer ]; - propagatedBuildInputs = [ + dependencies = [ locket toolz ]; @@ -55,4 +55,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; homepage = "https://github.com/dask/partd/"; }; -} +}) diff --git a/python/pkgs/partial-json-parser/default.nix b/python/pkgs/partial-json-parser/default.nix index 42a3023c7..264b3ca32 100644 --- a/python/pkgs/partial-json-parser/default.nix +++ b/python/pkgs/partial-json-parser/default.nix @@ -8,14 +8,14 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "partial-json-parser"; version = "0.2.1.post1"; pyproject = true; src = fetchPypi { pname = "partial_json_parser"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-4W+GStbixThNOpF5WYm0e4Uyk5cxh2oyO8qsiX32ixI="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/promplate/partial-json-parser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/particle/default.nix b/python/pkgs/particle/default.nix index 418bae705..d423a105d 100644 --- a/python/pkgs/particle/default.nix +++ b/python/pkgs/particle/default.nix @@ -9,13 +9,13 @@ hepunits, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "particle"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SRRd7By1BEsH8+jpAigPoFCVD6hFsFgAPmneUZu1BJI="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/scikit-hep/particle"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/parver/default.nix b/python/pkgs/parver/default.nix index f5d1263aa..8eaeb4886 100644 --- a/python/pkgs/parver/default.nix +++ b/python/pkgs/parver/default.nix @@ -7,13 +7,13 @@ arpeggio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "parver"; version = "1.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-pY8SOrGijG93Oo8RMlicocXUMKLFsmEeD8b7Nm3xJiI="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/RazerM/parver"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/passlib/default.nix b/python/pkgs/passlib/default.nix index a4080244c..91382b234 100644 --- a/python/pkgs/passlib/default.nix +++ b/python/pkgs/passlib/default.nix @@ -12,7 +12,7 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "passlib"; version = "1.9.3"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ThirVondukr"; repo = "passlib"; - tag = version; + tag = finalAttrs.version; hash = "sha256-fzI9HpGE3wNK41ZSOeA5NAr5T4r3Jzdqe5+SHoWVXUs="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { description = "Comprehensive password hashing framework supporting over 30 schemes"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/paste/default.nix b/python/pkgs/paste/default.nix index 1203e42b9..f0e248b57 100644 --- a/python/pkgs/paste/default.nix +++ b/python/pkgs/paste/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "paste"; version = "3.10.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-HD0SBlpeinoYwMe+FlOpfPOMw+mloMgzSp3ZktOgXko="; }; @@ -23,8 +23,6 @@ buildPythonPackage rec { six ]; - doCheck = false; - pythonImportsCheck = [ "paste" ]; meta = { @@ -32,4 +30,4 @@ buildPythonPackage rec { description = "Tools for using a Web Server Gateway Interface stack"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pastedeploy/default.nix b/python/pkgs/pastedeploy/default.nix index 8ff27467c..51ee75893 100644 --- a/python/pkgs/pastedeploy/default.nix +++ b/python/pkgs/pastedeploy/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "PasteDeploy"; version = "3.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nduvFS+AlUOKn+gfgseKZxS5KujgZr7UGLan/2oJWpU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/Pylons/pastedeploy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pastel/default.nix b/python/pkgs/pastel/default.nix index df6f57bfe..70b5b008e 100644 --- a/python/pkgs/pastel/default.nix +++ b/python/pkgs/pastel/default.nix @@ -5,20 +5,18 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pastel"; version = "0.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5lgawE6XPKyFiCjGICweHoH+4dx952g/Ph/+C/2KVz0="; }; build-system = [ poetry-core ]; - doCheck = false; - pythonImportsCheck = [ "pastel" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/sdispater/pastel"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pastescript/default.nix b/python/pkgs/pastescript/default.nix index ce600c758..c26fcce5b 100644 --- a/python/pkgs/pastescript/default.nix +++ b/python/pkgs/pastescript/default.nix @@ -8,13 +8,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pastescript"; version = "3.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-U28CjftuUynGezIpnhyTA/kSZOSXk8xpFusKc+tKJSE="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/cdent/pastescript/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/patch-ng/default.nix b/python/pkgs/patch-ng/default.nix index a729ac28a..4bb38c7c7 100644 --- a/python/pkgs/patch-ng/default.nix +++ b/python/pkgs/patch-ng/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "patch-ng"; version = "1.19.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-J0hHkvSsHBX+Lz5M7PdLuYM9M7dccVtx0Zn34efR94Y="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "patch_ng" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { description = "Library to parse and apply unified diffs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/patch/default.nix b/python/pkgs/patch/default.nix index 05c8587f2..7916ef52d 100644 --- a/python/pkgs/patch/default.nix +++ b/python/pkgs/patch/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchzip, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "1.16"; - format = "setuptools"; + pyproject = true; pname = "patch"; src = fetchzip { - url = "mirror://pypi/p/${pname}/${pname}-${version}.zip"; + url = "mirror://pypi/p/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.zip"; sha256 = "1nj55hvyvzax4lxq7vkyfbw91pianzr3hp7ka7j12pgjxccac50g"; stripRoot = false; }; + build-system = [ setuptools ]; + # No tests included in archive meta = { @@ -22,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/techtonik/python-patch/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/path-and-address/default.nix b/python/pkgs/path-and-address/default.nix index 9fdd142e5..b6be1a8c8 100644 --- a/python/pkgs/path-and-address/default.nix +++ b/python/pkgs/path-and-address/default.nix @@ -1,18 +1,22 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "2.0.1"; - format = "setuptools"; + pyproject = true; pname = "path-and-address"; src = fetchFromGitHub { owner = "joeyespo"; repo = "path-and-address"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0b0afpsaim06mv3lhbpm8fmawcraggc11jhzr6h72kdj1cqjk5h6"; }; -} + build-system = [ setuptools ]; + +}) diff --git a/python/pkgs/path/default.nix b/python/pkgs/path/default.nix index b1bdfc6ca..2f561fce7 100644 --- a/python/pkgs/path/default.nix +++ b/python/pkgs/path/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "path"; version = "17.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Lfy/7ItNlg80acUqzxMxE8KovxKse5jWKfqRr4ckjUI="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/path"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pathable/default.nix b/python/pkgs/pathable/default.nix index 0f862fa5d..debdce589 100644 --- a/python/pkgs/pathable/default.nix +++ b/python/pkgs/pathable/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pathable"; version = "0.6.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "p1c2u"; repo = "pathable"; - tag = version; + tag = finalAttrs.version; hash = "sha256-DjIn+hXZvx4tKyzQlWPwIxHD8vWy/jEvhdFY6HC+sdo="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/p1c2u/pathable"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pathlib-abc/default.nix b/python/pkgs/pathlib-abc/default.nix index 6afdd1d31..b8db5398f 100644 --- a/python/pkgs/pathlib-abc/default.nix +++ b/python/pkgs/pathlib-abc/default.nix @@ -5,14 +5,14 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pathlib-abc"; version = "0.5.2"; pyproject = true; src = fetchPypi { pname = "pathlib_abc"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-/NVvFHI0ZF4sWceuIoCLNMNkuyMfaF3dn5aIWu14qUw="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/barneygale/pathlib-abc"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/pathlib2/default.nix b/python/pkgs/pathlib2/default.nix index 886646f7f..62b5e39a7 100644 --- a/python/pkgs/pathlib2/default.nix +++ b/python/pkgs/pathlib2/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pathlib2"; version = "2.3.7.post1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-n+DtrYmLg8DD4ZnIQrJ+0hZkXS4Xd1ey3Wc4TUETxkE="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/pathlib2/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pathos/default.nix b/python/pkgs/pathos/default.nix index 3d6b3c3eb..93b6c490e 100644 --- a/python/pkgs/pathos/default.nix +++ b/python/pkgs/pathos/default.nix @@ -3,24 +3,28 @@ buildPythonPackage, dill, fetchFromGitHub, + # build-system + setuptools, multiprocess, pox, ppft, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pathos"; version = "0.3.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "uqfoundation"; repo = "pathos"; - tag = version; + tag = finalAttrs.version; hash = "sha256-9ejrHHgSbDrbuq1bktyiKPJnQ1l52ug/lnJJbac7x4s="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ dill pox ppft @@ -28,7 +32,6 @@ buildPythonPackage rec { ]; # Require network - doCheck = false; pythonImportsCheck = [ "pathos" ]; @@ -37,4 +40,4 @@ buildPythonPackage rec { homepage = "https://pathos.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pathspec/default.nix b/python/pkgs/pathspec/default.nix index 88cd41be3..135d90326 100644 --- a/python/pkgs/pathspec/default.nix +++ b/python/pkgs/pathspec/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pathspec"; version = "1.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-F9tezVJBBKEg4XOBTJA2epapjQfEWy4QwvORn/+Rv1o="; }; @@ -23,4 +23,4 @@ buildPythonPackage rec { homepage = "https://github.com/cpburnz/python-path-specification"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/pathtools/default.nix b/python/pkgs/pathtools/default.nix index 0968c39c8..59e48b22c 100644 --- a/python/pkgs/pathtools/default.nix +++ b/python/pkgs/pathtools/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pathtools"; version = "0.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fDXFQho5u4LlgBj+vZDjtuXbNMVEOqr3QrPzPUZV8cA="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { description = "Pattern matching and various utilities for file systems paths"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pathvalidate/default.nix b/python/pkgs/pathvalidate/default.nix index 07c5a909f..4b2fd143c 100644 --- a/python/pkgs/pathvalidate/default.nix +++ b/python/pkgs/pathvalidate/default.nix @@ -5,13 +5,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pathvalidate"; version = "3.3.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-sYwHISv+rWJDRbuOHWFBzc8Vo5c2mU6guUA1rSsboXc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/thombashi/pathvalidate"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/patiencediff/default.nix b/python/pkgs/patiencediff/default.nix index a6e6945f3..f4bb6831a 100644 --- a/python/pkgs/patiencediff/default.nix +++ b/python/pkgs/patiencediff/default.nix @@ -9,7 +9,7 @@ setuptools-rust, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "patiencediff"; version = "0.2.19"; pyproject = true; @@ -17,12 +17,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "breezy-team"; repo = "patiencediff"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xynrYf5oCIPk22jqjvXNYTyaXzVaUjRpn35vbx+t8vU="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-JW2Oj1oxAVf9K3lyJQpbHqw9eeNYDg3Agb189bduqlI="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/breezy-team/patiencediff"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/patsy/default.nix b/python/pkgs/patsy/default.nix index 7ab03ecec..e6da2c28f 100644 --- a/python/pkgs/patsy/default.nix +++ b/python/pkgs/patsy/default.nix @@ -7,7 +7,7 @@ scipy, # optional, allows spline-related features (see patsy's docs) }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "patsy"; version = "1.0.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pydata"; repo = "patsy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tR+mNSLAOmumJNmVwnHvKefAOeYWMhhBjRh40bAQWkw="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydata/patsy"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/paver/default.nix b/python/pkgs/paver/default.nix index c46eb49db..db28ca6d3 100644 --- a/python/pkgs/paver/default.nix +++ b/python/pkgs/paver/default.nix @@ -10,14 +10,14 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "paver"; version = "1.3.4"; pyproject = true; src = fetchPypi { pname = "Paver"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-0+ZJiIFIWrdQ7+QMUniYKpNDvGJ+E3sRrc7WJ3GTCMc="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/paver/paver"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pbkdf2/default.nix b/python/pkgs/pbkdf2/default.nix index f0bc3cfc5..2ce8bd75d 100644 --- a/python/pkgs/pbkdf2/default.nix +++ b/python/pkgs/pbkdf2/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pbkdf2"; version = "1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rGOXNp8SghLEMGSitIeAONq3jatBh1NkVUqvKmhOaXk="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "pbkdf2" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { description = "PBKDF2 password hashing"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pbr/default.nix b/python/pkgs/pbr/default.nix index 55cc2fd73..52c9b4b3b 100644 --- a/python/pkgs/pbr/default.nix +++ b/python/pkgs/pbr/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pbr"; version = "7.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tGAE7DClMkZyaD7ISK7Z6PxQCw0mHUCjIpwtK7/O3Ck="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/pbr"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pbs-installer/default.nix b/python/pkgs/pbs-installer/default.nix index e4f16dc8a..681ec396c 100644 --- a/python/pkgs/pbs-installer/default.nix +++ b/python/pkgs/pbs-installer/default.nix @@ -7,7 +7,7 @@ zstandard, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pbs-installer"; version = "2026.09.01"; pyproject = true; @@ -15,14 +15,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frostming"; repo = "pbs-installer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-DmS0RThERXTCufIX4oAG3qfxzs324Ol2oeqN+iKiNfs="; }; build-system = [ pdm-backend ]; optional-dependencies = { - all = optional-dependencies.install ++ optional-dependencies.download; + all = finalAttrs.optional-dependencies.install ++ finalAttrs.optional-dependencies.download; download = [ httpx ]; install = [ zstandard ]; }; @@ -30,11 +30,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "pbs_installer" ]; # upstream has no test - doCheck = false; meta = { description = "Installer for Python Build Standalone"; homepage = "https://github.com/frostming/pbs-installer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pcodec/default.nix b/python/pkgs/pcodec/default.nix index 44a88d665..d1d3e148a 100644 --- a/python/pkgs/pcodec/default.nix +++ b/python/pkgs/pcodec/default.nix @@ -7,7 +7,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pcodec"; version = "1.0.2"; pyproject = true; @@ -15,12 +15,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pcodec"; repo = "pcodec"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fL+UCaQ8GdIe7e4Y7VeaWkjoNwuXXqaW2fHkaWs+1Lw="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-4RRN4gyEQdnpiljxa1kPM2/naarpFrKMoTVLpXD3f4A="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/pcodec/pcodec"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pcodedmp/default.nix b/python/pkgs/pcodedmp/default.nix index af5caa86f..a53f75c21 100644 --- a/python/pkgs/pcodedmp/default.nix +++ b/python/pkgs/pcodedmp/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pcodedmp"; version = "1.2.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "bontchev"; repo = "pcodedmp"; - rev = version; + tag = finalAttrs.version; hash = "sha256-SYOFGMvrzxDPMACaCvqwU28Mh9LEuvFBGvAph4X+geo="; }; + build-system = [ setuptools ]; + postPatch = '' # Circular dependency substituteInPlace setup.py \ @@ -23,7 +27,6 @@ buildPythonPackage rec { ''; # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "pcodedmp" ]; @@ -33,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/bontchev/pcodedmp"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/pcpp/default.nix b/python/pkgs/pcpp/default.nix index d82089f20..711820ced 100644 --- a/python/pkgs/pcpp/default.nix +++ b/python/pkgs/pcpp/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pcpp"; version = "1.30"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ned14"; repo = "pcpp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Fs+CMV4eRKcB+KdV93ncgcqaMnO5etnMY/ivmSJh3Wc="; fetchSubmodules = true; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { mainProgram = "pcpp"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/pdf2image/default.nix b/python/pkgs/pdf2image/default.nix index fb840cc97..9b551a5ff 100644 --- a/python/pkgs/pdf2image/default.nix +++ b/python/pkgs/pdf2image/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pillow, poppler-utils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdf2image"; version = "1.17.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6qlZvBFrQg3X7EFfyuSbmBAN2j3RjNL9+obQnxEvbVc="; }; + build-system = [ setuptools ]; + postPatch = '' # replace all default values of paths to poppler-utils substituteInPlace pdf2image/pdf2image.py \ @@ -23,7 +27,7 @@ buildPythonPackage rec { 'poppler_path: Union[str, PurePath] = "${poppler-utils}/bin"' ''; - propagatedBuildInputs = [ pillow ]; + dependencies = [ pillow ]; pythonImportsCheck = [ "pdf2image" ]; @@ -33,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/pdfkit/default.nix b/python/pkgs/pdfkit/default.nix index 79e383e2c..16ac4b41f 100644 --- a/python/pkgs/pdfkit/default.nix +++ b/python/pkgs/pdfkit/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdfkit"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-mS+CHh4Y/IoOcB7K4ktRotWYKWoYDK7gokwK8YHaAqk="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/pdfkit/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pdfminer-six/default.nix b/python/pkgs/pdfminer-six/default.nix index 89fcf56a0..9b57bb5c8 100644 --- a/python/pkgs/pdfminer-six/default.nix +++ b/python/pkgs/pdfminer-six/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdfminer-six"; version = "20260107"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pdfminer"; repo = "pdfminer.six"; - tag = version; + tag = finalAttrs.version; hash = "sha256-spWDwPoBLdySysYblCWABIWtokOMoJdpYQ6qxX94wIE="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/pdfminer/pdfminer.six"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pdfplumber/default.nix b/python/pkgs/pdfplumber/default.nix index 2090aaab8..fa78d520b 100644 --- a/python/pkgs/pdfplumber/default.nix +++ b/python/pkgs/pdfplumber/default.nix @@ -9,7 +9,7 @@ pypdfium2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdfplumber"; version = "0.11.10"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jsvine"; repo = "pdfplumber"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0fdH8SKU8ude43x7tsWxeGFQeSCYrTGTELG6SimloLQ="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/jsvine/pdfplumber"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pdfrw/default.nix b/python/pkgs/pdfrw/default.nix index 923e25cc7..8e16411ee 100644 --- a/python/pkgs/pdfrw/default.nix +++ b/python/pkgs/pdfrw/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdfrw"; version = "0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-DcBJSg5lYbJoVCso7eIoA4fCcoEU8RfTu12OR4e5PvQ="; }; @@ -19,11 +19,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pdfrw" ]; - doCheck = false; - meta = { homepage = "https://github.com/pmaupin/pdfrw"; description = "Pure Python library that reads and writes PDFs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pdftotext/default.nix b/python/pkgs/pdftotext/default.nix index 0d6d0a167..6ca718735 100644 --- a/python/pkgs/pdftotext/default.nix +++ b/python/pkgs/pdftotext/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, poppler, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdftotext"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-w2UrGRVOFFUVqL+pU/xhNjOO2SM3vcy7U/4NiAE7Gqo="; }; + build-system = [ setuptools ]; + buildInputs = [ poppler ]; meta = { @@ -22,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/jalan/pdftotext"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pdm-backend/default.nix b/python/pkgs/pdm-backend/default.nix index d3573765d..dcccf725c 100644 --- a/python/pkgs/pdm-backend/default.nix +++ b/python/pkgs/pdm-backend/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdm-backend"; version = "2.4.9"; pyproject = true; @@ -12,11 +12,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; - tag = version; + tag = finalAttrs.version; hash = "sha256-082ZSfRUGUV8DX+vuJeOd+HOuAfnKfZPZ3Lyhx6TRlE="; }; - env.PDM_BUILD_SCM_VERSION = version; + env.PDM_BUILD_SCM_VERSION = finalAttrs.version; pythonImportsCheck = [ "pdm.backend" ]; setupHook = ./setup-hook.sh; @@ -26,4 +26,4 @@ buildPythonPackage rec { description = "Yet another PEP 517 backend"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pdm-build-locked/default.nix b/python/pkgs/pdm-build-locked/default.nix index 0447d51f9..6e10ce82a 100644 --- a/python/pkgs/pdm-build-locked/default.nix +++ b/python/pkgs/pdm-build-locked/default.nix @@ -6,7 +6,7 @@ build, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdm-build-locked"; version = "0.3.7"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-build-locked"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ONDKW3KIOKnrOWD/T/W7Do/4/CfgET4TpfYcLha5mVg="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/pdm-project/pdm-build-locked"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pdm-pep517/default.nix b/python/pkgs/pdm-pep517/default.nix index 5a51e152d..93c7a5f45 100644 --- a/python/pkgs/pdm-pep517/default.nix +++ b/python/pkgs/pdm-pep517/default.nix @@ -4,13 +4,13 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdm-pep517"; version = "1.1.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-f0kSHnC0Lcopb6yWIhDdLaB6OVdfxWcxN61mFjOyzz8="; }; @@ -23,4 +23,4 @@ buildPythonPackage rec { homepage = "https://github.com/pdm-project/pdm-pep517"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pdoc/default.nix b/python/pkgs/pdoc/default.nix index 75e586b6d..fad12cc88 100644 --- a/python/pkgs/pdoc/default.nix +++ b/python/pkgs/pdoc/default.nix @@ -11,7 +11,7 @@ pydantic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdoc"; version = "16.0.0"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mitmproxy"; repo = "pdoc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9amp6CWYIcniVfdlmPKYuRFR7B5JJtuMlOoDxpfvvJA="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { mainProgram = "pdoc"; license = lib.licenses.unlicense; }; -} +}) diff --git a/python/pkgs/pdoc3/default.nix b/python/pkgs/pdoc3/default.nix index f65a66e97..98e51074b 100644 --- a/python/pkgs/pdoc3/default.nix +++ b/python/pkgs/pdoc3/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pdoc3"; version = "0.11.6"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pdoc3"; repo = "pdoc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-I8EPsjwA9dHOLvM2Oa4dbtB0N4dVczeGfzk+BVyfBcQ="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.agpl3Plus; mainProgram = "pdoc"; }; -} +}) diff --git a/python/pkgs/peakutils/default.nix b/python/pkgs/peakutils/default.nix index 2f2596539..3449cd92b 100644 --- a/python/pkgs/peakutils/default.nix +++ b/python/pkgs/peakutils/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "peakutils"; version = "1.3.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-T/Ln8zMLkwJP6Noe4E4AOJ4mvLLveb0vnPhszUli4RQ="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/PeakUtils/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pebble/default.nix b/python/pkgs/pebble/default.nix index 407f4738b..01aa52697 100644 --- a/python/pkgs/pebble/default.nix +++ b/python/pkgs/pebble/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pebble"; version = "5.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-60mg9oYvfnXfSkAQfxyMJnz4rfvW0poNrCnResGIyHg="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/noxdafox/pebble"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/pecan/default.nix b/python/pkgs/pecan/default.nix index 1233e335e..781ad6097 100644 --- a/python/pkgs/pecan/default.nix +++ b/python/pkgs/pecan/default.nix @@ -7,13 +7,13 @@ webob, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pecan"; version = "1.8.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-L5+86obo2/Gi0olUIlVHY0oonbcgHndkUWpdzobBFt4="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://www.pecanpy.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/peewee/default.nix b/python/pkgs/peewee/default.nix index 1e13ea273..ff7f23109 100644 --- a/python/pkgs/peewee/default.nix +++ b/python/pkgs/peewee/default.nix @@ -14,7 +14,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "peewee"; version = "4.5.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "coleifer"; repo = "peewee"; - tag = version; + tag = finalAttrs.version; hash = "sha256-VT0WBsTs+mSMeJGwDEFQQrtYLsU3q9UlqxOoZiNYSr0="; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { cython ]; - propagatedBuildInputs = [ + dependencies = [ apsw ] ++ lib.optionals withPostgres [ psycopg2 ] @@ -53,4 +53,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "pwiz.py"; }; -} +}) diff --git a/python/pkgs/pefile/default.nix b/python/pkgs/pefile/default.nix index adb097130..5e4682577 100644 --- a/python/pkgs/pefile/default.nix +++ b/python/pkgs/pefile/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pefile"; version = "2024.8.26"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-P/bF2LQ+jDe7bm3VCFZY1linoL3NILagex/PwcTp1jI="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "pefile" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/erocarrera/pefile"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pegen/default.nix b/python/pkgs/pegen/default.nix index e0f1a1cc0..140d0e8c1 100644 --- a/python/pkgs/pegen/default.nix +++ b/python/pkgs/pegen/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pegen"; version = "0.3.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "we-like-parsers"; repo = "pegen"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-P4zX8za9lBlXhNPkQe9p136ggZEJh6fHfBr+DQKvtTg="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/we-like-parsers/pegen"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pem/default.nix b/python/pkgs/pem/default.nix index 48d5add7d..ceea21bc7 100644 --- a/python/pkgs/pem/default.nix +++ b/python/pkgs/pem/default.nix @@ -7,7 +7,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pem"; version = "23.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hynek"; repo = "pem"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rVYlnvISGugh9qvf3mdrIyELmeOUU4g6291HeoMkoQc="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://pem.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pendulum/default.nix b/python/pkgs/pendulum/default.nix index 70bbcc22a..c3a8cc797 100644 --- a/python/pkgs/pendulum/default.nix +++ b/python/pkgs/pendulum/default.nix @@ -16,7 +16,7 @@ tzdata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pendulum"; version = "3.1.0-unstable-2025-10-28"; pyproject = true; @@ -30,8 +30,8 @@ buildPythonPackage rec { cargoRoot = "rust"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - sourceRoot = "${src.name}/rust"; + inherit (finalAttrs) pname version src; + sourceRoot = "${finalAttrs.src.name}/rust"; hash = "sha256-Ozg+TW/woJsqmbmyDsgdMua3Lmnn+KBvBhd9kVik3XY="; }; @@ -43,7 +43,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ iconv ]; - propagatedBuildInputs = [ + dependencies = [ python-dateutil tzdata ]; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/sdispater/pendulum"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pep440/default.nix b/python/pkgs/pep440/default.nix index a5e40bac1..41ba8e5c5 100644 --- a/python/pkgs/pep440/default.nix +++ b/python/pkgs/pep440/default.nix @@ -7,13 +7,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pep440"; version = "0.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-WLNyRswrE/7hyio8CSyzcE0h7PYhpb27Fo5E5pf20E0="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/Carreau/pep440"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pep517/default.nix b/python/pkgs/pep517/default.nix index ea787bab7..07a4b99c5 100644 --- a/python/pkgs/pep517/default.nix +++ b/python/pkgs/pep517/default.nix @@ -6,19 +6,19 @@ tomli, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pep517"; version = "0.13.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Gy+i/9OTi7S+/+XWFGy8sr2plqWk2p8xq//Ysk4Hsxc="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ tomli ]; meta = { @@ -26,4 +26,4 @@ buildPythonPackage rec { license = lib.licenses.mit; homepage = "https://github.com/pypa/pep517"; }; -} +}) diff --git a/python/pkgs/pep8-naming/default.nix b/python/pkgs/pep8-naming/default.nix index 1eb4673d7..502dc9eba 100644 --- a/python/pkgs/pep8-naming/default.nix +++ b/python/pkgs/pep8-naming/default.nix @@ -6,14 +6,14 @@ flake8, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pep8-naming"; version = "0.15.1"; pyproject = true; src = fetchPypi { pname = "pep8_naming"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-9vSkmaui3u2pPB8mzMAvPaMrA1yLLblpa3MO8sljnSk="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/PyCQA/pep8-naming"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pep8/default.nix b/python/pkgs/pep8/default.nix index 59c66e2c6..ff8f2a8ed 100644 --- a/python/pkgs/pep8/default.nix +++ b/python/pkgs/pep8/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pep8"; version = "1.7.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/iSbUuIEmOWeC1xSVqpS7pn8KVsm7J6qhXdv/bn+Y3Q="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "pep8" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { description = "Python style guide checker"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/peppercorn/default.nix b/python/pkgs/peppercorn/default.nix index d4b0d92dd..f2a1ca77a 100644 --- a/python/pkgs/peppercorn/default.nix +++ b/python/pkgs/peppercorn/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "peppercorn"; version = "0.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ltdoHXoEVFz7ryxvtm3meynPxCQhqiY+THjyy7hb5MY="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://docs.pylonsproject.org/projects/peppercorn/en/latest/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/periodictable/default.nix b/python/pkgs/periodictable/default.nix index 3195b46a1..3a0a8fb3c 100644 --- a/python/pkgs/periodictable/default.nix +++ b/python/pkgs/periodictable/default.nix @@ -7,7 +7,7 @@ pyparsing, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "periodictable"; version = "2.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-periodictable"; repo = "periodictable"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5Ydsntz/VnRwktnBEMfO23Malpv5u1ycBiATsxBODdc="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/pkienzle/periodictable"; license = lib.licenses.publicDomain; }; -} +}) diff --git a/python/pkgs/persist-queue/default.nix b/python/pkgs/persist-queue/default.nix index 4b18c5f7f..19c2fcb35 100644 --- a/python/pkgs/persist-queue/default.nix +++ b/python/pkgs/persist-queue/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "persist-queue"; version = "1.1.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "peter-wangxu"; repo = "persist-queue"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8LtXTpwAk71sjxvZudwk+4P4ohlWC0zagr5F8PTkTwk="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/peter-wangxu/persist-queue"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/persistent/default.nix b/python/pkgs/persistent/default.nix index fb297da36..ffba45dac 100644 --- a/python/pkgs/persistent/default.nix +++ b/python/pkgs/persistent/default.nix @@ -11,13 +11,13 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "persistent"; version = "6.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LnzKobGrU0a+kDmAv3SsMB5ae+TmlJyTz58qcWrdixg="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/persistent/"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/petl/default.nix b/python/pkgs/petl/default.nix index 771021395..6e5396205 100644 --- a/python/pkgs/petl/default.nix +++ b/python/pkgs/petl/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "petl"; version = "1.7.24"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "petl-developers"; repo = "petl"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0YIaA/0VaQ1dgKC0NrLTkAsn8kkEHIJ4W9sdZHYQeMM="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "petl"; }; -} +}) diff --git a/python/pkgs/pex/default.nix b/python/pkgs/pex/default.nix index e7f3d4fbc..02acb9897 100644 --- a/python/pkgs/pex/default.nix +++ b/python/pkgs/pex/default.nix @@ -34,13 +34,13 @@ let }; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pex"; version = "2.38.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ejd9JWmDutYpwR+KPiS90Y3XKyyOwRAMpCEN013VMdI="; }; @@ -55,7 +55,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; # A few more dependencies I don't want to handle right now... - doCheck = false; pythonImportsCheck = [ "pex" ]; @@ -64,4 +63,4 @@ buildPythonPackage rec { homepage = "https://github.com/pantsbuild/pex"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pexpect/default.nix b/python/pkgs/pexpect/default.nix index c215d78d8..eb852e576 100644 --- a/python/pkgs/pexpect/default.nix +++ b/python/pkgs/pexpect/default.nix @@ -6,22 +6,21 @@ ptyprocess, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pexpect"; version = "4.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7n1BEj88mREFDqLC2sEHVo3EOy07DHVXozISw5jq0w8="; }; nativeBuildInputs = [ setuptools ]; # Wants to run pythonin a subprocess - doCheck = false; - propagatedBuildInputs = [ ptyprocess ]; + dependencies = [ ptyprocess ]; meta = { homepage = "http://www.noah.org/wiki/Pexpect"; description = "Automate interactive console applications such as ssh, ftp, etc"; @@ -44,4 +43,4 @@ buildPythonPackage rec { any platform that supports the standard Python pty module. ''; }; -} +}) diff --git a/python/pkgs/pfzy/default.nix b/python/pkgs/pfzy/default.nix index b56b788a9..ea0302030 100644 --- a/python/pkgs/pfzy/default.nix +++ b/python/pkgs/pfzy/default.nix @@ -5,13 +5,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pfzy"; version = "0.3.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cX6nZd0QtjYY5ymLLZjv2BngswzVkFyXByI9zuuUs/E="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/kazhala/pfzy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pg8000/default.nix b/python/pkgs/pg8000/default.nix index 191fdaeab..c756af4a4 100644 --- a/python/pkgs/pg8000/default.nix +++ b/python/pkgs/pg8000/default.nix @@ -8,20 +8,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pg8000"; version = "1.31.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RuuwO+UrenfAPHJcedosooHW6PWVd8pmsXyQCWGMrng="; }; postPatch = '' # Upstream uses versioningit to set the version sed -i "/versioningit >=/d" pyproject.toml - sed -i '/^name =.*/a version = "${version}"' pyproject.toml + sed -i '/^name =.*/a version = "${finalAttrs.version}"' pyproject.toml sed -i "/dynamic =/d" pyproject.toml ''; @@ -36,7 +36,6 @@ buildPythonPackage rec { ]; # Tests require a running PostgreSQL instance - doCheck = false; pythonImportsCheck = [ "pg8000" ]; @@ -46,4 +45,4 @@ buildPythonPackage rec { license = with lib.licenses; [ bsd3 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/pglast/default.nix b/python/pkgs/pglast/default.nix index 296c3098f..7e2141d5f 100644 --- a/python/pkgs/pglast/default.nix +++ b/python/pkgs/pglast/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pglast"; version = "7.13"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lelit"; repo = "pglast"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-q5QiP8UPQQnG2Ehgj9hngXnhCKvZyCy8mKA0rzWM7EY="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; mainProgram = "pgpp"; }; -} +}) diff --git a/python/pkgs/pgpdump/default.nix b/python/pkgs/pgpdump/default.nix index 002bb3e63..31832ea88 100644 --- a/python/pkgs/pgpdump/default.nix +++ b/python/pkgs/pgpdump/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pgpdump"; version = "1.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-HEcAhXv3unNbCM/kEBqjpPX9g5ZXryScF7JpfCCClmg="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/toofishes/python-pgpdump"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pgpy/default.nix b/python/pkgs/pgpy/default.nix index 629fee59b..96fcfa6cd 100644 --- a/python/pkgs/pgpy/default.nix +++ b/python/pkgs/pgpy/default.nix @@ -7,7 +7,7 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pgpy"; version = "0.6.0"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SecurityInnovation"; repo = "PGPy"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-47YiHNxmjyCOYHHUV3Zyhs3Att9HZtCXYfbN34ooTxU="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { ''; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pgsanity/default.nix b/python/pkgs/pgsanity/default.nix index 84f4032a3..0e3e4c17d 100644 --- a/python/pkgs/pgsanity/default.nix +++ b/python/pkgs/pgsanity/default.nix @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { unittestFlagsArray = [ "test" ]; - propagatedBuildInputs = [ postgresql ]; + dependencies = [ postgresql ]; # To find "ecpg" nativeBuildInputs = [ (lib.getDev postgresql) ]; diff --git a/python/pkgs/pgvector/default.nix b/python/pkgs/pgvector/default.nix index 0578a95eb..c2828878e 100644 --- a/python/pkgs/pgvector/default.nix +++ b/python/pkgs/pgvector/default.nix @@ -10,7 +10,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pgvector"; version = "0.4.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jzUZK3zQxqajVqGbaQzLPzvK/k3Wck9jX95kkBH2IlY="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/pgvector/pgvector-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/phonenumbers/default.nix b/python/pkgs/phonenumbers/default.nix index 274815ab6..83ce553c6 100644 --- a/python/pkgs/phonenumbers/default.nix +++ b/python/pkgs/phonenumbers/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "phonenumbers"; version = "9.0.38"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aAa+vUZjivL8JglnXqBGBnpAUS7Kgb8URhMuL9op0RM="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/daviddrysdale/python-phonenumbers"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/phonors/default.nix b/python/pkgs/phonors/default.nix index 2be0a95c5..058cbe8c0 100644 --- a/python/pkgs/phonors/default.nix +++ b/python/pkgs/phonors/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "0.3.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "phonopy"; repo = "phonors"; diff --git a/python/pkgs/phply/default.nix b/python/pkgs/phply/default.nix index d29f4e038..3c8463ef6 100644 --- a/python/pkgs/phply/default.nix +++ b/python/pkgs/phply/default.nix @@ -2,21 +2,21 @@ lib, buildPythonPackage, fetchPypi, - setuptools, + setuptools_80, ply, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "phply"; version = "1.2.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Cyd3TShfUHo0RYBaBfj7KZj1bXCScPeLiSCLZbDYSRc="; }; - build-system = [ setuptools ]; + build-system = [ setuptools_80 ]; dependencies = [ ply ]; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/viraptor/phply"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/phpserialize/default.nix b/python/pkgs/phpserialize/default.nix index 9859cd15c..e50a409a7 100644 --- a/python/pkgs/phpserialize/default.nix +++ b/python/pkgs/phpserialize/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "phpserialize"; version = "1.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-v2ctMS0gPQmoTCY2b6uPQ4o/+zVcQH5pl0t+8tOaD6c="; }; + build-system = [ setuptools ]; + # project does not have tests - doCheck = false; pythonImportsCheck = [ "phpserialize" ]; @@ -24,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/mitsuhiko/phpserialize"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pickleshare/default.nix b/python/pkgs/pickleshare/default.nix index d068e0f2e..65f6f2b7a 100644 --- a/python/pkgs/pickleshare/default.nix +++ b/python/pkgs/pickleshare/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pickleshare"; version = "0.7.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-h2g9R5ZcHaZc2srzHIRB0SuARM3smspQDNePwsaDr8o="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "pickleshare" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { description = "Tiny 'shelve'-like database with concurrency support"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/picobox/default.nix b/python/pkgs/picobox/default.nix index c1af2c3b9..3ccacbc76 100644 --- a/python/pkgs/picobox/default.nix +++ b/python/pkgs/picobox/default.nix @@ -6,7 +6,7 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "picobox"; version = "4.0.0"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ikalnytskyi"; repo = "picobox"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JtrwUVo3b4G34OUShX4eJS2IVubl4vBmEtB/Jhk4eJI="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/ikalnytskyi/picobox"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pid/default.nix b/python/pkgs/pid/default.nix index b204df238..0e202d827 100644 --- a/python/pkgs/pid/default.nix +++ b/python/pkgs/pid/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pid"; version = "3.0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-DjNnDoP2oz67CCLkOmCcMkcXjUo3X/UKRoniZthT62Y="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/trbs/pid/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/piexif/default.nix b/python/pkgs/piexif/default.nix index 193b5fb69..18ab5e827 100644 --- a/python/pkgs/piexif/default.nix +++ b/python/pkgs/piexif/default.nix @@ -3,22 +3,26 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + # build-system + setuptools, pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "piexif"; version = "1.1.3"; - format = "setuptools"; + pyproject = true; # patch does not apply to PyPI sdist due to different line endings src = fetchFromGitHub { owner = "hMatoba"; repo = "Piexif"; - rev = version; + tag = finalAttrs.version; sha256 = "1akmaxq1cjr8wghwaaql1bd3sajl8psshl58lprgfsigrvnklp8b"; }; + build-system = [ setuptools ]; + patches = [ # Fix tests with Pillow >= 7.2.0: https://github.com/hMatoba/Piexif/pull/109 (fetchpatch { @@ -33,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/hMatoba/Piexif"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pika-pool/default.nix b/python/pkgs/pika-pool/default.nix index 904646b7c..de7bbfcc9 100644 --- a/python/pkgs/pika-pool/default.nix +++ b/python/pkgs/pika-pool/default.nix @@ -6,13 +6,13 @@ pika, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pika-pool"; version = "0.1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-85hYiMwniM29KTpoqLVwKpyVXbb3uLVRrqyR5/Mto5c="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/bninja/pika-pool"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/pika/default.nix b/python/pkgs/pika/default.nix index 268c6f5ec..0f56e19a1 100644 --- a/python/pkgs/pika/default.nix +++ b/python/pkgs/pika/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pika"; version = "1.4.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jPyLM6XLFuczvWDP/KlzLA0ddh7NgKifNO198s041tY="; }; @@ -19,11 +19,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pika" ]; - doCheck = false; - meta = { description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; homepage = "https://pika.readthedocs.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pillow-heif/default.nix b/python/pkgs/pillow-heif/default.nix index 7a90f8174..7c67d11da 100644 --- a/python/pkgs/pillow-heif/default.nix +++ b/python/pkgs/pillow-heif/default.nix @@ -29,7 +29,7 @@ let }); in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pillow-heif"; version = "1.7.0"; pyproject = true; @@ -37,7 +37,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bigcat88"; repo = "pillow_heif"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OATq+z6lQLEYh3tFCcW5WRTdAFrjjnZ4yNig8NPiUTM="; }; @@ -80,4 +80,4 @@ buildPythonPackage rec { lgpl3 ]; }; -} +}) diff --git a/python/pkgs/pillow/default.nix b/python/pkgs/pillow/default.nix index 96c71d916..85514573e 100644 --- a/python/pkgs/pillow/default.nix +++ b/python/pkgs/pillow/default.nix @@ -24,7 +24,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pillow"; version = "12.3.0"; pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-pillow"; repo = "pillow"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kmUlgR+f75Y8DAKKPdEbchLLgg0m95oyVP53WTQni88="; }; @@ -75,4 +75,4 @@ buildPythonPackage rec { description = "Friendly PIL fork (Python Imaging Library)"; license = lib.licenses.mit-cmu; }; -} +}) diff --git a/python/pkgs/pinecone/default.nix b/python/pkgs/pinecone/default.nix index 4928157e2..922496023 100644 --- a/python/pkgs/pinecone/default.nix +++ b/python/pkgs/pinecone/default.nix @@ -9,7 +9,7 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pinecone"; version = "9.1.0"; pyproject = true; @@ -17,12 +17,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pinecone-io"; repo = "pinecone-python-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yWGW9qx4zb4FnDLXvtXREYXRO7e5Jk/KJoaQlpKMwpg="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-I3pIy9by+OHo6iU6OZp3VvJJPZOmJ/CYhkzoV8xHoMY="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://www.pinecone.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ping3/default.nix b/python/pkgs/ping3/default.nix index 3fc5b53fc..4d0b11dc2 100644 --- a/python/pkgs/ping3/default.nix +++ b/python/pkgs/ping3/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ping3"; version = "5.1.6"; pyproject = true; @@ -13,14 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kyan001"; repo = "ping3"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9HWqJK8cxVKetrhcivI0p63I99XqkBVgZa6aR4Hablc="; }; build-system = [ setuptools ]; # Tests require additional permissions - doCheck = false; pythonImportsCheck = [ "ping3" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { changelog = "https://github.com/kyan001/ping3/blob/master/CHANGELOG.md"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pins/default.nix b/python/pkgs/pins/default.nix index 06dbc75a7..968f4bc27 100644 --- a/python/pkgs/pins/default.nix +++ b/python/pkgs/pins/default.nix @@ -22,7 +22,7 @@ xxhash, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pins"; version = "0.9.1"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rstudio"; repo = "pins-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-IpM4s/cECtrmD1K+Ya2v+9KzFH/GKbMDqfte0A+2rMc="; }; @@ -69,4 +69,4 @@ buildPythonPackage rec { homepage = "https://github.com/rstudio/pins-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pint/default.nix b/python/pkgs/pint/default.nix index 2c6764a34..9748e3e67 100644 --- a/python/pkgs/pint/default.nix +++ b/python/pkgs/pint/default.nix @@ -4,16 +4,19 @@ buildPythonPackage, hatchling, hatch-vcs, + flexcache, + flexparser, + platformdirs, typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pint"; version = "0.25.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+PXfbPZTFNdNoa3hv5b44+TQxBtRV3rFPEnn1EylrO4="; }; @@ -23,21 +26,17 @@ buildPythonPackage rec { ]; dependencies = [ + flexcache + flexparser + platformdirs typing-extensions ]; - pythonRemoveDeps = [ - "flexcache" - "flexparser" - "platformdirs" - ]; - - # pint requires flexcache/flexparser at import time - # pythonImportsCheck = [ "pint" ]; + pythonImportsCheck = [ "pint" ]; meta = { description = "Physical quantities module"; homepage = "https://github.com/hgrecco/pint/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pip-system-certs/default.nix b/python/pkgs/pip-system-certs/default.nix index 4d3d63bb5..bdbf1dace 100644 --- a/python/pkgs/pip-system-certs/default.nix +++ b/python/pkgs/pip-system-certs/default.nix @@ -7,13 +7,13 @@ pip, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pip-system-certs"; version = "5.3"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "pip_system_certs"; hash = "sha256-Gci/mVe8zn1pxNvC0LLvE94ZhNU/UKWQEubbutCvZ8Y="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/alelec/pip-system-certs"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/pip-tools/default.nix b/python/pkgs/pip-tools/default.nix index bc99545b4..60ca30f0b 100644 --- a/python/pkgs/pip-tools/default.nix +++ b/python/pkgs/pip-tools/default.nix @@ -13,7 +13,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pip-tools"; version = "7.6.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "pip-tools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gh1oe4Ghz492LofyT2ZLRBuQ9DKn+tYVc2EpkWJ4bfc="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/pip-tools/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pip/default.nix b/python/pkgs/pip/default.nix index fb222c50f..a2177a104 100644 --- a/python/pkgs/pip/default.nix +++ b/python/pkgs/pip/default.nix @@ -17,77 +17,76 @@ let sphinxSupported = !sphinx.disabled; - self = buildPythonPackage rec { - pname = "pip"; - version = "26.1.2"; - pyproject = true; +in +buildPythonPackage (finalAttrs: { + pname = "pip"; + version = "26.1.2"; + pyproject = true; - src = fetchFromGitHub { - owner = "pypa"; - repo = "pip"; - tag = version; - hash = "sha256-E53TU7LzGz+gpW1TCQUkSRMUif8mq702EgXdAVxtrGw="; - }; + src = fetchFromGitHub { + owner = "pypa"; + repo = "pip"; + tag = finalAttrs.version; + hash = "sha256-E53TU7LzGz+gpW1TCQUkSRMUif8mq702EgXdAVxtrGw="; + }; - postPatch = '' - # Remove vendored Windows PE binaries - # Note: These are unused but make the package unreproducible. - find -type f -name '*.exe' -delete - ''; + postPatch = '' + # Remove vendored Windows PE binaries + # Note: These are unused but make the package unreproducible. + find -type f -name '*.exe' -delete + ''; - nativeBuildInputs = [ - flit-core - installShellFiles - ] - ++ lib.optionals sphinxSupported [ - # docs - sphinx - sphinx-issues - ]; + nativeBuildInputs = [ + flit-core + installShellFiles + ] + ++ lib.optionals sphinxSupported [ + # docs + sphinx + sphinx-issues + ]; - outputs = [ - "out" - ] - ++ lib.optionals sphinxSupported [ - "man" - ]; + outputs = [ + "out" + ] + ++ lib.optionals sphinxSupported [ + "man" + ]; - # pip uses a custom sphinx extension and unusual conf.py location, mimic the internal build rather than attempting - # to fit sphinxHook see https://github.com/pypa/pip/blob/0778c1c153da7da457b56df55fb77cbba08dfb0c/noxfile.py#L129-L148 - postBuild = lib.optionalString sphinxSupported '' - cd docs + # pip uses a custom sphinx extension and unusual conf.py location, mimic the internal build rather than attempting + # to fit sphinxHook see https://github.com/pypa/pip/blob/0778c1c153da7da457b56df55fb77cbba08dfb0c/noxfile.py#L129-L148 + postBuild = lib.optionalString sphinxSupported '' + cd docs - # remove references to sphinx extentions only required for html doc generation - # sphinx.ext.intersphinx requires network connection or packaged object.inv files for python and pypug - # sphinxcontrib.towncrier is not currently packaged - for ext in sphinx.ext.intersphinx sphinx_copybutton sphinx_inline_tabs sphinxcontrib.towncrier myst_parser; do - substituteInPlace html/conf.py --replace-fail '"'$ext'",' "" - done + # remove references to sphinx extentions only required for html doc generation + # sphinx.ext.intersphinx requires network connection or packaged object.inv files for python and pypug + # sphinxcontrib.towncrier is not currently packaged + for ext in sphinx.ext.intersphinx sphinx_copybutton sphinx_inline_tabs sphinxcontrib.towncrier myst_parser; do + substituteInPlace html/conf.py --replace-fail '"'$ext'",' "" + done - PYTHONPATH=$src/src:$PYTHONPATH sphinx-build -v \ - -d build/doctrees/man \ - -c html \ - -d build/doctrees/man \ - -b man \ - man \ - build/man - cd .. - ''; - postInstall = '' - installManPage docs/build/man/* + PYTHONPATH=$src/src:$PYTHONPATH sphinx-build -v \ + -d build/doctrees/man \ + -c html \ + -d build/doctrees/man \ + -b man \ + man \ + build/man + cd .. + ''; + postInstall = '' + installManPage docs/build/man/* - installShellCompletion --cmd pip \ - --bash <($out/bin/pip completion --bash --no-cache-dir) \ - --fish <($out/bin/pip completion --fish --no-cache-dir) \ - --zsh <($out/bin/pip completion --zsh --no-cache-dir) - ''; + installShellCompletion --cmd pip \ + --bash <($out/bin/pip completion --bash --no-cache-dir) \ + --fish <($out/bin/pip completion --fish --no-cache-dir) \ + --zsh <($out/bin/pip completion --zsh --no-cache-dir) + ''; - meta = { - mainProgram = "pip"; - description = "PyPA recommended tool for installing Python packages"; - license = lib.licenses.mit; - homepage = "https://pip.pypa.io/"; - }; + meta = { + mainProgram = "pip"; + description = "PyPA recommended tool for installing Python packages"; + license = lib.licenses.mit; + homepage = "https://pip.pypa.io/"; }; -in -self +}) diff --git a/python/pkgs/pipx/default.nix b/python/pkgs/pipx/default.nix index 371ccceb1..1e52c5178 100644 --- a/python/pkgs/pipx/default.nix +++ b/python/pkgs/pipx/default.nix @@ -60,8 +60,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "pipx" ]; - __structuredAttrs = true; - meta = { description = "Install and run Python applications in isolated environments"; mainProgram = "pipx"; diff --git a/python/pkgs/pixelmatch/default.nix b/python/pkgs/pixelmatch/default.nix index bae1676d8..d840dad83 100644 --- a/python/pkgs/pixelmatch/default.nix +++ b/python/pkgs/pixelmatch/default.nix @@ -10,14 +10,14 @@ let owner = "whtsky"; repo = "pixelmatch-py"; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pixelmatch"; version = "0.4.0"; pyproject = true; src = fetchgit { url = "https://github.com/whtsky/pixelmatch-py.git"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tl1y8SASS8XR3ix4DLvwi5OoIs73oxYOF9Z90jPIU4o="; fetchLFS = true; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/whtsky/pixelmatch-py"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/pkce/default.nix b/python/pkgs/pkce/default.nix index 7495f2c06..365d75442 100644 --- a/python/pkgs/pkce/default.nix +++ b/python/pkgs/pkce/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pkce"; version = "1.0.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "RomeoDespres"; repo = "pkce"; - rev = version; + tag = finalAttrs.version; hash = "sha256-dOHCu0pDXk9LM4Yobaz8GAfVpBd8rXlty+Wfhx+WPME="; }; + + build-system = [ setuptools ]; pythonImportsCheck = [ "pkce" ]; meta = { @@ -22,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/RomeoDespres/pkce"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pkg-about/default.nix b/python/pkgs/pkg-about/default.nix index 5887c1d02..045fb2d41 100644 --- a/python/pkgs/pkg-about/default.nix +++ b/python/pkgs/pkg-about/default.nix @@ -9,14 +9,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pkg-about"; version = "2.4.4"; pyproject = true; src = fetchPypi { pname = "pkg_about"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-tURSRw79LnIOWij+JzDLLjKNPts9gcXdN4tQ9u/gbuQ="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/karpierz/pkg_about/"; license = lib.licenses.zlib; }; -} +}) diff --git a/python/pkgs/pkgconfig/default.nix b/python/pkgs/pkgconfig/default.nix index 82061fce4..43fe0ab71 100644 --- a/python/pkgs/pkgconfig/default.nix +++ b/python/pkgs/pkgconfig/default.nix @@ -6,23 +6,17 @@ pkg-config, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pkgconfig"; version = "1.6.0"; pyproject = true; - inherit (pkg-config) - setupHooks - wrapperName - suffixSalt - targetPrefix - baseBinName - ; + propagatedBuildInputs = [ pkg-config ]; src = fetchFromGitHub { owner = "matze"; repo = "pkgconfig"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Glla/tg83Vd2VWvUnCPrcncS73vMhqaGpo+AviR8jnY="; }; @@ -43,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/matze/pkgconfig"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pkginfo/default.nix b/python/pkgs/pkginfo/default.nix index aec931922..0e7890a92 100644 --- a/python/pkgs/pkginfo/default.nix +++ b/python/pkgs/pkginfo/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pkginfo"; version = "1.13"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-T3BHHGQ/cf6EoGIwwOM8XFsSozsv0hv/FN2u9al0rbE="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { ''; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pkgutil-resolve-name/default.nix b/python/pkgs/pkgutil-resolve-name/default.nix index cb5ad1fb3..213adb1b7 100644 --- a/python/pkgs/pkgutil-resolve-name/default.nix +++ b/python/pkgs/pkgutil-resolve-name/default.nix @@ -6,14 +6,14 @@ nix-update-script, flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pkgutil-resolve-name"; version = "1.3.10"; pyproject = true; src = fetchPypi { pname = "pkgutil_resolve_name"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; # has no tests - doCheck = false; passthru.updateScript = nix-update-script { }; @@ -38,4 +37,4 @@ buildPythonPackage rec { description = "Backport of Python 3.9’s pkgutil.resolve_name"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/plac/default.nix b/python/pkgs/plac/default.nix index c0801afab..55e88eeba 100644 --- a/python/pkgs/plac/default.nix +++ b/python/pkgs/plac/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plac"; version = "1.4.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lX/7q46oq4wLnyaU2qKpXzVgFRzRYry8kel/+U1FxPk="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ialbert/plac"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/plantuml/default.nix b/python/pkgs/plantuml/default.nix index acadb6875..cfd42b64e 100644 --- a/python/pkgs/plantuml/default.nix +++ b/python/pkgs/plantuml/default.nix @@ -1,6 +1,8 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lib, # Runtime dependencies httplib2, @@ -10,7 +12,7 @@ buildPythonPackage { pname = "plantuml"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "dougn"; @@ -19,7 +21,9 @@ buildPythonPackage { hash = "sha256-aPXPqoKlu8VLi0Jn84brG7v3qM9L18Ut4sabYYGb3qQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ httplib2 six ]; diff --git a/python/pkgs/plaster-pastedeploy/default.nix b/python/pkgs/plaster-pastedeploy/default.nix index 112c3dfab..3d41bed60 100644 --- a/python/pkgs/plaster-pastedeploy/default.nix +++ b/python/pkgs/plaster-pastedeploy/default.nix @@ -7,13 +7,13 @@ pastedeploy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plaster_pastedeploy"; version = "1.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-viYubS5BpyZIddqi/ihQy7BhVyi83JKCj9xyc244FBI="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/Pylons/plaster_pastedeploy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/plaster/default.nix b/python/pkgs/plaster/default.nix index dd9cd7e5a..7e1b76921 100644 --- a/python/pkgs/plaster/default.nix +++ b/python/pkgs/plaster/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plaster"; version = "1.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+L78VL+MEUfBCrQCl+yEwmdvotTqXW9STZQ2qAB075g="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/plaster/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/platformdirs/default.nix b/python/pkgs/platformdirs/default.nix index 4d02047b6..98a3b8d85 100644 --- a/python/pkgs/platformdirs/default.nix +++ b/python/pkgs/platformdirs/default.nix @@ -6,7 +6,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "platformdirs"; version = "4.11.7"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tox-dev"; repo = "platformdirs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-qjj3f/D3jJJXIRdtHfUXv9eTpfDZDfv9IxmTImLhFjA="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://platformdirs.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/playsound/default.nix b/python/pkgs/playsound/default.nix index 168a4dddb..ada9033f3 100644 --- a/python/pkgs/playsound/default.nix +++ b/python/pkgs/playsound/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "playsound"; version = "1.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "TaylorSMarks"; repo = "playsound"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0jbq641lmb0apq4fy6r2zyag8rdqgrz8c4wvydzrzmxrp6yx6wyd"; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "playsound" ]; meta = { @@ -24,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/plexapi/default.nix b/python/pkgs/plexapi/default.nix index d9e6a60ad..554418d30 100644 --- a/python/pkgs/plexapi/default.nix +++ b/python/pkgs/plexapi/default.nix @@ -8,7 +8,7 @@ websocket-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plexapi"; version = "4.18.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; - tag = version; + tag = finalAttrs.version; hash = "sha256-golJzx+ikMblGjat5lnraE+u0bwZeOjYK2f5ZuWGvmA="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/pkkid/python-plexapi"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/plotext/default.nix b/python/pkgs/plotext/default.nix index 89dc4e3bc..8aa286cf8 100644 --- a/python/pkgs/plotext/default.nix +++ b/python/pkgs/plotext/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plotext"; version = "6.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-a3Kc5jdsXBwhUv6F4ESdzFSHnQkjs8bI0WcBCCRcb4Q="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/piccolomo/plotext"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/plotille/default.nix b/python/pkgs/plotille/default.nix index 0becf06aa..59968c153 100644 --- a/python/pkgs/plotille/default.nix +++ b/python/pkgs/plotille/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plotille"; version = "6.0.5"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tammoippen"; repo = "plotille"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oT4zjnLT7umauXroNgffccYLtYsU5sFSG9qBtuGVsuU="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/tammoippen/plotille"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/plotnine/default.nix b/python/pkgs/plotnine/default.nix index 26e5c565a..259918a78 100644 --- a/python/pkgs/plotnine/default.nix +++ b/python/pkgs/plotnine/default.nix @@ -18,7 +18,6 @@ buildPythonPackage (finalAttrs: { pname = "plotnine"; version = "0.15.8"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "has2k1"; diff --git a/python/pkgs/plover-stroke/default.nix b/python/pkgs/plover-stroke/default.nix index 690f2a4de..0367639b4 100644 --- a/python/pkgs/plover-stroke/default.nix +++ b/python/pkgs/plover-stroke/default.nix @@ -9,7 +9,6 @@ }: buildPythonPackage (finalAttrs: { - __structuredAttrs = true; pname = "plover-stroke"; version = "1.1.0"; @@ -29,7 +28,7 @@ buildPythonPackage (finalAttrs: { which ]; - versionCheckProgramArg = "${placeholder "out"}/${python.sitePackages}"; + versionCheckProgramArg = "$(out)/${python.sitePackages}"; preInstallCheck = '' versionCheckProgram="$(which ls)" diff --git a/python/pkgs/pluggy/default.nix b/python/pkgs/pluggy/default.nix index f49f20ffb..2f72fcbba 100644 --- a/python/pkgs/pluggy/default.nix +++ b/python/pkgs/pluggy/default.nix @@ -6,7 +6,7 @@ callPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pluggy"; version = "1.6.0"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pluggy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-pkQjPJuSASWmzwzp9H/UTJBQDr2r2RiofxpF135lAgc="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pluggy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pluginbase/default.nix b/python/pkgs/pluginbase/default.nix index 95af00442..1f76e2134 100644 --- a/python/pkgs/pluginbase/default.nix +++ b/python/pkgs/pluginbase/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pluginbase"; version = "1.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/2wzqY/OIy6cc4QdeHpkPeV0k3Bp8NGBRwKNcNfe4oc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/mitsuhiko/pluginbase"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/plugnplay/default.nix b/python/pkgs/plugnplay/default.nix index 094678a7d..5111bc90c 100644 --- a/python/pkgs/plugnplay/default.nix +++ b/python/pkgs/plugnplay/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plugnplay"; version = "0.5.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-h34tJQCkWq8x5Rdfn0YYIIjT4tZMHGuf9sd4rg7llMg="; }; + build-system = [ setuptools ]; + # no tests - doCheck = false; pythonImportsCheck = [ "plugnplay" ]; @@ -24,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/daltonmatos/plugnplay"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/plum-py/default.nix b/python/pkgs/plum-py/default.nix index 2e922e97d..33b316bef 100644 --- a/python/pkgs/plum-py/default.nix +++ b/python/pkgs/plum-py/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitLab, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plum-py"; version = "0.8.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { owner = "dangass"; repo = "plum"; - tag = version; + tag = finalAttrs.version; hash = "sha256-q9UNRZYBLBm0mf/r3cktGnGG9LzmTDrSVgXDgGDBMok="; }; + build-system = [ setuptools ]; + postPatch = '' # Drop broken version specifier sed -i "/python_requires =/d" setup.cfg @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://plum-py.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/plumbum/default.nix b/python/pkgs/plumbum/default.nix index fd6068704..911c3aa04 100644 --- a/python/pkgs/plumbum/default.nix +++ b/python/pkgs/plumbum/default.nix @@ -6,13 +6,13 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plumbum"; version = "2.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IzdR14GcnmdD7BwkBZJ+tPpSooTHuJS9EOKBBqkwmpI="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/tomerfiliba/plumbum"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ply/default.nix b/python/pkgs/ply/default.nix index 75bfbc44d..cc9b44e91 100644 --- a/python/pkgs/ply/default.nix +++ b/python/pkgs/ply/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ply"; version = "3.11"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3"; }; + build-system = [ setuptools ]; + meta = { homepage = "http://www.dabeaz.com/ply/"; description = "PLY (Python Lex-Yacc), an implementation of the lex and yacc parsing tools for Python"; @@ -32,4 +36,4 @@ buildPythonPackage rec { ''; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/plyer/default.nix b/python/pkgs/plyer/default.nix index 111a25863..2c3ccac02 100644 --- a/python/pkgs/plyer/default.nix +++ b/python/pkgs/plyer/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plyer"; version = "2.1.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kivy"; repo = "plyer"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-7Icb2MVj5Uit86lRHxal6b7y9gIJ3UT2HNqpA9DYWVE="; }; @@ -58,7 +58,7 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ keyring ]; + dependencies = [ keyring ]; pythonImportsCheck = [ "plyer" ]; @@ -68,4 +68,4 @@ buildPythonPackage rec { homepage = "https://github.com/kivy/plyer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/plyvel/default.nix b/python/pkgs/plyvel/default.nix index 27c2e1997..c55b44e03 100644 --- a/python/pkgs/plyvel/default.nix +++ b/python/pkgs/plyvel/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plyvel"; version = "1.5.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PK9gCeT8JPv4cS0/XvPaflZJXCakiN8hYSGPw05GAZw="; }; + build-system = [ setuptools ]; + buildInputs = [ pkgs.leveldb ]; pythonImportsCheck = [ "plyvel" ]; @@ -25,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/wbolster/plyvel"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pmdarima/default.nix b/python/pkgs/pmdarima/default.nix index 3f706dfb9..64a6f8231 100644 --- a/python/pkgs/pmdarima/default.nix +++ b/python/pkgs/pmdarima/default.nix @@ -14,7 +14,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pmdarima"; version = "2.1.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alkaline-ml"; repo = "pmdarima"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NSBmii+2AQidZo8sPARxtLELk5Ec6cHaZddswifFqwQ="; }; @@ -31,7 +31,7 @@ buildPythonPackage rec { ''; env = { - GITHUB_REF = "refs/tags/v${version}"; + GITHUB_REF = "refs/tags/v${finalAttrs.version}"; }; build-system = [ @@ -63,4 +63,4 @@ buildPythonPackage rec { homepage = "https://github.com/alkaline-ml/pmdarima"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/podcastparser/default.nix b/python/pkgs/podcastparser/default.nix index 6e8d37281..b3a83dff9 100644 --- a/python/pkgs/podcastparser/default.nix +++ b/python/pkgs/podcastparser/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "podcastparser"; version = "0.6.11"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gpodder"; repo = "podcastparser"; - tag = version; + tag = finalAttrs.version; hash = "sha256-eF/YHKSCMZnavkoX3LcAFHPSPABijn+aPVzaeRYY3WI="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "http://gpodder.org/podcastparser/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/poetry-core/default.nix b/python/pkgs/poetry-core/default.nix index 54132fb70..ce57a83f1 100644 --- a/python/pkgs/poetry-core/default.nix +++ b/python/pkgs/poetry-core/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "poetry-core"; version = "2.4.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Io2VpLxnJesO4QohsunD7ogr87NiNjGeTmEl9wFswkw="; }; pythonImportsCheck = [ "poetry.core" ]; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-poetry/poetry-core/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/poetry-dynamic-versioning/default.nix b/python/pkgs/poetry-dynamic-versioning/default.nix index 651cd6391..ff2fb3b96 100644 --- a/python/pkgs/poetry-dynamic-versioning/default.nix +++ b/python/pkgs/poetry-dynamic-versioning/default.nix @@ -9,7 +9,7 @@ tomlkit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "poetry-dynamic-versioning"; version = "1.10.0"; pyproject = true; @@ -17,19 +17,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mtkennerly"; repo = "poetry-dynamic-versioning"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sETUaOKFS0T4o++W1maKt7qsy0CdnmMQT7vegNKQCbk="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ dunamai jinja2 tomlkit ]; # virtualenv: error: argument dest: the destination . is not write-able at / - doCheck = false; pythonImportsCheck = [ "poetry_dynamic_versioning" ]; setupHook = ./setup-hook.sh; @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/mtkennerly/poetry-dynamic-versioning"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/poetry/default.nix b/python/pkgs/poetry/default.nix index 1792ac680..a9e6eb1fc 100644 --- a/python/pkgs/poetry/default.nix +++ b/python/pkgs/poetry/default.nix @@ -26,7 +26,7 @@ xattr, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "poetry"; version = "2.4.1"; pyproject = true; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Mb1etVmBm542q7FrcMU6pzXdMUDQSpI8DFg/gbOiG4U="; }; @@ -79,4 +79,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "poetry"; }; -} +}) diff --git a/python/pkgs/polars/default.nix b/python/pkgs/polars/default.nix index 2d6cc4514..76ebfc7d5 100644 --- a/python/pkgs/polars/default.nix +++ b/python/pkgs/polars/default.nix @@ -13,7 +13,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "polars"; version = "1.40.1"; pyproject = true; @@ -21,12 +21,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; - tag = "py-${version}"; + tag = "py-${finalAttrs.version}"; hash = "sha256-QlrEYwoYPALELK3UGBC/92vCBIzFrigJAwU8qxn7Pys="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-rmCJ5SY5okvkgfd63yPDO2YOksqAWgKa9nqxTqP7Grw="; }; @@ -88,4 +88,4 @@ buildPythonPackage rec { mainProgram = "polars"; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/polib/default.nix b/python/pkgs/polib/default.nix index c399ac358..0a11bd68f 100644 --- a/python/pkgs/polib/default.nix +++ b/python/pkgs/polib/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "polib"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8++Urv7W4YPjQqiiaa4fxHQroZMYatdvF1k4Yh2/wms="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://bitbucket.org/izi/polib/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/policy-sentry/default.nix b/python/pkgs/policy-sentry/default.nix index e11b89641..71cc87a7d 100644 --- a/python/pkgs/policy-sentry/default.nix +++ b/python/pkgs/policy-sentry/default.nix @@ -11,7 +11,7 @@ schema, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "policy-sentry"; version = "0.16.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; - tag = version; + tag = finalAttrs.version; hash = "sha256-oR8/hrntE4XzZHdbde+NoKWdsLs9jJ3RLIv8YsoDFt4="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "policy_sentry"; }; -} +}) diff --git a/python/pkgs/policyuniverse/default.nix b/python/pkgs/policyuniverse/default.nix index 1a21dd897..7bd4cba85 100644 --- a/python/pkgs/policyuniverse/default.nix +++ b/python/pkgs/policyuniverse/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "policyuniverse"; version = "1.5.1.20231109"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dOVtQQVgkVwsUTLjYbATDkv/4xKi9FIw6sUNfAlLxAo="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/Netflix-Skunkworks/policyuniverse"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/polygon3/default.nix b/python/pkgs/polygon3/default.nix index b68b2cd17..4d2e376a4 100644 --- a/python/pkgs/polygon3/default.nix +++ b/python/pkgs/polygon3/default.nix @@ -2,12 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: buildPythonPackage { pname = "polygon3"; version = "3.0.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jraedler"; @@ -16,11 +18,12 @@ buildPythonPackage { hash = "sha256-jXtjEzjWwMoVgrHWsK8brSN6TQRxIPRjUaRiLBXYLcI="; }; + build-system = [ setuptools ]; + # malloc error on running the tests # python3.10(30620,0x115b74600) malloc: *** error for object 0x10d6db580: pointer being freed was not allocated # > python3.10(30620,0x115b74600) malloc: *** set a breakpoint in malloc_error_break to debug # > /nix/store/vbi8rnz0k3jyh4h4g16bbkchdd8mnxw7-setuptools-check-hook/nix-support/setup-hook: line 4: 30620 Abort trap: 6 /nix/store/5cxanhipcbfxnrqgw2qsr3zqr4z711bj-python3-3.10.12/bin/python3.10 nix_run_setup test - doCheck = false; meta = { description = "Polygon is a python package that handles polygonal shapes in 2D"; diff --git a/python/pkgs/polyline/default.nix b/python/pkgs/polyline/default.nix index 013b3b58d..fd1139904 100644 --- a/python/pkgs/polyline/default.nix +++ b/python/pkgs/polyline/default.nix @@ -6,7 +6,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "polyline"; version = "2.0.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frederickjansen"; repo = "polyline"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PaQLHz256ZZ+0PdSSeGM+rjubSnT4fQfpD1Uj3JfBt8="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/frederickjansen/polyline"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pooch/default.nix b/python/pkgs/pooch/default.nix index 66fe97070..697b0008f 100644 --- a/python/pkgs/pooch/default.nix +++ b/python/pkgs/pooch/default.nix @@ -13,13 +13,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pooch"; version = "1.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3kZylXm5hX/9PnQZh6L21eDgMhmJLBZ8ZXjACR+1Ee0="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/fatiando/pooch"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pook/default.nix b/python/pkgs/pook/default.nix index 55f243b01..84af3a297 100644 --- a/python/pkgs/pook/default.nix +++ b/python/pkgs/pook/default.nix @@ -12,7 +12,7 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pook"; version = "2.1.6"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "h2non"; repo = "pook"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pStAlxhyZ1eDER17yLYc1r+kGpEZFW+mi0y3nrPA1CQ="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/h2non/pook"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/port-for/default.nix b/python/pkgs/port-for/default.nix index 0e2295c64..7e2802b60 100644 --- a/python/pkgs/port-for/default.nix +++ b/python/pkgs/port-for/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "port-for"; version = "1.0.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kmike"; repo = "port-for"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vv2xjXyUh6g7T0zGDAlOs3K+YM18wSE8rEvgSP1ZBL4="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { mainProgram = "port-for"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/portalocker/default.nix b/python/pkgs/portalocker/default.nix index 35ab8badd..7968a01a9 100644 --- a/python/pkgs/portalocker/default.nix +++ b/python/pkgs/portalocker/default.nix @@ -11,13 +11,13 @@ redis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "portalocker"; version = "3.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-HzAClWpUqMNzBYbFx3vxj65BSeB+rxwp/D+vTVo/iaw="; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ redis ]; + dependencies = [ redis ]; pythonImportsCheck = [ "portalocker" ]; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/WoLpH/portalocker"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/portend/default.nix b/python/pkgs/portend/default.nix index 1c14a370f..e7b40d889 100644 --- a/python/pkgs/portend/default.nix +++ b/python/pkgs/portend/default.nix @@ -10,13 +10,13 @@ tempora, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "portend"; version = "3.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-qp1Aqx+eFL231AH0IhDfNdAXybl5kbrrGFaM7fuMZIk="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { description = "Monitor TCP ports for bound or unbound states"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/portpicker/default.nix b/python/pkgs/portpicker/default.nix index ab5a01e20..ef1d3219d 100644 --- a/python/pkgs/portpicker/default.nix +++ b/python/pkgs/portpicker/default.nix @@ -6,19 +6,19 @@ psutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "portpicker"; version = "1.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vVB/1vlvZe4CeB8uZ06dxsmbv6bjw5mS45FiBMnUMfo="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ psutil ]; + dependencies = [ psutil ]; pythonImportsCheck = [ "portpicker" ]; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "Library to choose unique available network ports"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/power/default.nix b/python/pkgs/power/default.nix index 67b9c305a..a934efd32 100644 --- a/python/pkgs/power/default.nix +++ b/python/pkgs/power/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "power"; version = "1.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fX1g7DMqy+On0AN5tF45q/ZQv37jEdYdpauSH1LwYPA="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/Kentzo/Power"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/powerline/default.nix b/python/pkgs/powerline/default.nix index 98238555c..ad8894b55 100644 --- a/python/pkgs/powerline/default.nix +++ b/python/pkgs/powerline/default.nix @@ -1,6 +1,8 @@ { lib, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, socat, psutil, @@ -13,19 +15,21 @@ # TODO: bzr support is missing because nixpkgs switched to `breezy` -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "2.8.4"; pname = "powerline"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "powerline"; repo = "powerline"; - tag = version; + tag = finalAttrs.version; hash = "sha256-snJrfUvP11lBIy6F0WtqJt9fiYm5jxMwm9u3u5XFO84="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ socat psutil python-hglib @@ -52,4 +56,4 @@ buildPythonPackage rec { description = "Ultimate statusline/prompt utility"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pox/default.nix b/python/pkgs/pox/default.nix index ec30bba68..360d0d954 100644 --- a/python/pkgs/pox/default.nix +++ b/python/pkgs/pox/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pox"; version = "0.3.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BlL28hA/5tS6Y4vrb6jT6KaP1EvLYzFcYUEYUVvMOvs="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://pox.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/poyo/default.nix b/python/pkgs/poyo/default.nix index 0e8bc9f9e..7aa349661 100644 --- a/python/pkgs/poyo/default.nix +++ b/python/pkgs/poyo/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "poyo"; version = "0.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4mlWqngMRfARypiG8ERZDi2P2LYdt7HBz04IafSO1N0="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Lightweight YAML Parser for Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ppft/default.nix b/python/pkgs/ppft/default.nix index 98966e37d..a51885fdb 100644 --- a/python/pkgs/ppft/default.nix +++ b/python/pkgs/ppft/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ppft"; version = "1.7.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-X2ltTzl66bCvObH6/7MZV8Ud+8WjgVhWRy1PTocpN+4="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://ppft.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ppk2-api/default.nix b/python/pkgs/ppk2-api/default.nix index 9e9388f41..fd4969774 100644 --- a/python/pkgs/ppk2-api/default.nix +++ b/python/pkgs/ppk2-api/default.nix @@ -6,7 +6,7 @@ pyserial, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ppk2-api"; version = "0.9.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "IRNAS"; repo = "ppk2-api-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fubDFtOXiv2YFYUCOUbuyXs1sHgs0/6ZVK9sAwxQ+Pk="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/IRNAS/ppk2-api-python"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/pprintpp/default.nix b/python/pkgs/pprintpp/default.nix index 8e4fd1b22..4be5cfbe4 100644 --- a/python/pkgs/pprintpp/default.nix +++ b/python/pkgs/pprintpp/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pprintpp"; version = "0.4.0-unstable-2022-05-31"; pyproject = true; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; mainProgram = "pypprint"; }; -} +}) diff --git a/python/pkgs/prance/default.nix b/python/pkgs/prance/default.nix index 8148c41ed..691d46312 100644 --- a/python/pkgs/prance/default.nix +++ b/python/pkgs/prance/default.nix @@ -15,7 +15,7 @@ openapi-spec-validator, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "prance"; version = "26.07.19.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RonnyPfannschmidt"; repo = "prance"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-kUPGSG8ZLJlke0X/Vj3s6USNGIW3xtF8/N2ZUZ7KKoI="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "prance"; }; -} +}) diff --git a/python/pkgs/precis-i18n/default.nix b/python/pkgs/precis-i18n/default.nix index 1bea17eef..23c6f2584 100644 --- a/python/pkgs/precis-i18n/default.nix +++ b/python/pkgs/precis-i18n/default.nix @@ -5,21 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "precis-i18n"; version = "1.1.2"; pyproject = true; src = fetchPypi { pname = "precis_i18n"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-eO83v/eo+DdKplBAqsHO3NYL+Xv0qBE+5xPPcjAFF7k="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "precis_i18n" ]; meta = { @@ -27,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/byllyfish/precis_i18n"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/precisely/default.nix b/python/pkgs/precisely/default.nix index b7c20ff03..2b6ecc0c3 100644 --- a/python/pkgs/precisely/default.nix +++ b/python/pkgs/precisely/default.nix @@ -6,7 +6,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "precisely"; version = "0.1.9"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mwilliamson"; repo = "python-precisely"; - tag = version; + tag = finalAttrs.version; hash = "sha256-jvvRreSGpRgDk1bbqC8Z/UEfvxwKilfc/sm7nxdJU6k="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "precisely" ]; # Tests are outdated and based on Nose, which is not supported anymore. - doCheck = false; passthru.updateScript = gitUpdater { }; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/mwilliamson/python-precisely"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/prefect/default.nix b/python/pkgs/prefect/default.nix index 94f271181..b2290ed7d 100644 --- a/python/pkgs/prefect/default.nix +++ b/python/pkgs/prefect/default.nix @@ -180,7 +180,6 @@ buildPythonPackage (finalAttrs: { }; # Tests are extremely slow and require complex infrastructure - doCheck = false; pythonImportsCheck = [ "prefect" ]; diff --git a/python/pkgs/prefixed/default.nix b/python/pkgs/prefixed/default.nix index 2e1ea8d5a..bc9fbaa0f 100644 --- a/python/pkgs/prefixed/default.nix +++ b/python/pkgs/prefixed/default.nix @@ -6,13 +6,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "prefixed"; version = "0.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-FkQD+p68gygLvEcF9LJDoog34WQxC05lw4zKseuv7rM="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Prefixed alternative numeric library"; homepage = "https://github.com/Rockhopper-Technologies/prefixed"; - changelog = "https://github.com/Rockhopper-Technologies/prefixed/releases/tag/${version}"; + changelog = "https://github.com/Rockhopper-Technologies/prefixed/releases/tag/${finalAttrs.version}"; license = with lib.licenses; [ mpl20 ]; }; -} +}) diff --git a/python/pkgs/preggy/default.nix b/python/pkgs/preggy/default.nix index 41b4ddc61..a5536bf0b 100644 --- a/python/pkgs/preggy/default.nix +++ b/python/pkgs/preggy/default.nix @@ -11,13 +11,13 @@ unidecode, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "preggy"; version = "1.4.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JbqAOv3k8171Q6YJFc7S5jSSYjUGTfcXw8s+Tj60Zww="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "http://heynemann.github.io/preggy/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/preshed/default.nix b/python/pkgs/preshed/default.nix index 1253fb091..ea3b79018 100644 --- a/python/pkgs/preshed/default.nix +++ b/python/pkgs/preshed/default.nix @@ -4,27 +4,30 @@ cymem, cython, fetchPypi, + # build-system + setuptools, murmurhash, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "preshed"; version = "3.0.13"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-119xi7/ZfpkveCfg+n+vapG92cki1bqktQ1icxOWy4k="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ + dependencies = [ cymem murmurhash ]; # Tests have import issues with 3.0.8 - doCheck = false; pythonImportsCheck = [ "preshed" ]; @@ -36,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/preshed"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/presto-python-client/default.nix b/python/pkgs/presto-python-client/default.nix index 0416f6205..fb97734d6 100644 --- a/python/pkgs/presto-python-client/default.nix +++ b/python/pkgs/presto-python-client/default.nix @@ -10,7 +10,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "presto-python-client"; version = "0.8.4"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "prestodb"; repo = "presto-python-client"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ZpVcmX6jRu4PJ1RxtIR8i0EpfhhhP8HZVVkB7CWLrsM="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/prestodb/presto-python-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pretend/default.nix b/python/pkgs/pretend/default.nix index e291473cc..9b55f8430 100644 --- a/python/pkgs/pretend/default.nix +++ b/python/pkgs/pretend/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pretend"; version = "1.0.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "alex"; repo = "pretend"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OqMfeIMFNBBLq6ejR3uOCIHZ9aA4zew7iefVlAsy1JQ="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "pretend" ]; meta = { @@ -23,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/alex/pretend"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/prettytable/default.nix b/python/pkgs/prettytable/default.nix index afa14a6e6..60193f1b7 100644 --- a/python/pkgs/prettytable/default.nix +++ b/python/pkgs/prettytable/default.nix @@ -11,7 +11,7 @@ wcwidth, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "prettytable"; version = "3.18.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; repo = "prettytable"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Wx3mt6b+tg3yz0f6r9NVFduLKWr8GBXXJI99RBc1VO4="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/prettytable"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/primp/default.nix b/python/pkgs/primp/default.nix index 6d9e6c75c..3e4af68c1 100644 --- a/python/pkgs/primp/default.nix +++ b/python/pkgs/primp/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "1.3.1"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "deedy5"; repo = "primp"; diff --git a/python/pkgs/priority/default.nix b/python/pkgs/priority/default.nix index a429707a7..71f157023 100644 --- a/python/pkgs/priority/default.nix +++ b/python/pkgs/priority/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "priority"; version = "2.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yWXVTxuNDQsZR52zkkx8Ns9nLb8q7JLUP72vRJK6GMA="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-hyper/priority/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/prison/default.nix b/python/pkgs/prison/default.nix index 13940e8d2..5af508df4 100644 --- a/python/pkgs/prison/default.nix +++ b/python/pkgs/prison/default.nix @@ -6,7 +6,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "prison"; version = "0.1.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "betodealmeida"; repo = "python-rison"; - rev = version; + tag = finalAttrs.version; hash = "sha256-qor40vUQeTdlO3vwug3GGNX5vkNaF0H7EWlRdsY4bvc="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/betodealmeida/python-rison"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/process-tests/default.nix b/python/pkgs/process-tests/default.nix index 878b0cf90..0439d5647 100644 --- a/python/pkgs/process-tests/default.nix +++ b/python/pkgs/process-tests/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "process-tests"; version = "3.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5dV96nFhJR6RytuEvz7MhSdfsSH9R45Xn4AHd7HUJL0="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; homepage = "https://github.com/ionelmc/python-process-tests"; }; -} +}) diff --git a/python/pkgs/proglog/default.nix b/python/pkgs/proglog/default.nix index a8ee27938..845587cce 100644 --- a/python/pkgs/proglog/default.nix +++ b/python/pkgs/proglog/default.nix @@ -6,13 +6,13 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "proglog"; version = "0.1.12"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Nh7gdHIcJ3uJt1wGEzbLjF8ofJKwQ++lYsz3hmzakxw="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/Edinburgh-Genome-Foundry/Proglog"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/progress/default.nix b/python/pkgs/progress/default.nix index 7af4820c0..eb4329d46 100644 --- a/python/pkgs/progress/default.nix +++ b/python/pkgs/progress/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "progress"; version = "1.6.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-wbpxn4Ys6IUjKnWeq0eXH+dN/Hu3arilHvWUC601CGw="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Easy to use progress bars"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/progressbar/default.nix b/python/pkgs/progressbar/default.nix index a8c7422f7..920f4b581 100644 --- a/python/pkgs/progressbar/default.nix +++ b/python/pkgs/progressbar/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "progressbar"; version = "2.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XYHLUp2i4iO1OWKv1sjKDwXGZw5AMJpyGerMNq+bbGM="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/progressbar/"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/progressbar2/default.nix b/python/pkgs/progressbar2/default.nix index bbf7f6e92..8a879e72f 100644 --- a/python/pkgs/progressbar2/default.nix +++ b/python/pkgs/progressbar2/default.nix @@ -9,13 +9,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "progressbar2"; version = "4.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/kjIlVqEQor3e/8mQrpHBB4bj3yGelt8yU+LwlWo8M8="; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ python-utils ]; + dependencies = [ python-utils ]; pythonImportsCheck = [ "progressbar" ]; meta = { @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://progressbar-2.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/progressbar33/default.nix b/python/pkgs/progressbar33/default.nix index 3b3012f14..10e75143b 100644 --- a/python/pkgs/progressbar33/default.nix +++ b/python/pkgs/progressbar33/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "progressbar33"; version = "2.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Uf4NmztAI9svmD7szfyMmEa4TbhEO5vuACx/WPQ3bv8="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/progressbar33/"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/prometheus-api-client/default.nix b/python/pkgs/prometheus-api-client/default.nix index d6f18e360..d5e9cc533 100644 --- a/python/pkgs/prometheus-api-client/default.nix +++ b/python/pkgs/prometheus-api-client/default.nix @@ -10,7 +10,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "prometheus-api-client"; version = "0.7.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "4n4nd"; repo = "prometheus-api-client-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aoaydE1e+Ng3XiyqRFCgnlFIsLRitss4A0pUZdYeHak="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/4n4nd/prometheus-api-client-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/prometheus-fastapi-instrumentator/default.nix b/python/pkgs/prometheus-fastapi-instrumentator/default.nix index aa3b440bb..31e976d1b 100644 --- a/python/pkgs/prometheus-fastapi-instrumentator/default.nix +++ b/python/pkgs/prometheus-fastapi-instrumentator/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { pname = "prometheus-fastapi-instrumentator"; version = "8.1.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "trallnag"; diff --git a/python/pkgs/prometheus-flask-exporter/default.nix b/python/pkgs/prometheus-flask-exporter/default.nix index 09a3470cb..b21ce3287 100644 --- a/python/pkgs/prometheus-flask-exporter/default.nix +++ b/python/pkgs/prometheus-flask-exporter/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "prometheus-flask-exporter"; version = "0.23.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rycus86"; repo = "prometheus_flask_exporter"; - tag = version; + tag = finalAttrs.version; hash = "sha256-fWCIthtBiPJwn/Mbbwdv2+1cr9nlpUsPE2mDkaSsfpM="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/rycus86/prometheus_flask_exporter"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/promise/default.nix b/python/pkgs/promise/default.nix index 37c3e48eb..3307c735d 100644 --- a/python/pkgs/promise/default.nix +++ b/python/pkgs/promise/default.nix @@ -3,23 +3,27 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + # build-system + setuptools, mock, pytest-asyncio, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "promise"; version = "2.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "syrusakbary"; repo = "promise"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5s6GMANSO4UpLOP/HAQxuNFSBSjPgvJCB9R1dOoKuJ4="; }; + build-system = [ setuptools ]; + patches = [ # Convert @asyncio.coroutine to async def, https://github.com/syrusakbary/promise/pull/99 (fetchpatch { @@ -34,7 +38,7 @@ buildPythonPackage rec { --replace "assert_exc.traceback[-1].path.strpath" "str(assert_exc.traceback[-1].path)" ''; - propagatedBuildInputs = [ six ]; + dependencies = [ six ]; pythonImportsCheck = [ "promise" ]; meta = { @@ -42,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/syrusakbary/promise"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/prompt-toolkit/default.nix b/python/pkgs/prompt-toolkit/default.nix index 30087bc87..6af562712 100644 --- a/python/pkgs/prompt-toolkit/default.nix +++ b/python/pkgs/prompt-toolkit/default.nix @@ -6,7 +6,7 @@ wcwidth, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "prompt-toolkit"; version = "3.0.53"; pyproject = true; @@ -14,14 +14,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "prompt-toolkit"; repo = "python-prompt-toolkit"; - tag = version; + tag = finalAttrs.version; hash = "sha256-MvGwFmu4kxTFsUsaFJu6FuQ+qd4VWBP6a+2N+eANbCg="; }; postPatch = '' # https://github.com/prompt-toolkit/python-prompt-toolkit/issues/1988 substituteInPlace src/prompt_toolkit/__init__.py \ - --replace-fail 'metadata.version("prompt_toolkit")' '"${version}"' + --replace-fail 'metadata.version("prompt_toolkit")' '"${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/jonathanslenders/python-prompt-toolkit"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/propcache/default.nix b/python/pkgs/propcache/default.nix index bba392688..40cc4daf7 100644 --- a/python/pkgs/propcache/default.nix +++ b/python/pkgs/propcache/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "propcache"; version = "0.5.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "propcache"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vn6FSdWEMk6c8Cu1mHyhZyH8ZlFK0kgYK8T7GKLHHwc="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/propcache"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/property-cached/default.nix b/python/pkgs/property-cached/default.nix index 8d2ea02ca..c2f20a2c3 100644 --- a/python/pkgs/property-cached/default.nix +++ b/python/pkgs/property-cached/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "property-cached"; version = "1.6.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "althonos"; repo = "property-cached"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8kityZ++1TS22Ff7a5x5bQi0QBaHsNaP4E/Man8A28A="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/althonos/property-cached"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/proto-plus/default.nix b/python/pkgs/proto-plus/default.nix index 316988b32..4350b3e14 100644 --- a/python/pkgs/proto-plus/default.nix +++ b/python/pkgs/proto-plus/default.nix @@ -6,7 +6,7 @@ protobuf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "proto-plus"; version = "1.27.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "proto-plus-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-B+CkOLzbpu3XXnH7MND5GCljG/bUyPPU57zXIIXoRiU="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/proto-plus-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/protobuf3-to-dict/default.nix b/python/pkgs/protobuf3-to-dict/default.nix index 7f65a21e3..fe33559e0 100644 --- a/python/pkgs/protobuf3-to-dict/default.nix +++ b/python/pkgs/protobuf3-to-dict/default.nix @@ -2,25 +2,27 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, protobuf, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "protobuf3-to-dict"; version = "0.1.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0nibblvj3n20zvq6d73zalbjqjby0w8ji5mim7inhn7vb9dw4hhy"; }; - doCheck = false; + build-system = [ setuptools ]; pythonImportsCheck = [ "protobuf_to_dict" ]; - propagatedBuildInputs = [ + dependencies = [ protobuf six ]; @@ -30,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/kaporzhu/protobuf-to-dict"; license = lib.licenses.publicDomain; }; -} +}) diff --git a/python/pkgs/proton-core/default.nix b/python/pkgs/proton-core/default.nix index 60fb02854..8eb7901a2 100644 --- a/python/pkgs/proton-core/default.nix +++ b/python/pkgs/proton-core/default.nix @@ -10,7 +10,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "proton-core"; version = "0.7.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-core"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZT/LkppzeEDGs9aOCx561fA1EgAShPCnMs8c05mgF0k="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/ProtonVPN/python-proton-core"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/proton-keyring-linux/default.nix b/python/pkgs/proton-keyring-linux/default.nix index 4e7ab118a..593391a31 100644 --- a/python/pkgs/proton-keyring-linux/default.nix +++ b/python/pkgs/proton-keyring-linux/default.nix @@ -7,7 +7,7 @@ proton-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "proton-keyring-linux"; version = "0.2.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-keyring-linux"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Oj0jcoJJGTh/eIE5byS4XohnvfnzlYWkozu9VJJH2vk="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/proton-vpn-local-agent/default.nix b/python/pkgs/proton-vpn-local-agent/default.nix index 5a9a483fc..0f30881a3 100644 --- a/python/pkgs/proton-vpn-local-agent/default.nix +++ b/python/pkgs/proton-vpn-local-agent/default.nix @@ -9,7 +9,7 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "proton-vpn-local-agent"; version = "1.6.3"; pyproject = false; @@ -18,12 +18,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ProtonVPN"; repo = "local-agent-rs"; - rev = version; + tag = finalAttrs.version; hash = "sha256-y2FEfICwWa/GgaKkq8CR+lVDYIsk0HsuKuGUsUQZAFo="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit + inherit (finalAttrs) pname version src @@ -32,7 +32,7 @@ buildPythonPackage rec { hash = "sha256-y8I806dbC7n3eMFyrzGJokfVDwEGFdC7NgzSA0G8hkQ="; }; - sourceRoot = "${src.name}/python-proton-vpn-local-agent"; + sourceRoot = "${finalAttrs.src.name}/python-proton-vpn-local-agent"; cargoBuildType = "release"; nativeBuildInputs = [ @@ -65,4 +65,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/prov/default.nix b/python/pkgs/prov/default.nix index d8b57fde8..36ec924fb 100644 --- a/python/pkgs/prov/default.nix +++ b/python/pkgs/prov/default.nix @@ -10,13 +10,13 @@ rdflib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "prov"; version = "3.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4+y/Y0XkaxlYsoa9GwkMW6/6lCAV7PBLRKjMY4MPipI="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/trungdong/prov"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/proxy-tools/default.nix b/python/pkgs/proxy-tools/default.nix index 3fd878f80..e8d96c257 100644 --- a/python/pkgs/proxy-tools/default.nix +++ b/python/pkgs/proxy-tools/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "proxy_tools"; version = "0.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zLN1H1KcBH4tilhEDYayBTA88P6BRveE0cvNlPCigBA="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Simple Proxy implementation for Python"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/psrpcore/default.nix b/python/pkgs/psrpcore/default.nix index c59138c92..908d09fcc 100644 --- a/python/pkgs/psrpcore/default.nix +++ b/python/pkgs/psrpcore/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "psrpcore"; version = "0.3.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jborean93"; repo = "psrpcore"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-svfqTOKKFKMphIPnvXfAbPZrp1GTV2D+33I0Rajfv1Y="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.mit; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/python/pkgs/psutil-home-assistant/default.nix b/python/pkgs/psutil-home-assistant/default.nix index 8246aca3f..297fb5487 100644 --- a/python/pkgs/psutil-home-assistant/default.nix +++ b/python/pkgs/psutil-home-assistant/default.nix @@ -2,26 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, psutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "psutil-home-assistant"; version = "0.0.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "psutil-home-assistant"; - tag = version; + tag = finalAttrs.version; hash = "sha256-6bj1aaa/JYZFVwUAJfxISRoldgTmumCG8WrlKhkb6kM="; }; - propagatedBuildInputs = [ psutil ]; + build-system = [ setuptools ]; + + dependencies = [ psutil ]; meta = { description = "Wrapper of psutil that removes reliance on globals"; homepage = "https://github.com/home-assistant-libs/psutil-home-assistant"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/psutil/default.nix b/python/pkgs/psutil/default.nix index 8624e31fd..486115674 100644 --- a/python/pkgs/psutil/default.nix +++ b/python/pkgs/psutil/default.nix @@ -7,7 +7,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "psutil"; version = "7.2.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "giampaolo"; repo = "psutil"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-plBv24QgNzmVMV2lFxCbNwHKtd620thJayWdjs4estw="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/giampaolo/psutil"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/psycopg-pool/default.nix b/python/pkgs/psycopg-pool/default.nix index 5e6247904..95fa0b22b 100644 --- a/python/pkgs/psycopg-pool/default.nix +++ b/python/pkgs/psycopg-pool/default.nix @@ -29,8 +29,6 @@ buildPythonPackage { # the psycopg-pool version isn't updated in tandem with psycopg dontCheckPythonMetadata = true; - doCheck = false; - meta = { description = "Connection Pool for Psycopg"; homepage = "https://github.com/psycopg/psycopg"; diff --git a/python/pkgs/psycopg/default.nix b/python/pkgs/psycopg/default.nix index 00a1b8049..e3031b9c4 100644 --- a/python/pkgs/psycopg/default.nix +++ b/python/pkgs/psycopg/default.nix @@ -94,7 +94,7 @@ let }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { inherit pname version @@ -111,7 +111,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ typing-extensions ]; @@ -132,4 +132,4 @@ buildPythonPackage rec { meta = baseMeta // { description = "PostgreSQL database adapter for Python"; }; -} +}) diff --git a/python/pkgs/psycopg2/default.nix b/python/pkgs/psycopg2/default.nix index d423b3c41..431b0da64 100644 --- a/python/pkgs/psycopg2/default.nix +++ b/python/pkgs/psycopg2/default.nix @@ -11,7 +11,7 @@ writeShellScript, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "psycopg2"; version = "2.9.12"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { disabled = isPyPy; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-He2xx6HYVSxKYETGscQaUuao4tFEr4PsysdYB2sbfBU="; }; @@ -69,4 +69,4 @@ buildPythonPackage rec { zpl20 ]; }; -} +}) diff --git a/python/pkgs/psygnal/default.nix b/python/pkgs/psygnal/default.nix index 61da05cfe..25f522195 100644 --- a/python/pkgs/psygnal/default.nix +++ b/python/pkgs/psygnal/default.nix @@ -14,7 +14,7 @@ attrs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "psygnal"; version = "0.15.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyapp-kit"; repo = "psygnal"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7d9ejzdafoH14fKvYJd3OwYS0RGwDmMeLlj74qvsvjE="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyapp-kit/psygnal"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ptpython/default.nix b/python/pkgs/ptpython/default.nix index f241bf15b..144edfff7 100644 --- a/python/pkgs/ptpython/default.nix +++ b/python/pkgs/ptpython/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ptpython"; version = "3.0.32"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-EWUXeCNt6VxYK0JzcpTlCma6SiH6AcAJDqcIFa9Hj+A="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/prompt-toolkit/ptpython"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ptyprocess/default.nix b/python/pkgs/ptyprocess/default.nix index 8e87b4ddf..96f50fc9d 100644 --- a/python/pkgs/ptyprocess/default.nix +++ b/python/pkgs/ptyprocess/default.nix @@ -6,13 +6,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ptyprocess"; version = "0.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XF0KO0jO7gtISF4MJgN8Cs19KXZco/u1yzgx00dCMiA="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/pexpect/ptyprocess"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/publicsuffix2/default.nix b/python/pkgs/publicsuffix2/default.nix index 5d5f00d88..d0634791a 100644 --- a/python/pkgs/publicsuffix2/default.nix +++ b/python/pkgs/publicsuffix2/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "publicsuffix2"; version = "2.20191221"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-APjMMaqNDVWSpc7RnMy6feQo68qYXbJqyFLZIN3W/ns="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/nexB/python-publicsuffix2"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/pudb/default.nix b/python/pkgs/pudb/default.nix index 79ad462f0..d6f9cd27f 100644 --- a/python/pkgs/pudb/default.nix +++ b/python/pkgs/pudb/default.nix @@ -10,13 +10,13 @@ urwid-readline, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pudb"; version = "2025.1.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5t7bgfw8jNzWbPYuhjN8uRNXDrssmUyatSAS0Fnghq0="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/inducer/pudb"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pueblo/default.nix b/python/pkgs/pueblo/default.nix index 48025535e..9e8bba588 100644 --- a/python/pkgs/pueblo/default.nix +++ b/python/pkgs/pueblo/default.nix @@ -9,7 +9,7 @@ tomli, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pueblo"; version = "0.0.19"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { # package, we can rely on upstream to run the tests before releasing, and it # should work for us as well. src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-TGPjM6lOHUTKOdp+lu67ENvkmyfUVdAUaMIHgCxto3U="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyveci/pueblo"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/pulumi-aws/default.nix b/python/pkgs/pulumi-aws/default.nix index c3650504e..0d2b10f1a 100644 --- a/python/pkgs/pulumi-aws/default.nix +++ b/python/pkgs/pulumi-aws/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pulumi-aws"; # Version is independent of pulumi's. version = "7.24.0"; @@ -16,18 +16,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pulumi"; repo = "pulumi-aws"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PADClQ8ct9w0igKxQNoW4Act0n0vx1HiD7ysH4PwgFU="; }; - sourceRoot = "${src.name}/sdk/python"; + sourceRoot = "${finalAttrs.src.name}/sdk/python"; postPatch = '' # We need the version of pulumi-aws in its package metadata to be accurate # as this seems to be used to determine which version of the # pulumi-resource-aws plugin to be dynamically downloaded by the pulumi CLI substituteInPlace pyproject.toml \ - --replace-fail "7.0.0a0+dev" "${version}" + --replace-fail "7.0.0a0+dev" "${finalAttrs.version}" ''; build-system = [ setuptools ]; @@ -38,7 +38,6 @@ buildPythonPackage rec { ]; # Checks require cloud resources - doCheck = false; pythonImportsCheck = [ "pulumi_aws" ]; @@ -47,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/pulumi/pulumi-aws"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pure-eval/default.nix b/python/pkgs/pure-eval/default.nix index 6667b883d..86400d786 100644 --- a/python/pkgs/pure-eval/default.nix +++ b/python/pkgs/pure-eval/default.nix @@ -6,15 +6,15 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pure-eval"; version = "0.2.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "alexmojaki"; repo = "pure_eval"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gdP8/MkzTyjkZaWUG5PoaOtBqzbCXYNYBX2XBLWLh18="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/alexmojaki/pure_eval"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pure-protobuf/default.nix b/python/pkgs/pure-protobuf/default.nix index 841408c98..453a49d40 100644 --- a/python/pkgs/pure-protobuf/default.nix +++ b/python/pkgs/pure-protobuf/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pure-protobuf"; version = "3.1.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "eigenein"; repo = "protobuf"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Gr5fKpagSUzH34IKHb+pBta4q71AqYa/KG9XW2AxZqk="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/eigenein/protobuf"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pure-sasl/default.nix b/python/pkgs/pure-sasl/default.nix index a16f98804..6b3e6eb8c 100644 --- a/python/pkgs/pure-sasl/default.nix +++ b/python/pkgs/pure-sasl/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pure-sasl"; version = "0.6.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thobbs"; repo = "pure-sasl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-AHoZ3QZLr0JLE8+a2zkB06v2wRknxhgm/tcEPXaJX/U="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "http://github.com/thobbs/pure-sasl"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/puremagic/default.nix b/python/pkgs/puremagic/default.nix index cc8c5073b..8190aca58 100644 --- a/python/pkgs/puremagic/default.nix +++ b/python/pkgs/puremagic/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "puremagic"; version = "2.2.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cdgriffith"; repo = "puremagic"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Mvhn/1xcgYgVkWok2qZXAe40pocfu6nJo5xuPruw2dc="; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Implementation of magic file detection"; homepage = "https://github.com/cdgriffith/puremagic"; - changelog = "https://github.com/cdgriffith/puremagic/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/cdgriffith/puremagic/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/purl/default.nix b/python/pkgs/purl/default.nix index 58b099272..10be1d178 100644 --- a/python/pkgs/purl/default.nix +++ b/python/pkgs/purl/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "purl"; version = "1.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ugurrb0MmBxJWkVxXFRK00za01EC6Z+0/NenhiVifOM="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/codeinthehole/purl"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pwdlib/default.nix b/python/pkgs/pwdlib/default.nix index f8cfd9624..6e16f64ed 100644 --- a/python/pkgs/pwdlib/default.nix +++ b/python/pkgs/pwdlib/default.nix @@ -9,7 +9,7 @@ bcrypt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pwdlib"; version = "0.3.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frankie567"; repo = "pwdlib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4fqdgeDtPZztaR2SzwpYjv3WjXcf/9qHKzNwm/muXm8="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/frankie567/pwdlib"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/py-cpuinfo/default.nix b/python/pkgs/py-cpuinfo/default.nix index 6045a57ce..16fd89d52 100644 --- a/python/pkgs/py-cpuinfo/default.nix +++ b/python/pkgs/py-cpuinfo/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-cpuinfo"; version = "9.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PNu/P6yQ3G8Ri/1kOE8wnt6t2QLXyPsX8C/6H8P0lpA="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "cpuinfo" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/workhorsy/py-cpuinfo"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/py-deviceid/default.nix b/python/pkgs/py-deviceid/default.nix index 64b281f8d..0b52ffffb 100644 --- a/python/pkgs/py-deviceid/default.nix +++ b/python/pkgs/py-deviceid/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-deviceid"; version = "0.1.1"; pyproject = true; src = fetchPypi { pname = "py_deviceid"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-w+dXetojZm5/OeaTcN/ap2/p3nnAJjU3bWqgIpv6MOM="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/py-deviceid/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/py-ecc/default.nix b/python/pkgs/py-ecc/default.nix index 063f5a605..e624ce291 100644 --- a/python/pkgs/py-ecc/default.nix +++ b/python/pkgs/py-ecc/default.nix @@ -8,7 +8,7 @@ eth-utils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-ecc"; version = "8.0.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "py_ecc"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4nmmX4TuErHxIDrBi+Ppr+4vuE7dSeqf8OqOxtqb3sY="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/py_ecc"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/py-partiql-parser/default.nix b/python/pkgs/py-partiql-parser/default.nix index ba86fc33f..9f4b57ecd 100644 --- a/python/pkgs/py-partiql-parser/default.nix +++ b/python/pkgs/py-partiql-parser/default.nix @@ -6,7 +6,7 @@ sure, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-partiql-parser"; version = "0.6.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "getmoto"; repo = "py-partiql-parser"; - tag = version; + tag = finalAttrs.version; hash = "sha256-99GkYfsscifVAws+Rgn1Tb2FZxY/4OtNvOoXGGmzbco="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/getmoto/py-partiql-parser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/py-radix/default.nix b/python/pkgs/py-radix/default.nix index ff0246a11..44982d495 100644 --- a/python/pkgs/py-radix/default.nix +++ b/python/pkgs/py-radix/default.nix @@ -2,12 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: buildPythonPackage (finalAttrs: { pname = "py-radix"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mjschultz"; @@ -16,6 +18,8 @@ buildPythonPackage (finalAttrs: { hash = "sha256-++QuZEwOHKjOsIbwLmDy30PvyG0Xe29l45PvOF+YWYw="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "radix" ]; meta = { diff --git a/python/pkgs/py-rust-stemmers/default.nix b/python/pkgs/py-rust-stemmers/default.nix index 7adbd6944..e53ec5436 100644 --- a/python/pkgs/py-rust-stemmers/default.nix +++ b/python/pkgs/py-rust-stemmers/default.nix @@ -9,7 +9,7 @@ rustc, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-rust-stemmers"; version = "0.1.5"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "qdrant"; repo = "py-rust-stemmers"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WpTbS8XoOKhyyt1/YGagulopFKiqNI0ETkhjpiX0TL8="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/qdrant/py-rust-stemmers"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/py-serializable/default.nix b/python/pkgs/py-serializable/default.nix index 1208b442c..4d7735037 100644 --- a/python/pkgs/py-serializable/default.nix +++ b/python/pkgs/py-serializable/default.nix @@ -8,7 +8,7 @@ xmldiff, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-serializable"; version = "2.1.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "madpah"; repo = "serializable"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nou1/80t9d2iKOdZZbcN4SI3dlvuC8T55KMCP/cDEEU="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/madpah/serializable"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/py-ubjson/default.nix b/python/pkgs/py-ubjson/default.nix index b49e2719d..cec25365c 100644 --- a/python/pkgs/py-ubjson/default.nix +++ b/python/pkgs/py-ubjson/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-ubjson"; version = "0.16.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Iotic-Labs"; repo = "py-ubjson"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1frn97xfa88zrfmpnvdk1pc03yihlchhph99bhjayvzlfcrhm5v3"; }; + + build-system = [ setuptools ]; pythonImportsCheck = [ "ubjson" ]; meta = { @@ -22,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/Iotic-Labs/py-ubjson"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/py-vapid/default.nix b/python/pkgs/py-vapid/default.nix index 544727caa..1bde809cd 100644 --- a/python/pkgs/py-vapid/default.nix +++ b/python/pkgs/py-vapid/default.nix @@ -11,14 +11,14 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-vapid"; version = "1.9.4"; pyproject = true; src = fetchPypi { pname = "py_vapid"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-oAQCNWDLxU40/AY4CgWA8E/8x4joT7bRnpM57rZVGig="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/mozilla-services/vapid"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/py/default.nix b/python/pkgs/py/default.nix index 3d72dce53..5190234a4 100644 --- a/python/pkgs/py/default.nix +++ b/python/pkgs/py/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py"; version = "1.11.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; pythonImportsCheck = [ "py" ]; @@ -24,4 +28,4 @@ buildPythonPackage rec { homepage = "https://py.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/py2bit/default.nix b/python/pkgs/py2bit/default.nix index 22860b855..1b28685f4 100644 --- a/python/pkgs/py2bit/default.nix +++ b/python/pkgs/py2bit/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py2bit"; version = "1.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SXL4XrOETN+6Q+tUqzyDSaBTbgPf19sHyo00Ryha0gw="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { description = "File access to 2bit files"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/py4j/default.nix b/python/pkgs/py4j/default.nix index 232921d1f..805276c27 100644 --- a/python/pkgs/py4j/default.nix +++ b/python/pkgs/py4j/default.nix @@ -1,22 +1,25 @@ { buildPythonPackage, fetchPypi, + # build-system + setuptools, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py4j"; version = "0.10.9.9"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-9pTK0Z76W9He5PPlJw60BmE8l0OUA15b/E7Bq6hwuHk="; }; + build-system = [ setuptools ]; + # No tests in archive - doCheck = false; meta = { description = "Py4J enables Python programs running in a Python interpreter to dynamically access Java objects in a Java Virtual Machine. Methods are called as if the Java objects resided in the Python interpreter and Java collections can be accessed through standard Python collection methods. Py4J also enables Java programs to call back Python objects"; @@ -27,4 +30,4 @@ buildPythonPackage rec { ]; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/py7zr/default.nix b/python/pkgs/py7zr/default.nix index e83c633da..cebfbfff4 100644 --- a/python/pkgs/py7zr/default.nix +++ b/python/pkgs/py7zr/default.nix @@ -15,7 +15,7 @@ texttable, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py7zr"; version = "1.1.3"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miurahr"; repo = "py7zr"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rD5qs0AjJXS5x4o0niyz23ROtgmJg/4uZqAbDCnFnYY="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://github.com/miurahr/py7zr"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/pyaes/default.nix b/python/pkgs/pyaes/default.nix index 988bf559f..3f9d5aa85 100644 --- a/python/pkgs/pyaes/default.nix +++ b/python/pkgs/pyaes/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyaes"; version = "1.6.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AsGxQFw408NwsIX7lS3YvqP63O5kEa2Z8xLMEpxTbY8="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ricmoo/pyaes"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyahocorasick/default.nix b/python/pkgs/pyahocorasick/default.nix index 5d6c8519e..b995a6a0f 100644 --- a/python/pkgs/pyahocorasick/default.nix +++ b/python/pkgs/pyahocorasick/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyahocorasick"; version = "2.3.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "WojciechMula"; repo = "pyahocorasick"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lExpRJlRoYS45Bw9FQwa7GKELBljKA83ZhXg7e5vPwM="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/WojciechMula/pyahocorasick"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyairtable/default.nix b/python/pkgs/pyairtable/default.nix index 81135ef1a..4fc0dc981 100644 --- a/python/pkgs/pyairtable/default.nix +++ b/python/pkgs/pyairtable/default.nix @@ -12,13 +12,13 @@ click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyairtable"; version = "3.4.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-apF01DgAlmZgVH4H0Ac2s6D973W1CHt27oug6AnAQu4="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "pyairtable"; }; -} +}) diff --git a/python/pkgs/pyalsaaudio/default.nix b/python/pkgs/pyalsaaudio/default.nix index 62b593fb1..47d243a2c 100644 --- a/python/pkgs/pyalsaaudio/default.nix +++ b/python/pkgs/pyalsaaudio/default.nix @@ -2,19 +2,23 @@ alsa-lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyalsaaudio"; version = "0.11.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-p4qdyjNSSyyQZLNOIfWrh0JyMTzzJKmndZLzlqXg/dw="; }; + build-system = [ setuptools ]; + buildInputs = [ alsa-lib ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/larsimmisch/pyalsaaudio"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/pyamg/default.nix b/python/pkgs/pyamg/default.nix index e17c4b907..0dd13d692 100644 --- a/python/pkgs/pyamg/default.nix +++ b/python/pkgs/pyamg/default.nix @@ -11,13 +11,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyamg"; version = "5.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-UyPQ8aTNmZviRqkNWAyeHptYS5iIf2KY05dhEIfvhgs="; }; @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy pytest @@ -48,4 +48,4 @@ buildPythonPackage rec { license = lib.licenses.mit; broken = stdenv.hostPlatform.isDarwin && lib.versionAtLeast python.version "3.14"; }; -} +}) diff --git a/python/pkgs/pyaml-env/default.nix b/python/pkgs/pyaml-env/default.nix index e55a86f46..eda35476a 100644 --- a/python/pkgs/pyaml-env/default.nix +++ b/python/pkgs/pyaml-env/default.nix @@ -6,7 +6,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyaml-env"; version = "1.2.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkaranasou"; repo = "pyaml_env"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Mp5Zn2JA6j/OTkPCRggNdqdWkrUYyYHMVK6hy/EI0I8="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/mkaranasou/pyaml_env"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyaml/default.nix b/python/pkgs/pyaml/default.nix index 19f36735a..886e06037 100644 --- a/python/pkgs/pyaml/default.nix +++ b/python/pkgs/pyaml/default.nix @@ -6,13 +6,13 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyaml"; version = "26.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ec2jp5bvxtvODVaDa+Vs/SYona0HvNeOmQQIZymSnJM="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/mk-fg/pretty-yaml"; license = lib.licenses.wtfpl; }; -} +}) diff --git a/python/pkgs/pyannotate/default.nix b/python/pkgs/pyannotate/default.nix index 524aadea0..562566528 100644 --- a/python/pkgs/pyannotate/default.nix +++ b/python/pkgs/pyannotate/default.nix @@ -7,13 +7,13 @@ mypy-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyannotate"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BO1YBLqzgVPVmB/JLYPc9qIog0U3aFYfBX53flwFdZk="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/dropbox/pyannotate"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyannote-core/default.nix b/python/pkgs/pyannote-core/default.nix index c6a387f11..36a6d6480 100644 --- a/python/pkgs/pyannote-core/default.nix +++ b/python/pkgs/pyannote-core/default.nix @@ -13,7 +13,7 @@ sortedcontainers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyannote-core"; version = "6.0.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyannote"; repo = "pyannote-core"; - tag = version; + tag = finalAttrs.version; hash = "sha256-r5NkOAzrQGcb6LPi4/DA0uT9R0ELiYuwQkbT1l6R8Mw="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyannote/pyannote-core"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyannote-database/default.nix b/python/pkgs/pyannote-database/default.nix index f7ff0da79..ed158ae18 100644 --- a/python/pkgs/pyannote-database/default.nix +++ b/python/pkgs/pyannote-database/default.nix @@ -14,7 +14,7 @@ typer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyannote-database"; version = "6.1.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyannote"; repo = "pyannote-database"; - tag = version; + tag = finalAttrs.version; hash = "sha256-72H1tVLtDSYHAgjHWmI7pPQhKGchHz5VP0eRU6NRj2g="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "pyannote-database"; }; -} +}) diff --git a/python/pkgs/pyannote-metrics/default.nix b/python/pkgs/pyannote-metrics/default.nix index 8b7e8180f..f657085fb 100644 --- a/python/pkgs/pyannote-metrics/default.nix +++ b/python/pkgs/pyannote-metrics/default.nix @@ -20,7 +20,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyannote-metrics"; version = "4.1"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyannote"; repo = "pyannote-metrics"; - tag = version; + tag = finalAttrs.version; hash = "sha256-j0rNzHX9xIP9LB2Rk5D0EsD5BOWR4Kp5CEuKi8l8QgY="; }; @@ -36,7 +36,7 @@ buildPythonPackage rec { substituteInPlace src/pyannote/metrics/cli.py \ --replace-fail \ 'version="Evaluation"' \ - 'version="${version}"' + 'version="${finalAttrs.version}"' ''; build-system = [ @@ -65,4 +65,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "pyannote-metrics"; }; -} +}) diff --git a/python/pkgs/pyarrow-hotfix/default.nix b/python/pkgs/pyarrow-hotfix/default.nix index 266ae8154..4ccf60567 100644 --- a/python/pkgs/pyarrow-hotfix/default.nix +++ b/python/pkgs/pyarrow-hotfix/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyarrow-hotfix"; version = "0.7"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pitrou"; repo = "pyarrow-hotfix"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9K7rQUSd+at1WghTP8DlD44Op2VkvN1vlzF3ZLEIaRE="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/pitrou/pyarrow-hotfix"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pyarrow/default.nix b/python/pkgs/pyarrow/default.nix index 88259183d..1be5597b5 100644 --- a/python/pkgs/pyarrow/default.nix +++ b/python/pkgs/pyarrow/default.nix @@ -20,12 +20,12 @@ let zero_or_one = cond: if cond then 1 else 0; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyarrow"; inherit (arrow-cpp) version src; pyproject = true; - sourceRoot = "${src.name}/python"; + sourceRoot = "${finalAttrs.src.name}/python"; build-system = [ scikit-build-core @@ -66,8 +66,6 @@ buildPythonPackage rec { PARQUET_HOME = arrow-cpp; }; - doCheck = false; - dontUseCmakeConfigure = true; preBuild = '' @@ -106,4 +104,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/pyasn/default.nix b/python/pkgs/pyasn/default.nix index ff3b7b4cb..ad7044d5c 100644 --- a/python/pkgs/pyasn/default.nix +++ b/python/pkgs/pyasn/default.nix @@ -3,23 +3,27 @@ buildPythonPackage, fetchPypi, fetchFromGitHub, + # build-system + setuptools, python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyasn"; version = "1.6.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-otVfs+5HlHYJ9QIRylsLrEEahvPJNfuSyksLirfGaP8="; }; + build-system = [ setuptools ]; + datasrc = fetchFromGitHub { owner = "hadiasghari"; repo = "pyasn"; - rev = version; + tag = finalAttrs.version; hash = "sha256-7zpaxDe5qHUy/ekOJLxKawjaPQnByrOVj+m2bsUqfdg="; }; @@ -38,4 +42,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/pyasn1-modules/default.nix b/python/pkgs/pyasn1-modules/default.nix index 7c9ce73fe..bff860e4e 100644 --- a/python/pkgs/pyasn1-modules/default.nix +++ b/python/pkgs/pyasn1-modules/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyasn1-modules"; version = "0.4.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyasn1"; repo = "pyasn1-modules"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jpMIxQ4BJ7MY3cV276sVJv+3M/MMFKRIoL2m2QJFxRY="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://pyasn1.readthedocs.io"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/pyasynchat/default.nix b/python/pkgs/pyasynchat/default.nix index 8b163b462..4c8238955 100644 --- a/python/pkgs/pyasynchat/default.nix +++ b/python/pkgs/pyasynchat/default.nix @@ -6,7 +6,7 @@ pyasyncore, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyasynchat"; version = "1.0.5"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonrob"; repo = "pyasynchat"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KJmUou1llxUhDrMCOpJxqYNnPpJ0OoQv5VwYs/PJXbs="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/simonrob/pyasynchat"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/pyasyncore/default.nix b/python/pkgs/pyasyncore/default.nix index 5ded652a9..5d7e07d87 100644 --- a/python/pkgs/pyasyncore/default.nix +++ b/python/pkgs/pyasyncore/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyasyncore"; version = "1.0.5"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonrob"; repo = "pyasyncore"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gpmsawbTf59EchoKixWw2wcBoOFElPDLg9zylvhA04U="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/simonrob/pyasyncore"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/pyathena/default.nix b/python/pkgs/pyathena/default.nix index 846dc7179..abb2556e8 100644 --- a/python/pkgs/pyathena/default.nix +++ b/python/pkgs/pyathena/default.nix @@ -15,13 +15,13 @@ tenacity, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyathena"; version = "3.36.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AN2Y/6d/HKMLMLNVXru04vccVdMt2LJKCDioE1k/J94="; }; @@ -48,7 +48,6 @@ buildPythonPackage rec { # Nearly all tests depend on a working AWS Athena instance, # therefore deactivating them. # https://github.com/laughingman7743/PyAthena/#testing - doCheck = false; pythonImportsCheck = [ "pyathena" ]; @@ -57,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/laughingman7743/PyAthena/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyaudio/default.nix b/python/pkgs/pyaudio/default.nix index a55ff44a5..1d7061e6e 100644 --- a/python/pkgs/pyaudio/default.nix +++ b/python/pkgs/pyaudio/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, isPyPy, pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyaudio"; version = "0.2.14"; - format = "setuptools"; + pyproject = true; disabled = isPyPy; src = fetchPypi { pname = "PyAudio"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-eN//OHm0mU0fT8ZIVkald1XG7jwZZHpJH3kKCJW9L4c="; }; + build-system = [ setuptools ]; + buildInputs = [ pkgs.portaudio ]; meta = { @@ -25,4 +29,4 @@ buildPythonPackage rec { homepage = "https://people.csail.mit.edu/hubert/pyaudio/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyavm/default.nix b/python/pkgs/pyavm/default.nix index d0600569f..ce5148974 100644 --- a/python/pkgs/pyavm/default.nix +++ b/python/pkgs/pyavm/default.nix @@ -7,13 +7,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyavm"; version = "0.9.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zhHCeex1vfgj0MOGEkoVKKXns2+l3U0mSZInk58Rf4g="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://astrofrog.github.io/pyavm/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyaxmlparser/default.nix b/python/pkgs/pyaxmlparser/default.nix index 950db7cf5..5fef5f721 100644 --- a/python/pkgs/pyaxmlparser/default.nix +++ b/python/pkgs/pyaxmlparser/default.nix @@ -4,22 +4,26 @@ lxml, click, fetchFromGitHub, + # build-system + setuptools, asn1crypto, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.3.31"; - format = "setuptools"; + pyproject = true; pname = "pyaxmlparser"; src = fetchFromGitHub { owner = "appknox"; repo = "pyaxmlparser"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZV2PyWQfK9xidzGUz7XPAReaVjlB8tMUKQiXoGcFCGs="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ asn1crypto click lxml @@ -35,4 +39,4 @@ buildPythonPackage rec { asl20 ]; }; -} +}) diff --git a/python/pkgs/pybars3/default.nix b/python/pkgs/pybars3/default.nix index 521203205..d91719380 100644 --- a/python/pkgs/pybars3/default.nix +++ b/python/pkgs/pybars3/default.nix @@ -10,13 +10,13 @@ pymeta3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybars3"; version = "0.9.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ashH6QXlO5xbk2rxEskQR14nv3Z/efRSjBb5rx7A4lI="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/wbond/pybars3"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/pybase62/default.nix b/python/pkgs/pybase62/default.nix index 339c41b32..2e701d787 100644 --- a/python/pkgs/pybase62/default.nix +++ b/python/pkgs/pybase62/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "suminb"; repo = "base62"; diff --git a/python/pkgs/pybase64/default.nix b/python/pkgs/pybase64/default.nix index 4ce856a0a..94d0e9385 100644 --- a/python/pkgs/pybase64/default.nix +++ b/python/pkgs/pybase64/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybase64"; version = "1.5.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mayeut"; repo = "pybase64"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-7cUgvY/RLpkl6EfDCnki299m+KD2EpDLwIt4ut1hs38="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/mayeut/pybase64"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/pybcj/default.nix b/python/pkgs/pybcj/default.nix index 91e36a0c3..5ceecdd1a 100644 --- a/python/pkgs/pybcj/default.nix +++ b/python/pkgs/pybcj/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybcj"; version = "1.0.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromCodeberg { owner = "miurahr"; repo = "pybcj"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nFPk+1V0VXDvFA2w42w4UBF9T6adwBXfH78kDNnMGSU="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://codeberg.org/miurahr/pybcj"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/pybigwig/default.nix b/python/pkgs/pybigwig/default.nix index 7faac2f98..784dcdb0b 100644 --- a/python/pkgs/pybigwig/default.nix +++ b/python/pkgs/pybigwig/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, zlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybigwig"; version = "0.3.25"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "deeptools"; repo = "pyBigWig"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Vq/QdJg2qObJ49lHZ4RjULfI0f7pScLRWGW8NBZoMAw="; }; + build-system = [ setuptools ]; + buildInputs = [ zlib ]; pythonImportsCheck = [ "pyBigWig" ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/deeptools/pyBigWig"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pybind11/default.nix b/python/pkgs/pybind11/default.nix index 1ab31cc5c..b7bf70a7a 100644 --- a/python/pkgs/pybind11/default.nix +++ b/python/pkgs/pybind11/default.nix @@ -88,7 +88,6 @@ buildPythonPackage (finalAttrs: { # derivation that doesn't depend on pybind11, and use it for pybind11's # build-system. scikit-build-core-no-tests = scikit-build-core.overridePythonAttrs { - doCheck = false; }; }; diff --git a/python/pkgs/pybluez/default.nix b/python/pkgs/pybluez/default.nix index b05c1fdb9..acc0df5e8 100644 --- a/python/pkgs/pybluez/default.nix +++ b/python/pkgs/pybluez/default.nix @@ -3,6 +3,8 @@ stdenv, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, bluez, gattlib, }: @@ -10,7 +12,7 @@ buildPythonPackage { pname = "pybluez"; version = "unstable-2022-01-28"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "pybluez"; @@ -19,9 +21,11 @@ buildPythonPackage { hash = "sha256-GA58DfCFaVzZQA1HYpGQ68bznrt4SX1ojyOVn8hyCGo="; }; + build-system = [ setuptools ]; + buildInputs = [ bluez ]; - propagatedBuildInputs = [ gattlib ]; + dependencies = [ gattlib ]; # there are no tests diff --git a/python/pkgs/pybox2d/default.nix b/python/pkgs/pybox2d/default.nix index 75090d564..41132930f 100644 --- a/python/pkgs/pybox2d/default.nix +++ b/python/pkgs/pybox2d/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, swig, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybox2d"; version = "2.3.10"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "pybox2d"; repo = "pybox2d"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yjLFvsg8GQLxjN1vtZM9zl+kAmD4+eS/vzRkpj0SCjY="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ swig ]; # We need to build the package explicitly a first time so that the library/Box2D/Box2D.py file @@ -36,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/pybox2d/pybox2d"; license = lib.licenses.zlib; }; -} +}) diff --git a/python/pkgs/pybreaker/default.nix b/python/pkgs/pybreaker/default.nix index 3c348c07b..7308d8e72 100644 --- a/python/pkgs/pybreaker/default.nix +++ b/python/pkgs/pybreaker/default.nix @@ -9,7 +9,7 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybreaker"; version = "1.4.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danielfm"; repo = "pybreaker"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Cxer6EDfi4fvs7XENwpUUMcCiRX6eDNJz0s57l9U+zQ="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/danielfm/pybreaker"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pybrowserid/default.nix b/python/pkgs/pybrowserid/default.nix index 65864a191..6a614c817 100644 --- a/python/pkgs/pybrowserid/default.nix +++ b/python/pkgs/pybrowserid/default.nix @@ -6,14 +6,14 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybrowserid"; version = "0.14.0"; pyproject = true; src = fetchPypi { pname = "PyBrowserID"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-bCJ2aeh8wleWrnb2oO9lAlUoyK2C01Jnn6mj5WY6ceM="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/mozilla/PyBrowserID"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/pybrowsers/default.nix b/python/pkgs/pybrowsers/default.nix index a821d8ac1..a9c7cac11 100644 --- a/python/pkgs/pybrowsers/default.nix +++ b/python/pkgs/pybrowsers/default.nix @@ -26,7 +26,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # Tests want to interact with actual browsers - doCheck = false; pythonImportsCheck = [ "browsers" ]; diff --git a/python/pkgs/pybtex-docutils/default.nix b/python/pkgs/pybtex-docutils/default.nix index 5577c74db..4dec24900 100644 --- a/python/pkgs/pybtex-docutils/default.nix +++ b/python/pkgs/pybtex-docutils/default.nix @@ -11,13 +11,13 @@ docutils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybtex-docutils"; version = "1.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-On69+StZPgDowcU4qpogvKXZLYQjESRxWsyWTVHZPGs="; }; @@ -28,8 +28,6 @@ buildPythonPackage rec { docutils ]; - doCheck = false; - pythonImportsCheck = [ "pybtex_docutils" ]; meta = { @@ -37,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/mcmtroffaes/pybtex-docutils"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pybtex/default.nix b/python/pkgs/pybtex/default.nix index cef41c885..d88a4aec3 100644 --- a/python/pkgs/pybtex/default.nix +++ b/python/pkgs/pybtex/default.nix @@ -7,13 +7,13 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybtex"; version = "0.26.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LlVDvqQk5g6eQu73C/9Ze+SGSdj2i6Bhp6CSskd9VGQ="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://pybtex.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pybuildkite/default.nix b/python/pkgs/pybuildkite/default.nix index c551beee8..a86ee0a76 100644 --- a/python/pkgs/pybuildkite/default.nix +++ b/python/pkgs/pybuildkite/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "pybuildkite"; version = "1.3.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "pyasi"; diff --git a/python/pkgs/pycairo/default.nix b/python/pkgs/pycairo/default.nix index 932965222..94224162b 100644 --- a/python/pkgs/pycairo/default.nix +++ b/python/pkgs/pycairo/default.nix @@ -7,7 +7,7 @@ meson-python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycairo"; version = "1.29.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pygobject"; repo = "pycairo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fx/C3raSOU+E5vb/Awu3lz5cMpsXaOrl/8rlCR4jp/o="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/pycares/default.nix b/python/pkgs/pycares/default.nix index 84558acc4..1a0ebd86b 100644 --- a/python/pkgs/pycares/default.nix +++ b/python/pkgs/pycares/default.nix @@ -34,7 +34,6 @@ buildPythonPackage (finalAttrs: { propagatedNativeBuildInputs = [ cffi ]; # Requires network access - doCheck = false; pythonImportsCheck = [ "pycares" ]; diff --git a/python/pkgs/pycayennelpp/default.nix b/python/pkgs/pycayennelpp/default.nix index 5a2c9becb..c73658d0f 100644 --- a/python/pkgs/pycayennelpp/default.nix +++ b/python/pkgs/pycayennelpp/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycayennelpp"; version = "2.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1cc6lz28aa57gs74767xyd3i370lwx046yb5a1nfch6fk3kf7xdx"; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/smlng/pycayennelpp"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pycdlib/default.nix b/python/pkgs/pycdlib/default.nix index 8b4eec461..dfb033a10 100644 --- a/python/pkgs/pycdlib/default.nix +++ b/python/pkgs/pycdlib/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycdlib"; version = "1.16.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "clalancette"; repo = "pycdlib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uJ9rMriRCLXpKekG8vGsIw+s0e6wlfX0soAYs6HGe0Y="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl2Only; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/pychromecast/default.nix b/python/pkgs/pychromecast/default.nix index cd7ef54a1..b537d2594 100644 --- a/python/pkgs/pychromecast/default.nix +++ b/python/pkgs/pychromecast/default.nix @@ -8,7 +8,7 @@ zeroconf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pychromecast"; version = "14.0.10"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "pychromecast"; - tag = version; + tag = finalAttrs.version; hash = "sha256-m9rucHSiApT0Xqkf4sjVRehcGGgvbaoGgbT/s3SLxKI="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/pycifrw/default.nix b/python/pkgs/pycifrw/default.nix index 42b7aff31..c3c6c96b5 100644 --- a/python/pkgs/pycifrw/default.nix +++ b/python/pkgs/pycifrw/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "5.0.1"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "jamesrhester"; repo = "pycifrw"; diff --git a/python/pkgs/pyclip/default.nix b/python/pkgs/pyclip/default.nix index a8a535f84..ddfbd8aec 100644 --- a/python/pkgs/pyclip/default.nix +++ b/python/pkgs/pyclip/default.nix @@ -1,21 +1,25 @@ { lib, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyclip"; version = "0.7.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "spyoungtech"; repo = "pyclip"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0nOkNgT8XCwtXI9JZntkhoMspKQU602rTKBFajVKBoM="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace docs/README.md README.md @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/spyoungtech/pyclip"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pyclipper/default.nix b/python/pkgs/pyclipper/default.nix index 966a7c8cc..a0af2d1f7 100644 --- a/python/pkgs/pyclipper/default.nix +++ b/python/pkgs/pyclipper/default.nix @@ -7,13 +7,13 @@ cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyclipper"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-mIK9iJ8n2nit1N1viB0laX78dAv4QCdOdJmI0lSWyOE="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/fonttools/pyclipper"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pycocotools/default.nix b/python/pkgs/pycocotools/default.nix index 439f7f462..9d49ef69b 100644 --- a/python/pkgs/pycocotools/default.nix +++ b/python/pkgs/pycocotools/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, cython, matplotlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycocotools"; version = "2.0.11"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NCVNdtqFV2/K9cHzqpquFrjLFUGDNLpCg7gAeWvRmT0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cython matplotlib ]; @@ -27,11 +31,10 @@ buildPythonPackage rec { ]; # has no tests - doCheck = false; meta = { description = "Official APIs for the MS-COCO dataset"; homepage = "https://github.com/cocodataset/cocoapi/tree/master/PythonAPI"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/pycodestyle/default.nix b/python/pkgs/pycodestyle/default.nix index b525af82d..b2905e165 100644 --- a/python/pkgs/pycodestyle/default.nix +++ b/python/pkgs/pycodestyle/default.nix @@ -7,7 +7,7 @@ isPyPy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycodestyle"; version = "2.14.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; repo = "pycodestyle"; - tag = version; + tag = finalAttrs.version; hash = "sha256-1EEQp/QEulrdU9tTe28NerQ33IWlAiSlicpmNYciW88="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://pycodestyle.pycqa.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pycognito/default.nix b/python/pkgs/pycognito/default.nix index 53b9e4263..6f6842015 100644 --- a/python/pkgs/pycognito/default.nix +++ b/python/pkgs/pycognito/default.nix @@ -13,7 +13,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycognito"; version = "2024.5.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pvizeli"; repo = "pycognito"; - tag = version; + tag = finalAttrs.version; hash = "sha256-U23fFLru4j6GnWMcYtsCW9BVJkVcCoefPH6oMijYGew="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/pvizeli/pycognito"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pycollada/default.nix b/python/pkgs/pycollada/default.nix index 6586f529f..d4e003433 100644 --- a/python/pkgs/pycollada/default.nix +++ b/python/pkgs/pycollada/default.nix @@ -7,13 +7,13 @@ python-dateutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycollada"; version = "0.9.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-w01tzw/i66WJb3HJbTehwP4aYfCEQPoM/Ow9woldMwI="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { # Some tests fail because they refer to test data files that don't exist # (upstream packaging issue) - doCheck = false; pythonImportsCheck = [ "collada" @@ -40,4 +39,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/python/pkgs/pycomposefile/default.nix b/python/pkgs/pycomposefile/default.nix index 2efaac48b..17203feb4 100644 --- a/python/pkgs/pycomposefile/default.nix +++ b/python/pkgs/pycomposefile/default.nix @@ -6,13 +6,13 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycomposefile"; version = "0.0.34"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-kzqTtDn4aSiCtNUP90ThKj2ZYEAGjpZlGjfdhCEmpQg="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/smurawski/pycomposefile"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pycosat/default.nix b/python/pkgs/pycosat/default.nix index 3a4b03787..79afe47e5 100644 --- a/python/pkgs/pycosat/default.nix +++ b/python/pkgs/pycosat/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycosat"; version = "0.6.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-TJmHSUan6Tm7lBu7AZ3Swg5gaOMQfJE2bnd5xp1w4O0="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/ContinuumIO/pycosat"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pycotap/default.nix b/python/pkgs/pycotap/default.nix index 263c5cbbb..4b1c8d72e 100644 --- a/python/pkgs/pycotap/default.nix +++ b/python/pkgs/pycotap/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycotap"; version = "1.3.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Z0NV8BMAvgPff4cXhOSYZSwtiawZzXfujmFlJjSi+Do="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://el-tramo.be/pycotap"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pycountry/default.nix b/python/pkgs/pycountry/default.nix index b65978cc7..94af36cb0 100644 --- a/python/pkgs/pycountry/default.nix +++ b/python/pkgs/pycountry/default.nix @@ -7,7 +7,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycountry"; version = "26.2.16"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pycountry"; repo = "pycountry"; - tag = version; + tag = finalAttrs.version; hash = "sha256-VmPCQszEaDNsSnMfAo5xyDZySJcC4TiWZrmQMfebKKQ="; }; @@ -28,11 +28,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pycountry" ]; - doCheck = false; - meta = { description = "ISO country, subdivision, language, currency and script definitions and their translations"; homepage = "https://github.com/pycountry/pycountry"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/pycparser/default.nix b/python/pkgs/pycparser/default.nix index 1eece7b98..a8470e830 100644 --- a/python/pkgs/pycparser/default.nix +++ b/python/pkgs/pycparser/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycparser"; version = "3.00"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "eliben"; repo = "pycparser"; - tag = "release_v${version}"; + tag = "release_v${finalAttrs.version}"; hash = "sha256-6eKc+p3xLyRPo3oCWP/dbMpHlkBXLy8XiGR0gTEHI2E="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/eliben/pycparser"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pycrdt-store/default.nix b/python/pkgs/pycrdt-store/default.nix index cd96fd74e..ba6190329 100644 --- a/python/pkgs/pycrdt-store/default.nix +++ b/python/pkgs/pycrdt-store/default.nix @@ -14,7 +14,6 @@ buildPythonPackage (finalAttrs: { pname = "pycrdt-store"; version = "0.1.5"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "y-crdt"; diff --git a/python/pkgs/pycrdt-websocket/default.nix b/python/pkgs/pycrdt-websocket/default.nix index 5dcb5d3e7..309bd5647 100644 --- a/python/pkgs/pycrdt-websocket/default.nix +++ b/python/pkgs/pycrdt-websocket/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "pycrdt-websocket"; version = "0.16.4"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "y-crdt"; diff --git a/python/pkgs/pycrdt/default.nix b/python/pkgs/pycrdt/default.nix index fde948f8f..1219bde87 100644 --- a/python/pkgs/pycrdt/default.nix +++ b/python/pkgs/pycrdt/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { pname = "pycrdt"; version = "0.14.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "y-crdt"; diff --git a/python/pkgs/pycrypto/default.nix b/python/pkgs/pycrypto/default.nix index c79abd49e..039340e26 100644 --- a/python/pkgs/pycrypto/default.nix +++ b/python/pkgs/pycrypto/default.nix @@ -1,29 +1,34 @@ -{ buildPythonPackage, pycryptodome }: +{ + buildPythonPackage, + setuptools, + pycryptodome, +}: # This is a dummy package providing the drop-in replacement pycryptodome. # https://github.com/NixOS/nixpkgs/issues/21671 -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycrypto"; version = pycryptodome.version; - format = "setuptools"; + pyproject = true; + + build-system = [ setuptools ]; # Cannot build wheel otherwise (zip 1980 issue) env.SOURCE_DATE_EPOCH = 315532800; # We need to have a dist-info folder, so let's create one with setuptools unpackPhase = '' - echo "from setuptools import setup; setup(name='${pname}', version='${version}', install_requires=['pycryptodome'])" > setup.py + echo "from setuptools import setup; setup(name='${finalAttrs.pname}', version='${finalAttrs.version}', install_requires=['pycryptodome'])" > setup.py ''; - propagatedBuildInputs = [ pycryptodome ]; + dependencies = [ pycryptodome ]; # Our dummy has no tests - doCheck = false; meta = { homepage = "https://www.pycrypto.org/"; description = "Drop-in replacement for pycrypto using pycryptodome"; platforms = pycryptodome.meta.platforms; }; -} +}) diff --git a/python/pkgs/pycryptodome/default.nix b/python/pkgs/pycryptodome/default.nix index d0fa5be5c..6283e8868 100644 --- a/python/pkgs/pycryptodome/default.nix +++ b/python/pkgs/pycryptodome/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycryptodome"; version = "3.23.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Legrandin"; repo = "pycryptodome"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-x8QkRBwM/H/n7yHGjE8UfBhOzkGr0PBixe9g4EuZLUg="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { asl20 ]; }; -} +}) diff --git a/python/pkgs/pycurl/default.nix b/python/pkgs/pycurl/default.nix index 3924d736c..4fa8b5036 100644 --- a/python/pkgs/pycurl/default.nix +++ b/python/pkgs/pycurl/default.nix @@ -14,7 +14,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycurl"; version = "7.47.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pycurl"; repo = "pycurl"; - tag = "REL_${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "REL_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-5mZvNVJS1WwBj4joNflSicllgTPL2SwstwO/n2vylJ0="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/pycxx/default.nix b/python/pkgs/pycxx/default.nix index 16535716f..632289369 100644 --- a/python/pkgs/pycxx/default.nix +++ b/python/pkgs/pycxx/default.nix @@ -6,13 +6,13 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycxx"; version = "7.1.8"; pyproject = true; src = fetchurl { - url = "mirror://sourceforge/cxx/CXX/PyCXX%20V${version}/pycxx-${version}.tar.gz"; + url = "mirror://sourceforge/cxx/CXX/PyCXX%20V${finalAttrs.version}/pycxx-${finalAttrs.version}.tar.gz"; hash = "sha256-S5Hh4RQcI/vVA532NcS7bnVjIWhUj1a4POF3GTwMmMY="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://sourceforge.net/projects/cxx/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pydantic-ai-slim/default.nix b/python/pkgs/pydantic-ai-slim/default.nix index eae1df326..0c0b33e04 100644 --- a/python/pkgs/pydantic-ai-slim/default.nix +++ b/python/pkgs/pydantic-ai-slim/default.nix @@ -50,8 +50,6 @@ buildPythonPackage (finalAttrs: { "pydantic_ai" ]; - doCheck = false; - meta = { description = "GenAI Agent Framework, the Pydantic way"; homepage = "https://github.com/pydantic/pydantic-ai"; diff --git a/python/pkgs/pydantic-compat/default.nix b/python/pkgs/pydantic-compat/default.nix index 0da60a2ac..ed4090c65 100644 --- a/python/pkgs/pydantic-compat/default.nix +++ b/python/pkgs/pydantic-compat/default.nix @@ -9,7 +9,7 @@ pydantic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydantic-compat"; version = "0.1.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyapp-kit"; repo = "pydantic-compat"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; leaveDotGit = true; hash = "sha256-LU+NaQd0W2nRqHmnIcSXfEgIN+TIBkkR871+40Z+WR4="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyapp-kit/pydantic-compat"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pydantic-core/default.nix b/python/pkgs/pydantic-core/default.nix index 016aa48fc..736aab38e 100644 --- a/python/pkgs/pydantic-core/default.nix +++ b/python/pkgs/pydantic-core/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydantic-core"; version = "2.41.5"; pyproject = true; @@ -16,12 +16,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-core"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oIYHLSep8tWOXEaUybXG8Gv9WBoPGQ1Aj7QyqYksvMw="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-Kvc0a34C6oGc9oS/iaPaazoVUWn5ABUgrmPa/YocV+Y="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydantic/pydantic-core"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pydantic-extra-types/default.nix b/python/pkgs/pydantic-extra-types/default.nix index a2a392688..0cffe4697 100644 --- a/python/pkgs/pydantic-extra-types/default.nix +++ b/python/pkgs/pydantic-extra-types/default.nix @@ -12,7 +12,7 @@ tzdata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydantic-extra-types"; version = "2.11.2"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-extra-types"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-O8pw9oX+7hthg4/WtPAQXFwXT6qqan0xRGlE2Er7gtk="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydantic/pydantic-extra-types"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pydantic-graph/default.nix b/python/pkgs/pydantic-graph/default.nix index a8704201c..30096bbdd 100644 --- a/python/pkgs/pydantic-graph/default.nix +++ b/python/pkgs/pydantic-graph/default.nix @@ -47,8 +47,6 @@ buildPythonPackage (finalAttrs: { "pydantic_graph" ]; - doCheck = false; # no tests - meta = { description = "GenAI Agent Framework, the Pydantic way"; homepage = "https://github.com/pydantic/pydantic-ai"; diff --git a/python/pkgs/pydantic-monty/default.nix b/python/pkgs/pydantic-monty/default.nix index 185498f84..1efe07abf 100644 --- a/python/pkgs/pydantic-monty/default.nix +++ b/python/pkgs/pydantic-monty/default.nix @@ -17,8 +17,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.17"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "pydantic"; repo = "monty"; diff --git a/python/pkgs/pydantic-settings/default.nix b/python/pkgs/pydantic-settings/default.nix index 66f0225ca..a005dc580 100644 --- a/python/pkgs/pydantic-settings/default.nix +++ b/python/pkgs/pydantic-settings/default.nix @@ -7,7 +7,7 @@ python-dotenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydantic-settings"; version = "2.15.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-settings"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bVZ0KOQ+YA2n4HZ/G7A8fmgQJMtcACRdz587du/z1s4="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydantic/pydantic-settings"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pydantic/default.nix b/python/pkgs/pydantic/default.nix index f7492a7ac..584064d0d 100644 --- a/python/pkgs/pydantic/default.nix +++ b/python/pkgs/pydantic/default.nix @@ -10,7 +10,7 @@ typing-inspection, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydantic"; version = "2.12.5"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9TRLtVNBw2WHQnS0XFHg16Q7FdpTf3e2nb5qE5rlLUA="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydantic/pydantic"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pydash/default.nix b/python/pkgs/pydash/default.nix index 805b19feb..69d7f9c2d 100644 --- a/python/pkgs/pydash/default.nix +++ b/python/pkgs/pydash/default.nix @@ -10,7 +10,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydash"; version = "8.0.6"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dgilland"; repo = "pydash"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8DPeM9Q9NrlVF9a6vIfJLGyyB2SrWpZZRHZKqU/DT2w="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://pydash.readthedocs.io"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pydata-google-auth/default.nix b/python/pkgs/pydata-google-auth/default.nix index a522d08dd..fb1044741 100644 --- a/python/pkgs/pydata-google-auth/default.nix +++ b/python/pkgs/pydata-google-auth/default.nix @@ -8,7 +8,7 @@ versioneer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydata-google-auth"; version = "1.9.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "pydata-google-auth"; owner = "pydata"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vetijE+BQAt/8Dg3p2FunrzPyyNG9O2W6Y9sbWNFUnc="; }; @@ -36,7 +36,6 @@ buildPythonPackage rec { ]; # tests require network access - doCheck = false; pythonImportsCheck = [ "pydata_google_auth" ]; @@ -45,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydata/pydata-google-auth"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pydata-sphinx-theme/default.nix b/python/pkgs/pydata-sphinx-theme/default.nix index 3fb9cc0d2..cf5b55cba 100644 --- a/python/pkgs/pydata-sphinx-theme/default.nix +++ b/python/pkgs/pydata-sphinx-theme/default.nix @@ -10,14 +10,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydata-sphinx-theme"; version = "0.21.0"; format = "wheel"; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; format = "wheel"; dist = "py3"; python = "py3"; @@ -25,7 +25,7 @@ buildPythonPackage rec { hash = "sha256-02p1S/lYCwF4nvqKAYafLXyH+mxUPsvK+xS2vdQ2T5A="; }; - propagatedBuildInputs = [ + dependencies = [ sphinx accessible-pygments beautifulsoup4 @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydata/pydata-sphinx-theme"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pydeck/default.nix b/python/pkgs/pydeck/default.nix index c7a97c534..c2d5ce477 100644 --- a/python/pkgs/pydeck/default.nix +++ b/python/pkgs/pydeck/default.nix @@ -12,13 +12,13 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydeck"; version = "0.9.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aVd1y/5R9f3/vZc1ukaZh/3F78lrxAoO5ICBcFCceLI="; }; @@ -35,7 +35,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ + dependencies = [ jinja2 numpy ]; @@ -58,4 +58,4 @@ buildPythonPackage rec { description = "Large-scale interactive data visualization in Python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pydemumble/default.nix b/python/pkgs/pydemumble/default.nix index ff28242c4..338b778b8 100644 --- a/python/pkgs/pydemumble/default.nix +++ b/python/pkgs/pydemumble/default.nix @@ -7,7 +7,7 @@ ninja, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydemumble"; version = "0.1.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = "pydemumble"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Po19NXY4I97Aj1SY1KqpspEqYpVGIsAirOo6iAjBrbk="; fetchSubmodules = true; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/angr/pydemumble"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/pydes/default.nix b/python/pkgs/pydes/default.nix index 1725e6e43..172e4fd9f 100644 --- a/python/pkgs/pydes/default.nix +++ b/python/pkgs/pydes/default.nix @@ -2,13 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, python, }: buildPythonPackage { pname = "pydes"; version = "unstable-2019-01-08"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "twhiteman"; @@ -17,6 +19,8 @@ buildPythonPackage { sha256 = "0sic8wbyk5azb4d4m6zbc96lfqcw8s2pzcv9nric5yqc751613ww"; }; + build-system = [ setuptools ]; + checkPhase = '' ${python.interpreter} test_pydes.py ''; diff --git a/python/pkgs/pydicom/default.nix b/python/pkgs/pydicom/default.nix index 7c5b1a06b..4cc681466 100644 --- a/python/pkgs/pydicom/default.nix +++ b/python/pkgs/pydicom/default.nix @@ -33,8 +33,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "pydicom" ]; - doCheck = false; - meta = { description = "Pure Python package for DICOM medical file reading and writing"; homepage = "https://pydicom.github.io"; diff --git a/python/pkgs/pydiffx/default.nix b/python/pkgs/pydiffx/default.nix index 06d19f615..683c44c69 100644 --- a/python/pkgs/pydiffx/default.nix +++ b/python/pkgs/pydiffx/default.nix @@ -6,7 +6,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydiffx"; version = "1.1"; pyproject = true; @@ -14,11 +14,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "beanbaginc"; repo = "diffx"; - tag = "pydiffx/release-${version}"; + tag = "pydiffx/release-${finalAttrs.version}"; hash = "sha256-oJjHrg1X02SmNJKbWbTPc0kycI+jLj0C4eUFFXwb+TA="; }; - sourceRoot = "${src.name}/python"; + sourceRoot = "${finalAttrs.src.name}/python"; postPatch = '' substituteInPlace pydiffx/tests/testcases.py \ @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/beanbaginc/diffx"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pydispatcher/default.nix b/python/pkgs/pydispatcher/default.nix index 269baf174..cd16bc82b 100644 --- a/python/pkgs/pydispatcher/default.nix +++ b/python/pkgs/pydispatcher/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydispatcher"; version = "2.0.7"; pyproject = true; src = fetchPypi { pname = "PyDispatcher"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-t3fGrQgNwbrXSkwp1qRpFPpnAaxw+UsNZvvP3mL1vjE="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { description = "Multi-producer multi-consumer signal dispatching mechanism"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pydocket/default.nix b/python/pkgs/pydocket/default.nix index 538aebf42..c48150214 100644 --- a/python/pkgs/pydocket/default.nix +++ b/python/pkgs/pydocket/default.nix @@ -27,7 +27,6 @@ buildPythonPackage (finalAttrs: { pname = "pydocket"; version = "0.23.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "chrisguidry"; diff --git a/python/pkgs/pydocstyle/default.nix b/python/pkgs/pydocstyle/default.nix index 2c7cc77f7..3f26aaad9 100644 --- a/python/pkgs/pydocstyle/default.nix +++ b/python/pkgs/pydocstyle/default.nix @@ -6,13 +6,13 @@ snowballstemmer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydocstyle"; version = "6.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fOQ/DArIewdJTrnAtGLAtz5v8naAfyBNa1Ptxyt+ROE="; }; @@ -22,11 +22,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pydocstyle" ]; - doCheck = false; - meta = { homepage = "https://github.com/PyCQA/pydocstyle"; description = "Python docstring style checker"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pydot/default.nix b/python/pkgs/pydot/default.nix index 4ef4d0976..6244e7454 100644 --- a/python/pkgs/pydot/default.nix +++ b/python/pkgs/pydot/default.nix @@ -6,13 +6,13 @@ pyparsing, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydot"; version = "4.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-whSPaBxKM+CL8OJqnl+OQJmoLg4qBoCY8yzoZXc2StU="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydot/pydot"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pydruid/default.nix b/python/pkgs/pydruid/default.nix index 4fbcd8ef1..7f62b50f2 100644 --- a/python/pkgs/pydruid/default.nix +++ b/python/pkgs/pydruid/default.nix @@ -13,26 +13,26 @@ pycurl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydruid"; version = "0.6.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { repo = "pydruid"; owner = "druid-io"; - tag = version; + tag = finalAttrs.version; hash = "sha256-em4UuNnGdfT6KC9XiWSkCmm4DxdvDS+DGY9kw25iepo="; }; + build-system = [ setuptools ]; + # patch out the CLI because it doesn't work with newer versions of pygments postPatch = '' substituteInPlace setup.py --replace-fail '"console_scripts": ["pydruid = pydruid.console:main"],' "" ''; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; optional-dependencies = { pandas = [ pandas ]; async = [ tornado ]; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/druid-io/pydruid"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pydub/default.nix b/python/pkgs/pydub/default.nix index ec6f4fea9..aaaf3967d 100644 --- a/python/pkgs/pydub/default.nix +++ b/python/pkgs/pydub/default.nix @@ -9,7 +9,7 @@ replaceVars, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydub"; version = "0.25.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jiaaro"; repo = "pydub"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FTEMT47wPXK5i4ZGjTVAhI/NjJio3F2dbBZzYzClU3c="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "http://pydub.com"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pydyf/default.nix b/python/pkgs/pydyf/default.nix index 350e5b02b..9bedfbd2d 100644 --- a/python/pkgs/pydyf/default.nix +++ b/python/pkgs/pydyf/default.nix @@ -8,13 +8,13 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydyf"; version = "0.12.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+9fnWVQaxyXCnFBmEgA945Mkm5QxDqeK5Eyx0EsiAJU="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://doc.courtbouillon.org/pydyf/stable/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyeapi/default.nix b/python/pkgs/pyeapi/default.nix index f3eb03da1..da2e6e50f 100644 --- a/python/pkgs/pyeapi/default.nix +++ b/python/pkgs/pyeapi/default.nix @@ -6,7 +6,7 @@ netaddr, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyeapi"; version = "1.0.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arista-eosplus"; repo = "pyeapi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eGNBQSnYMC9YVCw5mBRH6XRq139AcqFm6HnO2FUzLEE="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/arista-eosplus/pyeapi"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyee/default.nix b/python/pkgs/pyee/default.nix index 1876c77d6..2e6d492f1 100644 --- a/python/pkgs/pyee/default.nix +++ b/python/pkgs/pyee/default.nix @@ -8,13 +8,13 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyee"; version = "14.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dt0PQxTs0n8C3HNYnep/04U/m2F22O+bEihgZX42At4="; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ typing-extensions ]; + dependencies = [ typing-extensions ]; pythonImportsCheck = [ "pyee" ]; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/jfhbrook/pyee"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyelftools/default.nix b/python/pkgs/pyelftools/default.nix index 867fcac11..ee96799ae 100644 --- a/python/pkgs/pyelftools/default.nix +++ b/python/pkgs/pyelftools/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyelftools"; version = "0.32"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "eliben"; repo = "pyelftools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-58Twjf7ECOPynQ5KPCTDQWdD3nb7ADJZISozWGRGoXM="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { ]; mainProgram = "readelf.py"; }; -} +}) diff --git a/python/pkgs/pyenchant/default.nix b/python/pkgs/pyenchant/default.nix index 10262d944..0d744f829 100644 --- a/python/pkgs/pyenchant/default.nix +++ b/python/pkgs/pyenchant/default.nix @@ -3,20 +3,24 @@ stdenv, buildPythonPackage, fetchPypi, + # build-system + setuptools, enchant_2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyenchant"; version = "3.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-glKIJGtd68lDb5GWdlCXTvDVY2RYUCYZ4yLEdvEoOJE="; }; - propagatedBuildInputs = [ enchant_2 ]; + build-system = [ setuptools ]; + + dependencies = [ enchant_2 ]; postPatch = let @@ -41,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyenchant/pyenchant"; license = lib.licenses.lgpl21; }; -} +}) diff --git a/python/pkgs/pyepsg/default.nix b/python/pkgs/pyepsg/default.nix index fad3bc5ac..7f6d04f40 100644 --- a/python/pkgs/pyepsg/default.nix +++ b/python/pkgs/pyepsg/default.nix @@ -6,13 +6,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyepsg"; version = "0.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LQj60eeotHqQpOQ9pIW6lXBZI0Ja78Tio++lQNvUcNc="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://pyepsg.readthedocs.io/en/latest/"; license = lib.licenses.lgpl3; }; -} +}) diff --git a/python/pkgs/pyerfa/default.nix b/python/pkgs/pyerfa/default.nix index 1acc63b58..dd6089907 100644 --- a/python/pkgs/pyerfa/default.nix +++ b/python/pkgs/pyerfa/default.nix @@ -10,13 +10,13 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyerfa"; version = "2.0.1.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-F9ayT+SEbGXV59jDYtywgZncY7MKI2rt1zh1zIPh9sA="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/liberfa/pyerfa"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyexcel-io/default.nix b/python/pkgs/pyexcel-io/default.nix index c5a14f04a..6fba0f7c8 100644 --- a/python/pkgs/pyexcel-io/default.nix +++ b/python/pkgs/pyexcel-io/default.nix @@ -6,7 +6,7 @@ lml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyexcel-io"; version = "0.6.8"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyexcel"; repo = "pyexcel-io"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UPUMj9x6Vbecht6K/TfkM3/BZeTSnIoS2k74YYVSVWI="; }; @@ -23,7 +23,6 @@ buildPythonPackage rec { dependencies = [ lml ]; # Tests depend on stuff that depends on this. - doCheck = false; pythonImportsCheck = [ "pyexcel_io" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "http://docs.pyexcel.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyexcel-xls/default.nix b/python/pkgs/pyexcel-xls/default.nix index 301597d55..4fba6b368 100644 --- a/python/pkgs/pyexcel-xls/default.nix +++ b/python/pkgs/pyexcel-xls/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyexcel-xls"; version = "0.7.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyexcel"; repo = "pyexcel-xls"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+iwdMSGUsUbWFO4s4+3Zf+47J9bzFffWthZoeThT8f0="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "http://docs.pyexcel.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyexcel/default.nix b/python/pkgs/pyexcel/default.nix index 2a2d47ce7..c36923f9c 100644 --- a/python/pkgs/pyexcel/default.nix +++ b/python/pkgs/pyexcel/default.nix @@ -9,13 +9,13 @@ texttable, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyexcel"; version = "0.7.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SJSD2MdnWk0E0KVaG13Qkldx4mYPpoEFyjQuSS9FnRs="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "http://docs.pyexcel.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyfakefs/default.nix b/python/pkgs/pyfakefs/default.nix index f75c95c21..0c13f2d7c 100644 --- a/python/pkgs/pyfakefs/default.nix +++ b/python/pkgs/pyfakefs/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyfakefs"; version = "6.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5Zo220R79QnOnJerPRUQwIzFGJXFMRMlpWCl5bXcGUA="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "pyfakefs" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://pyfakefs.org/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pyfiglet/default.nix b/python/pkgs/pyfiglet/default.nix index 3c181606c..1b2415c0c 100644 --- a/python/pkgs/pyfiglet/default.nix +++ b/python/pkgs/pyfiglet/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyfiglet"; version = "1.0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-25yZQO0b8wSN7/U07VL/La+7ws12ELF7teyh321CeO8="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/pwaller/pyfiglet"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/pyflakes/default.nix b/python/pkgs/pyflakes/default.nix index 859bb9780..b104efb02 100644 --- a/python/pkgs/pyflakes/default.nix +++ b/python/pkgs/pyflakes/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyflakes"; version = "3.4.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; repo = "pyflakes"; - tag = version; + tag = finalAttrs.version; hash = "sha256-4UEJjn9Eey1vHeaG468x/nMlbfGu3ohZX1R7RR2R5ik="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { mainProgram = "pyflakes"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyftpdlib/default.nix b/python/pkgs/pyftpdlib/default.nix index ed21857ef..f0d1b469b 100644 --- a/python/pkgs/pyftpdlib/default.nix +++ b/python/pkgs/pyftpdlib/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyftpdlib"; version = "2.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-S6BkIHh5LfY907LpyPg48qPs9CjHUY1ZIcBTDVNRKs8="; }; @@ -23,8 +23,6 @@ buildPythonPackage rec { "pysendfile" ]; - doCheck = false; - pythonImportsCheck = [ "pyftpdlib" ]; meta = { @@ -32,4 +30,4 @@ buildPythonPackage rec { description = "Asynchronous FTP server library"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyfuse3/default.nix b/python/pkgs/pyfuse3/default.nix index 7c0d93e4c..7ff837138 100644 --- a/python/pkgs/pyfuse3/default.nix +++ b/python/pkgs/pyfuse3/default.nix @@ -10,7 +10,7 @@ trio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyfuse3"; version = "3.5.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "libfuse"; repo = "pyfuse3"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HhEtWYWdxJZOMS3dqB2VdQS7aSdpkRhq7EZCJ55n2OE="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/pyfxa/default.nix b/python/pkgs/pyfxa/default.nix index 71ed99c42..eb53182ac 100644 --- a/python/pkgs/pyfxa/default.nix +++ b/python/pkgs/pyfxa/default.nix @@ -10,13 +10,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyfxa"; version = "0.8.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gq/OfpKjw6BSbGKTXbRa2crxleJJoj0BN4Ful1npWlw="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/mozilla/PyFxA"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/pyfzf/default.nix b/python/pkgs/pyfzf/default.nix index 4e07a7394..0f5eeced0 100644 --- a/python/pkgs/pyfzf/default.nix +++ b/python/pkgs/pyfzf/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyfzf"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "nk412"; repo = "pyfzf"; - rev = version; + tag = finalAttrs.version; hash = "sha256-w+ZjQGFd/lR2TiTHc2uQSJXORmzJJZXsr9BO4PIw/Co="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "pyfzf" ]; # Module has no tests @@ -25,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/nk412/pyfzf"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pygal/default.nix b/python/pkgs/pygal/default.nix index 381635e42..e330107a6 100644 --- a/python/pkgs/pygal/default.nix +++ b/python/pkgs/pygal/default.nix @@ -6,13 +6,13 @@ importlib-metadata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pygal"; version = "3.1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3RGcFM3rVr64UoLj4mh+zjBWEiXUEKgi5rtoaZqm57E="; }; @@ -25,8 +25,6 @@ buildPythonPackage rec { dependencies = [ importlib-metadata ]; - doCheck = false; - pythonImportsCheck = [ "pygal" ]; meta = { @@ -34,4 +32,4 @@ buildPythonPackage rec { homepage = "http://www.pygal.org"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/pygetwindow/default.nix b/python/pkgs/pygetwindow/default.nix index 0aae8fe19..a7b1a6e4c 100644 --- a/python/pkgs/pygetwindow/default.nix +++ b/python/pkgs/pygetwindow/default.nix @@ -2,28 +2,31 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pyrect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pygetwindow"; version = "0.0.9"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "PyGetWindow"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-F4lDVefSswXNgy1xdwg4QBfBaYqQziT29/vwJC3Qpog="; }; - doCheck = false; + build-system = [ setuptools ]; + # This lib officially only works completely on Windows and partially on MacOS but pyautogui requires it # pythonImportsCheck = [ "pygetwindow" ]; - propagatedBuildInputs = [ pyrect ]; + dependencies = [ pyrect ]; meta = { description = "Simple, cross-platform module for obtaining GUI information on applications' windows"; homepage = "https://github.com/asweigart/PyGetWindow"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyghmi/default.nix b/python/pkgs/pyghmi/default.nix index 78b2a19ec..58712e37d 100644 --- a/python/pkgs/pyghmi/default.nix +++ b/python/pkgs/pyghmi/default.nix @@ -7,13 +7,13 @@ pbr, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyghmi"; version = "1.6.19"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-MKCy4UWj5DKcjYaUhjXu47NHnsan7LxMw1B+bfP+WcI="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyghmi" ]; -} +}) diff --git a/python/pkgs/pygit2/default.nix b/python/pkgs/pygit2/default.nix index d622de4d1..9c2ba177f 100644 --- a/python/pkgs/pygit2/default.nix +++ b/python/pkgs/pygit2/default.nix @@ -12,13 +12,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pygit2"; version = "1.20.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-clNzVinCL/9BKnLEjCBLGcIG/an8sB5RET2WiRlMsc8="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/libgit2/pygit2"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/pygithub/default.nix b/python/pkgs/pygithub/default.nix index 18f7c9f93..653489a7b 100644 --- a/python/pkgs/pygithub/default.nix +++ b/python/pkgs/pygithub/default.nix @@ -12,7 +12,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pygithub"; version = "2.10.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qn/2IgzkVgjGMLHB2kd5n2reigBWVLuJTzYfB6BEu80="; }; @@ -40,7 +40,6 @@ buildPythonPackage rec { ++ pyjwt.optional-dependencies.crypto; # Test suite makes REST calls against github.com - doCheck = false; pythonImportsCheck = [ "github" ]; @@ -49,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/PyGithub/PyGithub"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/pyglm/default.nix b/python/pkgs/pyglm/default.nix index 862d070ce..0126057a8 100644 --- a/python/pkgs/pyglm/default.nix +++ b/python/pkgs/pyglm/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyglm"; version = "2.8.3"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Zuzu-Typ"; repo = "PyGLM"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7IN/kqFCwAMeVUrBB/CfCm9bSt1dHMbbLtqVInRFCk0="; fetchSubmodules = true; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { description = "OpenGL Mathematics (GLM) library for Python written in C++"; license = lib.licenses.zlib; }; -} +}) diff --git a/python/pkgs/pygls/1.nix b/python/pkgs/pygls/1.nix index 51262a3c1..84a15e543 100644 --- a/python/pkgs/pygls/1.nix +++ b/python/pkgs/pygls/1.nix @@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: { poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ lsprotocol typeguard ]; diff --git a/python/pkgs/pygls/default.nix b/python/pkgs/pygls/default.nix index d06592bf7..e245003ab 100644 --- a/python/pkgs/pygls/default.nix +++ b/python/pkgs/pygls/default.nix @@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: { poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ attrs cattrs lsprotocol diff --git a/python/pkgs/pygments/default.nix b/python/pkgs/pygments/default.nix index 1b73b64e9..3ebe0a54d 100644 --- a/python/pkgs/pygments/default.nix +++ b/python/pkgs/pygments/default.nix @@ -21,7 +21,6 @@ let build-system = [ hatchling ]; # circular dependencies if enabled by default - doCheck = false; pythonImportsCheck = [ "pygments" ]; meta = { homepage = "https://pygments.org/"; diff --git a/python/pkgs/pygobject-stubs/default.nix b/python/pkgs/pygobject-stubs/default.nix index d4118a63f..0760bc489 100644 --- a/python/pkgs/pygobject-stubs/default.nix +++ b/python/pkgs/pygobject-stubs/default.nix @@ -6,7 +6,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pygobject-stubs"; version = "2.16.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pygobject"; repo = "pygobject-stubs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3gWz/mWAMoXAHMfCFv3ri680iuMm0WLtGyMODujq31M="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/pygobject/pygobject-stubs"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/pygtail/default.nix b/python/pkgs/pygtail/default.nix index bc08c11b0..d74b1f335 100644 --- a/python/pkgs/pygtail/default.nix +++ b/python/pkgs/pygtail/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pygtail"; version = "0.14.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bgreenlee"; repo = "pygtail"; - rev = version; + tag = finalAttrs.version; hash = "sha256-TlXTlxeGDd+elGpMjxcJCmRuJmp5k9xj6MrViRzcST4="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Plus; homepage = "https://github.com/bgreenlee/pygtail"; }; -} +}) diff --git a/python/pkgs/pygtrie/default.nix b/python/pkgs/pygtrie/default.nix index d00281595..2334bf9b7 100644 --- a/python/pkgs/pygtrie/default.nix +++ b/python/pkgs/pygtrie/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pygtrie"; version = "2.6.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GTRhMSYHC07FGjzvzwyUzrsBOQQ7REwPAkhsrr0NgBE="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/mina86/pygtrie"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pyhamcrest/default.nix b/python/pkgs/pyhamcrest/default.nix index 3237611cf..8042a6c68 100644 --- a/python/pkgs/pyhamcrest/default.nix +++ b/python/pkgs/pyhamcrest/default.nix @@ -6,13 +6,13 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyhamcrest"; version = "2.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xqy+wJI9DLfnLCKvGSbz58l7jo1p/HSY6rrK98l1vZw="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/hamcrest/PyHamcrest"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyhanko-certvalidator/default.nix b/python/pkgs/pyhanko-certvalidator/default.nix index 8dd12aa8e..20f2fa9c7 100644 --- a/python/pkgs/pyhanko-certvalidator/default.nix +++ b/python/pkgs/pyhanko-certvalidator/default.nix @@ -16,7 +16,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyhanko-certvalidator"; version = "0.31.1"; pyproject = true; @@ -24,17 +24,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "pyhanko"; - tag = "pyhanko-certvalidator/v${version}"; + tag = "pyhanko-certvalidator/v${finalAttrs.version}"; hash = "sha256-mZ9u3mQ8JZIq+G1iwNQST8r7/rCWi/UW0j1xfeV9zFM="; }; - sourceRoot = "${src.name}/pkgs/pyhanko-certvalidator"; + sourceRoot = "${finalAttrs.src.name}/pkgs/pyhanko-certvalidator"; postPatch = '' substituteInPlace src/pyhanko_certvalidator/version.py \ - --replace-fail "0.0.0.dev1" "${version}" \ - --replace-fail "(0, 0, 0, 'dev1')" "tuple(\"${version}\".split(\".\"))" - substituteInPlace pyproject.toml --replace-fail "0.0.0.dev1" "${version}" + --replace-fail "0.0.0.dev1" "${finalAttrs.version}" \ + --replace-fail "(0, 0, 0, 'dev1')" "tuple(\"${finalAttrs.version}\".split(\".\"))" + substituteInPlace pyproject.toml --replace-fail "0.0.0.dev1" "${finalAttrs.version}" ''; build-system = [ setuptools ]; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/MatthiasValvekens/pyHanko/tree/master/pkgs/pyhanko-certvalidator"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyhcl/default.nix b/python/pkgs/pyhcl/default.nix index 6df3679d5..d67c67e4f 100644 --- a/python/pkgs/pyhcl/default.nix +++ b/python/pkgs/pyhcl/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyhcl"; version = "0.4.6"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "virtuald"; repo = "pyhcl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-djT0ao1WbM/sLKRycdA5J4IRu8NbmDayVKBdE4s6E2M="; }; # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64 configurePhase = '' - echo '__version__ = "${version}"' > ./src/hcl/version.py + echo '__version__ = "${finalAttrs.version}"' > ./src/hcl/version.py ''; build-system = [ setuptools ]; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/virtuald/pyhcl"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/pyhumps/default.nix b/python/pkgs/pyhumps/default.nix index cdce9d2d2..0da6859b1 100644 --- a/python/pkgs/pyhumps/default.nix +++ b/python/pkgs/pyhumps/default.nix @@ -6,7 +6,7 @@ fetchpatch2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyhumps"; version = "3.9.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nficano"; repo = "humps"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PvfjW56UVCcjd2jJiQW/goVJ1BC8xQ973xuZ6izwclw="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/nficano/humps"; license = with lib.licenses; [ unlicense ]; }; -} +}) diff --git a/python/pkgs/pyiceberg-core/default.nix b/python/pkgs/pyiceberg-core/default.nix index ae7615d4e..bfb54d54d 100644 --- a/python/pkgs/pyiceberg-core/default.nix +++ b/python/pkgs/pyiceberg-core/default.nix @@ -16,7 +16,6 @@ buildPythonPackage (finalAttrs: { pname = "pyiceberg-core"; version = "0.9.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "apache"; @@ -44,7 +43,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "pyiceberg_core" ]; # Circular dependency on pyiceberg - doCheck = false; passthru.tests.pytest = pyiceberg-core.overridePythonAttrs { }; diff --git a/python/pkgs/pyicu/default.nix b/python/pkgs/pyicu/default.nix index fc8d82220..a018e2191 100644 --- a/python/pkgs/pyicu/default.nix +++ b/python/pkgs/pyicu/default.nix @@ -9,7 +9,7 @@ icu, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyicu"; version = "2.16.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { domain = "gitlab.pyicu.org"; owner = "main"; repo = "pyicu"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JCevXAL6+G+EXx4ikOANgFiI9YPhjY5fDFLFBmEs8Ro="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { description = "Python extension wrapping the ICU C++ API"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyinfra/default.nix b/python/pkgs/pyinfra/default.nix index d2725f6c5..82fedfc8f 100644 --- a/python/pkgs/pyinfra/default.nix +++ b/python/pkgs/pyinfra/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { pname = "pyinfra"; version = "3.10.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "pyinfra-dev"; diff --git a/python/pkgs/pyinotify/default.nix b/python/pkgs/pyinotify/default.nix index 37ccd20ae..168490a68 100644 --- a/python/pkgs/pyinotify/default.nix +++ b/python/pkgs/pyinotify/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyinotify"; version = "0.9.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nJmKXXYGyoNQZc2rwBOubGbrnqdqAKHjvG4M/itPcfQ="; }; @@ -23,4 +23,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/pyinstaller-hooks-contrib/default.nix b/python/pkgs/pyinstaller-hooks-contrib/default.nix index c281c8894..908645456 100644 --- a/python/pkgs/pyinstaller-hooks-contrib/default.nix +++ b/python/pkgs/pyinstaller-hooks-contrib/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyinstaller-hooks-contrib"; version = "2026.7"; pyproject = true; src = fetchPypi { pname = "pyinstaller_hooks_contrib"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-X7yqyyLE9KrIaaEn3OKD9npLTPzDfUlvJEZgPm1orvo="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyinstaller/pyinstaller-hooks-contrib"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pyinstaller/default.nix b/python/pkgs/pyinstaller/default.nix index 12805891f..fb4427666 100644 --- a/python/pkgs/pyinstaller/default.nix +++ b/python/pkgs/pyinstaller/default.nix @@ -24,13 +24,13 @@ testers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyinstaller"; version = "6.22.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ibZaOtB9ndWDIlPje8RfMYctENf51cn9D91giKg4Kd0="; }; @@ -73,4 +73,4 @@ buildPythonPackage rec { ]; mainProgram = "pyinstaller"; }; -} +}) diff --git a/python/pkgs/pyinstrument/default.nix b/python/pkgs/pyinstrument/default.nix index 11f06d9fc..1294a9227 100644 --- a/python/pkgs/pyinstrument/default.nix +++ b/python/pkgs/pyinstrument/default.nix @@ -6,7 +6,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyinstrument"; version = "5.1.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "joerick"; repo = "pyinstrument"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eq1nclGpaBOW52UCzUeZHsq6GwMdkT2IU8RhnnuKirM="; }; @@ -24,7 +24,6 @@ buildPythonPackage rec { ]; # Module import recursion - doCheck = false; pythonImportsCheck = [ "pyinstrument" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/joerick/pyinstrument"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyjnius/default.nix b/python/pkgs/pyjnius/default.nix index a86a98906..17205274e 100644 --- a/python/pkgs/pyjnius/default.nix +++ b/python/pkgs/pyjnius/default.nix @@ -3,19 +3,23 @@ buildPythonPackage, cython, fetchPypi, + # build-system + setuptools, java, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyjnius"; version = "1.7.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-n4FwhISwqE6tPrC6hOU6xXnkxDyhDHRvmJip891Q9U0="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ java cython @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/kivy/pyjnius"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyjson5/default.nix b/python/pkgs/pyjson5/default.nix index ff7e39ad3..87e172523 100644 --- a/python/pkgs/pyjson5/default.nix +++ b/python/pkgs/pyjson5/default.nix @@ -7,7 +7,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyjson5"; version = "2.0.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Kijewski"; repo = "pyjson5"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SonObL4watru9+YDiw4K7Mo5BOKWmhp1R/IZ54H9Db0="; fetchSubmodules = true; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "pyjson5" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/Kijewski/pyjson5"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pyjsparser/default.nix b/python/pkgs/pyjsparser/default.nix index fd4c981df..30d31830e 100644 --- a/python/pkgs/pyjsparser/default.nix +++ b/python/pkgs/pyjsparser/default.nix @@ -1,6 +1,8 @@ { lib, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, }: @@ -8,7 +10,7 @@ let pyjsparser = buildPythonPackage { pname = "pyjsparser"; version = "2.7.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "PiotrDabkowski"; @@ -17,6 +19,8 @@ let hash = "sha256-Hqay9/qsjUfe62U7Q79l0Yy01L2Bnj5xNs6427k3Br8="; }; + build-system = [ setuptools ]; + # js2py is needed for tests but it's unmaintained and insecure pythonImportsCheck = [ "pyjsparser" ]; diff --git a/python/pkgs/pyjwkest/default.nix b/python/pkgs/pyjwkest/default.nix index fa580fae6..73c2f6720 100644 --- a/python/pkgs/pyjwkest/default.nix +++ b/python/pkgs/pyjwkest/default.nix @@ -8,7 +8,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyjwkest"; version = "1.4.4"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "IdentityPython"; repo = "pyjwkest"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-G4/qLOOQHsNSMVndUdYBhrrk8uEufbI8Od3ziQiY0XI="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/IdentityPython/pyjwkest"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pyjwt/default.nix b/python/pkgs/pyjwt/default.nix index 59ec957ad..2b7385b19 100644 --- a/python/pkgs/pyjwt/default.nix +++ b/python/pkgs/pyjwt/default.nix @@ -6,7 +6,7 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyjwt"; version = "2.13.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jpadilla"; repo = "pyjwt"; - tag = version; + tag = finalAttrs.version; hash = "sha256-q4ynXCJVDsyZh70439dloyWgRTLVm+elDOahUVOT5vA="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/jpadilla/pyjwt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pykakasi/default.nix b/python/pkgs/pykakasi/default.nix index 55aa66eb3..5bcd3630d 100644 --- a/python/pkgs/pykakasi/default.nix +++ b/python/pkgs/pykakasi/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pykakasi"; version = "2.3.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromCodeberg { owner = "miurahr"; repo = "pykakasi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-b2lYYdg1RW1xRD3hym7o1EnxzN/U5txVTWRifwZn3k0="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; mainProgram = "kakasi"; }; -} +}) diff --git a/python/pkgs/pykcs11/default.nix b/python/pkgs/pykcs11/default.nix index 512230437..52c787f1d 100644 --- a/python/pkgs/pykcs11/default.nix +++ b/python/pkgs/pykcs11/default.nix @@ -6,13 +6,13 @@ swig, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pykcs11"; version = "1.5.20"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-H3p8gWT6xjY4Kqew1wJ5rVWBN5dI/BeiC8C+j+V0wlk="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/LudovicRousseau/PyKCS11"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/pykeepass/default.nix b/python/pkgs/pykeepass/default.nix index 6e0db8d8c..e9d175286 100644 --- a/python/pkgs/pykeepass/default.nix +++ b/python/pkgs/pykeepass/default.nix @@ -11,7 +11,7 @@ pyotp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pykeepass"; version = "4.2.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "libkeepass"; repo = "pykeepass"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MGlkpnWTBO7m3u1v8yZiKMtXnEv+rsy6+J1mJILdx0I="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/pykka/default.nix b/python/pkgs/pykka/default.nix index d30c2afa0..0332053f7 100644 --- a/python/pkgs/pykka/default.nix +++ b/python/pkgs/pykka/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pykka"; version = "4.4.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VPz7ntXvkuuYv5lhz977xz3fvyQGDjGdUP3m7GbQDYo="; }; @@ -19,11 +19,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pykka" ]; - doCheck = false; - meta = { homepage = "https://www.pykka.org/"; description = "Python implementation of the actor model"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pykwalify/default.nix b/python/pkgs/pykwalify/default.nix index 688145932..8722b2b1f 100644 --- a/python/pkgs/pykwalify/default.nix +++ b/python/pkgs/pykwalify/default.nix @@ -5,19 +5,23 @@ python-dateutil, docopt, fetchPypi, + # build-system + setuptools, ruamel-yaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "1.8.0"; - format = "setuptools"; + pyproject = true; pname = "pykwalify"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eWsq0+1MuZuIMItTP7L1WcMPpu+0+p/aETR/SD0kWIQ="; }; + build-system = [ setuptools ]; + patches = [ # fix test failures with ruamel.yaml 0.18+ (fetchpatch { @@ -27,7 +31,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + dependencies = [ python-dateutil docopt ruamel-yaml @@ -56,4 +60,4 @@ buildPythonPackage rec { ''; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pylama/default.nix b/python/pkgs/pylama/default.nix index 835c59ba5..c0b2b6e96 100644 --- a/python/pkgs/pylama/default.nix +++ b/python/pkgs/pylama/default.nix @@ -16,7 +16,7 @@ }: let - pylama = buildPythonPackage rec { + pylama = buildPythonPackage (finalAttrs: { pname = "pylama"; version = "8.4.1"; pyproject = true; @@ -24,7 +24,7 @@ let src = fetchFromGitHub { owner = "klen"; repo = "pylama"; - rev = version; + tag = finalAttrs.version; hash = "sha256-WOGtZ412tX3YH42JCd5HIngunluwtMmQrOSUZp23LPU="; }; @@ -58,6 +58,6 @@ let homepage = "https://github.com/klen/pylama"; license = lib.licenses.mit; }; - }; + }); in pylama diff --git a/python/pkgs/pylast/default.nix b/python/pkgs/pylast/default.nix index 89a6294a3..860dc6bd5 100644 --- a/python/pkgs/pylast/default.nix +++ b/python/pkgs/pylast/default.nix @@ -7,7 +7,7 @@ httpx2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylast"; version = "7.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pylast"; repo = "pylast"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Vo916wcaEkrKftBoe+6P7DpYsyILoAcZLt3rpIGKu/c="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/pylast/pylast"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pylatex/default.nix b/python/pkgs/pylatex/default.nix index 23d3ef70f..d48797fd0 100644 --- a/python/pkgs/pylatex/default.nix +++ b/python/pkgs/pylatex/default.nix @@ -6,7 +6,7 @@ ordered-set, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylatex"; version = "1.4.2"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JelteF"; repo = "PyLaTeX"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-R6u2HDDLsli/omrtEKSRTH8Pd99gBI4iM+O0cZhoSJc="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ ordered-set ]; + dependencies = [ ordered-set ]; pythonImportsCheck = [ "pylatex" @@ -33,4 +33,4 @@ buildPythonPackage rec { downloadPage = "https://github.com/JelteF/PyLaTeX/releases"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pylatexenc/default.nix b/python/pkgs/pylatexenc/default.nix index cbec5a884..fff4ab9fc 100644 --- a/python/pkgs/pylatexenc/default.nix +++ b/python/pkgs/pylatexenc/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylatexenc"; version = "2.11"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "phfaist"; repo = "pylatexenc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Zv3Sjx0YpSCnoHHf3CSiGaFMS7FNgUUwvIxNX/k9tOg="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "pylatexenc" ]; meta = { @@ -23,4 +27,4 @@ buildPythonPackage rec { homepage = "https://pylatexenc.readthedocs.io"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyld/default.nix b/python/pkgs/pyld/default.nix index a1ff226aa..dccc2c053 100644 --- a/python/pkgs/pyld/default.nix +++ b/python/pkgs/pyld/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, requests, }: @@ -22,19 +24,21 @@ let }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyld"; version = "1.0.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "digitalbazaar"; repo = "pyld"; - rev = version; + tag = finalAttrs.version; sha256 = "0z2vkllw8bvzxripwb6l757r7av5qwhzsiy4061gmlhq8z8gq961"; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # Unfortunately PyLD does not pass all testcases in the JSON-LD corpus. We # getting worse, at least. @@ -43,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/digitalbazaar/pyld"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyleri/default.nix b/python/pkgs/pyleri/default.nix index bdd339bdd..cf6fd1a32 100644 --- a/python/pkgs/pyleri/default.nix +++ b/python/pkgs/pyleri/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyleri"; version = "1.5.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-mY1bDMRTlA4XU/waz4ORJWh4bm3G/kXzwlpvTqcqOCY="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/cesbit/pyleri"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pylev/default.nix b/python/pkgs/pylev/default.nix index 70ae376da..c7b429cdd 100644 --- a/python/pkgs/pylev/default.nix +++ b/python/pkgs/pylev/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylev"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "toastdriven"; repo = "pylev"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gZUE2n3VFH9Z93wZocYLw4nsZaEOtN5rt1ttu22T/Tk="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "pylev" ]; meta = { @@ -23,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/toastdriven/pylev"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pylibacl/default.nix b/python/pkgs/pylibacl/default.nix index 49a500766..7cc918844 100644 --- a/python/pkgs/pylibacl/default.nix +++ b/python/pkgs/pylibacl/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylibacl"; version = "0.7.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nZ/7WA4MWC1d5ZgIf3X2lARYsjgQxhVSkUPGGxcr+SI="; }; + build-system = [ setuptools ]; + # ERROR: testExtended (tests.test_acls.AclExtensions) # IOError: [Errno 0] Error @@ -24,4 +28,4 @@ buildPythonPackage rec { description = "Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/pylink-square/default.nix b/python/pkgs/pylink-square/default.nix index 4799766d0..37c50b7b6 100644 --- a/python/pkgs/pylink-square/default.nix +++ b/python/pkgs/pylink-square/default.nix @@ -9,7 +9,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylink-square"; version = "2.0.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "square"; repo = "pylink"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-r0LqyyYKnwyabxuV4xRlr+0ix77zw519+VAat2it1G4="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/square/pylink"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pylint-celery/default.nix b/python/pkgs/pylint-celery/default.nix index 15a5c64ae..f0593e138 100644 --- a/python/pkgs/pylint-celery/default.nix +++ b/python/pkgs/pylint-celery/default.nix @@ -1,26 +1,30 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, isPy3k, lib, # pythonPackages pylint-plugin-utils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylint-celery"; version = "0.3"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint-celery"; - rev = version; + tag = finalAttrs.version; sha256 = "05fhwraq12c2724pn4py1bjzy5rmsrb1x68zck73nlp5icba6yap"; }; - propagatedBuildInputs = [ pylint-plugin-utils ]; + build-system = [ setuptools ]; + + dependencies = [ pylint-plugin-utils ]; # Testing requires a very old version of pylint, incompatible with other dependencies @@ -29,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/PyCQA/pylint-celery"; license = lib.licenses.gpl2; }; -} +}) diff --git a/python/pkgs/pylint-flask/default.nix b/python/pkgs/pylint-flask/default.nix index 119c7e6a1..f7cce7721 100644 --- a/python/pkgs/pylint-flask/default.nix +++ b/python/pkgs/pylint-flask/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylint-flask"; version = "0.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-9Nl94iFr97/OB8nAixZul4/p8nJd4qUKmEWpfefjFRc="; }; @@ -22,7 +22,7 @@ buildPythonPackage rec { buildInputs = [ pylint ]; - propagatedBuildInputs = [ + dependencies = [ astroid pylint-plugin-utils ]; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/jschaf/pylint-flask"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/pylint-plugin-utils/default.nix b/python/pkgs/pylint-plugin-utils/default.nix index 078e7c485..2aa9dec86 100644 --- a/python/pkgs/pylint-plugin-utils/default.nix +++ b/python/pkgs/pylint-plugin-utils/default.nix @@ -7,7 +7,7 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylint-plugin-utils"; version = "0.9.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint-plugin-utils"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8C6vJDu60uSb6G0kvwiO0RAY9dU0yf955mAJAKhIkaQ="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/PyCQA/pylint-plugin-utils"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/pylint-venv/default.nix b/python/pkgs/pylint-venv/default.nix index ca6d7bb52..654c07d2c 100644 --- a/python/pkgs/pylint-venv/default.nix +++ b/python/pkgs/pylint-venv/default.nix @@ -5,13 +5,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylint_venv"; version = "3.0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-THHCrRT8BUlplEC8xGCZT/3cFIG5B4QEtMQ9KAbvD1k="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/jgosmann/pylint-venv/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pylru/default.nix b/python/pkgs/pylru/default.nix index 95dacd4d5..343af0920 100644 --- a/python/pkgs/pylru/default.nix +++ b/python/pkgs/pylru/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylru"; version = "1.3.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jlhutch"; repo = "pylru"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3qycUYmnLGiuNsrBOCL/QiRkrPVikaRqVBmQFURDGKs="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/jlhutch/pylru"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyls-spyder/default.nix b/python/pkgs/pyls-spyder/default.nix index 6619b4506..1085da60c 100644 --- a/python/pkgs/pyls-spyder/default.nix +++ b/python/pkgs/pyls-spyder/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, python-lsp-server, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyls-spyder"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "spyder-ide"; repo = "pyls-spyder"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "11ajbsia60d4c9s6m6rbvaqp1d69fcdbq6a98lkzkkzv2b9pdhkk"; }; - propagatedBuildInputs = [ python-lsp-server ]; + build-system = [ setuptools ]; + + dependencies = [ python-lsp-server ]; pythonImportsCheck = [ "pyls_spyder" ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/spyder-ide/pyls-spyder"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pylsp-rope/default.nix b/python/pkgs/pylsp-rope/default.nix index 8c7c042b0..418c989d8 100644 --- a/python/pkgs/pylsp-rope/default.nix +++ b/python/pkgs/pylsp-rope/default.nix @@ -9,7 +9,7 @@ python-lsp-server, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylsp-rope"; version = "0.1.17"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-rope"; repo = "pylsp-rope"; - tag = version; + tag = finalAttrs.version; hash = "sha256-gEmSZQZ2rtSljN8USsUiqsP2cr54k6kwvsz8cjam9dU="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-rope/pylsp-rope"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pylsqpack/default.nix b/python/pkgs/pylsqpack/default.nix index 70e718695..29c4e5212 100644 --- a/python/pkgs/pylsqpack/default.nix +++ b/python/pkgs/pylsqpack/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylsqpack"; version = "0.3.24"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jsRV9EYUIo+J441AwbHjeJViDiDsayHjtWL6i3miOJA="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/aiortc/pylsqpack"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pylxd/default.nix b/python/pkgs/pylxd/default.nix index 7723add91..95902985b 100644 --- a/python/pkgs/pylxd/default.nix +++ b/python/pkgs/pylxd/default.nix @@ -12,7 +12,7 @@ ws4py, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylxd"; version = "2.4.2"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "canonical"; repo = "pylxd"; - tag = version; + tag = finalAttrs.version; hash = "sha256-lLVo8qcOh+KnoKpxLg36uzymOkgOzC+TcDe5yqy9TH4="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://pylxd.readthedocs.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pymacaroons/default.nix b/python/pkgs/pymacaroons/default.nix index c9108acdd..3043b04a5 100644 --- a/python/pkgs/pymacaroons/default.nix +++ b/python/pkgs/pymacaroons/default.nix @@ -7,13 +7,13 @@ pynacl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymacaroons"; version = "0.13.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Hmu6QqX2bCRa3zilpABqmdzAagcDeG6mNgmGZ9QpA7g="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/ecordell/pymacaroons"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pymatreader/default.nix b/python/pkgs/pymatreader/default.nix index c57181c36..936e53daf 100644 --- a/python/pkgs/pymatreader/default.nix +++ b/python/pkgs/pymatreader/default.nix @@ -9,7 +9,7 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymatreader"; version = "1.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "obob"; repo = "pymatreader"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cDEGEvBSj3gmjA+8aXULwuBVk09BLQbA91CNAxgtiLA="; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ h5py numpy scipy @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/obob/pymatreader/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/pymdown-extensions/default.nix b/python/pkgs/pymdown-extensions/default.nix index b08641cf6..1dca3901b 100644 --- a/python/pkgs/pymdown-extensions/default.nix +++ b/python/pkgs/pymdown-extensions/default.nix @@ -36,7 +36,7 @@ let "tilde" ]; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymdown-extensions"; version = "11.0.2"; pyproject = true; @@ -44,7 +44,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; - tag = version; + tag = finalAttrs.version; hash = "sha256-AmKt9KNBvT5yGyKfYmS3BE5XQHZVAP+UJGMBCR3jbLI="; }; @@ -64,4 +64,4 @@ buildPythonPackage rec { bsd2 ]; }; -} +}) diff --git a/python/pkgs/pymeeus/default.nix b/python/pkgs/pymeeus/default.nix index 62dc6a1bb..619c8104b 100644 --- a/python/pkgs/pymeeus/default.nix +++ b/python/pkgs/pymeeus/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymeeus"; version = "0.5.12"; pyproject = true; src = fetchPypi { pname = "PyMeeus"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-VI9xhr2LlsvAac9kmo6ON33OSax0SGcJhJ/mOpnK1oQ="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { description = "Library of astronomical algorithms"; license = lib.licenses.lgpl3; }; -} +}) diff --git a/python/pkgs/pymemcache/default.nix b/python/pkgs/pymemcache/default.nix index 6929fe08b..353275539 100644 --- a/python/pkgs/pymemcache/default.nix +++ b/python/pkgs/pymemcache/default.nix @@ -6,7 +6,7 @@ stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymemcache"; version = "4.0.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pinterest"; repo = "pymemcache"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WgtHhp7lE6StoOBfSy9+v3ODe/+zUC7lGrc2S4M68+M="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://pymemcache.readthedocs.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pymeta3/default.nix b/python/pkgs/pymeta3/default.nix index 84aa89933..bef35b01e 100644 --- a/python/pkgs/pymeta3/default.nix +++ b/python/pkgs/pymeta3/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "PyMeta3"; version = "0.5.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GL2jJtmpu/WHv8DuC8loZJZNeLBnKIvPVdTZhoHQW8s="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/wbond/pymeta3"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pymetar/default.nix b/python/pkgs/pymetar/default.nix index a21b03392..59c44ddf3 100644 --- a/python/pkgs/pymetar/default.nix +++ b/python/pkgs/pymetar/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymetar"; version = "1.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SNvmxJKZYQIcth5Ju54GBbVMS2G5+5reUQdnBaCOzVQ="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/klausman/pymetar"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/pymodbus-repl/default.nix b/python/pkgs/pymodbus-repl/default.nix index a09b73c24..22b1aba66 100644 --- a/python/pkgs/pymodbus-repl/default.nix +++ b/python/pkgs/pymodbus-repl/default.nix @@ -14,7 +14,7 @@ typer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymodbus-repl"; version = "2.0.5"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pymodbus-dev"; repo = "repl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-jGoYp2nDWMWMX8n0aaG/YP+rQcj2npFbhdy7T1qxByc="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/pymodbus-dev/repl"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pymongo/default.nix b/python/pkgs/pymongo/default.nix index 01c1752ef..dbced3cd0 100644 --- a/python/pkgs/pymongo/default.nix +++ b/python/pkgs/pymongo/default.nix @@ -12,13 +12,13 @@ dnspython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymongo"; version = "4.18.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "pymongo"; hash = "sha256-bzPNIDPo6iFtMGm16+p53tdO8qk/aak7Js8xAIL5tbk="; }; @@ -32,7 +32,6 @@ buildPythonPackage rec { dependencies = [ dnspython ]; # Tests call a running mongodb instance - doCheck = false; pythonImportsCheck = [ "pymongo" ]; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/mongodb/mongo-python-driver"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pymorphy2-dicts-ru/default.nix b/python/pkgs/pymorphy2-dicts-ru/default.nix index 5c61da1b4..32703e5bf 100644 --- a/python/pkgs/pymorphy2-dicts-ru/default.nix +++ b/python/pkgs/pymorphy2-dicts-ru/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "pymorphy2_dicts_ru" ]; diff --git a/python/pkgs/pymorphy2/default.nix b/python/pkgs/pymorphy2/default.nix index 4d53ac479..6000bb225 100644 --- a/python/pkgs/pymorphy2/default.nix +++ b/python/pkgs/pymorphy2/default.nix @@ -1,6 +1,8 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, isPy3k, dawg-python, @@ -8,19 +10,21 @@ pymorphy2-dicts-ru, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymorphy2"; version = "0.9.1"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hsRHFX3uLrI0HvvkU44SgadUdWuhqjLad6iWFMWLVgw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ dawg-python docopt pymorphy2-dicts-ru @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/kmike/pymorphy2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pympler/default.nix b/python/pkgs/pympler/default.nix index 4c8cf91f0..3b7171763 100644 --- a/python/pkgs/pympler/default.nix +++ b/python/pkgs/pympler/default.nix @@ -6,13 +6,13 @@ bottle, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pympler"; version = "1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-HqqGfLiZLCGEMPFwj9rM2lPfBkFE0cVlax5vHuYABCQ="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/pympler/pympler"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pymunk/default.nix b/python/pkgs/pymunk/default.nix index 31c913e0d..24ac4ea1f 100644 --- a/python/pkgs/pymunk/default.nix +++ b/python/pkgs/pymunk/default.nix @@ -7,13 +7,13 @@ cffi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymunk"; version = "7.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ed50/c5o9HUUwubljvVQKgu2i6HDx35ONZuqRm6dTBY="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/pymupdf-fonts/default.nix b/python/pkgs/pymupdf-fonts/default.nix index b8f63e645..b1e54fbf6 100644 --- a/python/pkgs/pymupdf-fonts/default.nix +++ b/python/pkgs/pymupdf-fonts/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymupdf_fonts"; version = "1.0.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rBLj7Er/o16aCsopE170HCO9vldYwzVdrCNphjCea8Y="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/pymupdf/pymupdf-fonts"; license = lib.licenses.ofl; }; -} +}) diff --git a/python/pkgs/pymysql/default.nix b/python/pkgs/pymysql/default.nix index 984eafdc3..e3336f4aa 100644 --- a/python/pkgs/pymysql/default.nix +++ b/python/pkgs/pymysql/default.nix @@ -10,27 +10,26 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymysql"; version = "1.2.0"; pyproject = true; src = fetchPypi { pname = "pymysql"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-bHsXymhpiBBNdCbCeJW0Vc3uo+nTzrEnDww3BP6tjDM="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ cryptography ]; + dependencies = [ cryptography ]; # Wants to connect to MySQL - doCheck = false; meta = { description = "Pure Python MySQL Client"; homepage = "https://github.com/PyMySQL/PyMySQL"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pynacl/default.nix b/python/pkgs/pynacl/default.nix index adbedce42..3a76b1ac9 100644 --- a/python/pkgs/pynacl/default.nix +++ b/python/pkgs/pynacl/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pynacl"; version = "1.6.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyca"; repo = "pynacl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-EzzJVRDgYQO6T8YIQjad/Eb9O+BXT4IpOpa48fpBPnc="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyca/pynacl/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pynamecheap/default.nix b/python/pkgs/pynamecheap/default.nix index 30abbaf54..df4717c7a 100644 --- a/python/pkgs/pynamecheap/default.nix +++ b/python/pkgs/pynamecheap/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pynamecheap"; version = "0.0.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bemmu"; repo = "PyNamecheap"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-J2WYWtZGtZiox4q9tdkLyU1nix9Jn64K0+1mw7xoLLw="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/Bemmu/PyNamecheap"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pynamodb/default.nix b/python/pkgs/pynamodb/default.nix index fbe96b349..41a799970 100644 --- a/python/pkgs/pynamodb/default.nix +++ b/python/pkgs/pynamodb/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pynamodb"; version = "6.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pynamodb"; repo = "PynamoDB"; - tag = version; + tag = finalAttrs.version; hash = "sha256-i4oxZO3gBVc2PMFSISeytaO8YrzYR9YuUMxrEqrg2c4="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "http://jlafon.io/pynamodb.html"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pynetbox/default.nix b/python/pkgs/pynetbox/default.nix index 4bf9016af..910bcfd01 100644 --- a/python/pkgs/pynetbox/default.nix +++ b/python/pkgs/pynetbox/default.nix @@ -9,7 +9,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pynetbox"; version = "7.8.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "netbox-community"; repo = "pynetbox"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vHtKWiaIb1dwzXaFDqDQ3iWCHYtCqOJD5PMKigXbHtU="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/netbox-community/pynetbox"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pynetdicom/default.nix b/python/pkgs/pynetdicom/default.nix index 5baea58bd..2803c2e02 100644 --- a/python/pkgs/pynetdicom/default.nix +++ b/python/pkgs/pynetdicom/default.nix @@ -6,7 +6,7 @@ pydicom, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pynetdicom"; version = "3.0.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pydicom"; repo = "pynetdicom"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4LISckHH+fVBmPcBr8rM62E6r3IkKAgdUneVHyc5Vm8="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydicom/pynetdicom"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pynrrd/default.nix b/python/pkgs/pynrrd/default.nix index 6c40fef14..0dbb92dbc 100644 --- a/python/pkgs/pynrrd/default.nix +++ b/python/pkgs/pynrrd/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pynrrd"; version = "1.1.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mhe"; repo = "pynrrd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qu3s3XswJCUchqYfYMuqIzI4sfeXrttvXSEW9/GSENA="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { description = "Simple pure-Python reader for NRRD files"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pynvim/default.nix b/python/pkgs/pynvim/default.nix index 53a9a2fe6..73a06d07a 100644 --- a/python/pkgs/pynvim/default.nix +++ b/python/pkgs/pynvim/default.nix @@ -10,7 +10,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pynvim"; version = "0.6.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "neovim"; repo = "pynvim"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Wxn4g/lFelAJx0Zz2yaeXqX56xeOWUJNb2p8EiJgKE0="; }; @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "Python client for Neovim"; homepage = "https://github.com/neovim/pynvim"; - changelog = "https://github.com/neovim/pynvim/releases/tag/${version}"; + changelog = "https://github.com/neovim/pynvim/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pynzb/default.nix b/python/pkgs/pynzb/default.nix index e4ed54e62..6a32c5915 100644 --- a/python/pkgs/pynzb/default.nix +++ b/python/pkgs/pynzb/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pynzb"; version = "0.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BzWziJoRdLu2VBjuUDYp0/Xkpj8EsW9G/7oYJT7D7xc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ericflo/pynzb"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyocd/default.nix b/python/pkgs/pyocd/default.nix index a7f1aec23..c164f2eba 100644 --- a/python/pkgs/pyocd/default.nix +++ b/python/pkgs/pyocd/default.nix @@ -22,7 +22,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyocd"; version = "0.45.1"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyocd"; repo = "pyOCD"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4a9XfdRfd6Co33eCoW6rBA0okS2lvUoQfNwr4KnAjM8="; }; @@ -67,4 +67,4 @@ buildPythonPackage rec { homepage = "https://pyocd.io"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pyodbc/default.nix b/python/pkgs/pyodbc/default.nix index 63c562f36..eeb763f37 100644 --- a/python/pkgs/pyodbc/default.nix +++ b/python/pkgs/pyodbc/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, isPyPy, unixodbc, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyodbc"; version = "5.3.0"; - format = "setuptools"; + pyproject = true; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-L+DgY9j7Zu/QrG3DkjbE3hpF8Xwz6t7Q1VPSHBmfTQU="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ unixodbc # for odbc_config ]; @@ -33,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/pyogrio/default.nix b/python/pkgs/pyogrio/default.nix index e3f394ec6..4c44f16a2 100644 --- a/python/pkgs/pyogrio/default.nix +++ b/python/pkgs/pyogrio/default.nix @@ -18,7 +18,6 @@ buildPythonPackage (finalAttrs: { pname = "pyogrio"; version = "0.13.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "geopandas"; diff --git a/python/pkgs/pyomo/default.nix b/python/pkgs/pyomo/default.nix index 1a1b8442a..469b2b814 100644 --- a/python/pkgs/pyomo/default.nix +++ b/python/pkgs/pyomo/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyomo"; version = "6.10.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "pyomo"; owner = "pyomo"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+LMjvUFGlRsWl8TaGC4ist63Gzwi+xfpeAnNY8Fws/M="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "pyomo"; }; -} +}) diff --git a/python/pkgs/pyopenssl/default.nix b/python/pkgs/pyopenssl/default.nix index 885baf62e..68e72a09a 100644 --- a/python/pkgs/pyopenssl/default.nix +++ b/python/pkgs/pyopenssl/default.nix @@ -11,7 +11,7 @@ sphinx-rtd-theme, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyopenssl"; version = "26.3.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyca"; repo = "pyopenssl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ASpF7CcakrPS4qg8XFGYgYb7Etjg7wcVyMBbtAZaKO0="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyca/pyopenssl"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pyotp/default.nix b/python/pkgs/pyotp/default.nix index afa7bdc9e..7819a03aa 100644 --- a/python/pkgs/pyotp/default.nix +++ b/python/pkgs/pyotp/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyotp"; version = "2.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NGtmQuDb3eO0/1qTC2ZMqCq/oRY1btSMxCx9ZZDTb2M="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Python One Time Password Library"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyowm/default.nix b/python/pkgs/pyowm/default.nix index 267ad7b05..88614aadd 100644 --- a/python/pkgs/pyowm/default.nix +++ b/python/pkgs/pyowm/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyowm"; version = "3.5.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "csparpa"; repo = "pyowm"; - tag = version; + tag = finalAttrs.version; hash = "sha256-D1Cl3uWoEIUqA0R+bjRL2YgsVKj5inuBAVLJYluADg0="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://pyowm.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyparsing/default.nix b/python/pkgs/pyparsing/default.nix index 997be6004..4a9c1c6e7 100644 --- a/python/pkgs/pyparsing/default.nix +++ b/python/pkgs/pyparsing/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyparsing"; version = "3.3.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyparsing"; repo = "pyparsing"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TlYl57JdMJzpCUkHMLiQuCb24UXoNFFTShfqcgrmZm8="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { ''; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyparted/default.nix b/python/pkgs/pyparted/default.nix index 4437c01b5..55e182f7d 100644 --- a/python/pkgs/pyparted/default.nix +++ b/python/pkgs/pyparted/default.nix @@ -2,24 +2,28 @@ lib, stdenv, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, isPyPy, pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyparted"; version = "3.13.0"; - format = "setuptools"; + pyproject = true; disabled = isPyPy; src = fetchFromGitHub { repo = "pyparted"; owner = "dcantrell"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AiUCCrEbDD0OxrvXs1YN3/1IE7SuVasC2YCirIG58iU="; }; + build-system = [ setuptools ]; + postPatch = '' sed -i -e 's|mke2fs|${pkgs.e2fsprogs}/bin/mke2fs|' tests/baseclass.py sed -i -e ' @@ -37,7 +41,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pkgs.pkg-config ]; - propagatedBuildInputs = [ pkgs.parted ]; + dependencies = [ pkgs.parted ]; meta = { homepage = "https://github.com/dcantrell/pyparted/"; @@ -45,4 +49,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/pypdf/default.nix b/python/pkgs/pypdf/default.nix index dd5e29b4e..0c33f30c8 100644 --- a/python/pkgs/pypdf/default.nix +++ b/python/pkgs/pypdf/default.nix @@ -12,7 +12,7 @@ pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pypdf"; version = "6.18.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "py-pdf"; repo = "pypdf"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-If4wdvBABg+ixRaw3oHpisObsmTdbLQlrQEJt+NDrI0="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/py-pdf/pypdf"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pypdf2/default.nix b/python/pkgs/pypdf2/default.nix index 09962ed5e..4eb5c9d39 100644 --- a/python/pkgs/pypdf2/default.nix +++ b/python/pkgs/pypdf2/default.nix @@ -5,21 +5,19 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pypdf2"; version = "3.0.1"; pyproject = true; src = fetchPypi { pname = "PyPDF2"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-p0QI9pumJx9xuTUu9O0D3FOjGqQE0ptdMfU7/s/uFEA="; }; build-system = [ flit-core ]; - doCheck = false; - pythonImportsCheck = [ "PyPDF2" ]; meta = { @@ -27,4 +25,4 @@ buildPythonPackage rec { homepage = "https://pypdf2.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pypdfium2/default.nix b/python/pkgs/pypdfium2/default.nix index 20cf83f6e..8133c3428 100644 --- a/python/pkgs/pypdfium2/default.nix +++ b/python/pkgs/pypdfium2/default.nix @@ -13,9 +13,9 @@ let # They demand their own fork of ctypesgen - ctypesgen = buildPythonPackage rec { + ctypesgen = buildPythonPackage (finalAttrs: { pname = "ctypesgen"; - version = "1.1.1+g${src.rev}"; # the most recent tag + git version + version = "1.1.1+g${finalAttrs.src.rev}"; # the most recent tag + git version pyproject = true; src = fetchFromGitHub { @@ -28,10 +28,10 @@ let build-system = [ setuptools-scm ]; - }; + }); in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pypdfium2"; version = "5.13.0"; pyproject = true; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pypdfium2-team"; repo = "pypdfium2"; - tag = version; + tag = finalAttrs.version; hash = "sha256-DbCbJUvYzjWIlGJyrUbJfzebHrPpRFEx60DYqs1UrkQ="; }; @@ -52,7 +52,7 @@ buildPythonPackage rec { removeReferencesTo ]; - propagatedBuildInputs = [ + dependencies = [ pdfium-binaries ]; @@ -93,4 +93,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/pypeg2/default.nix b/python/pkgs/pypeg2/default.nix index ef5b59a77..e2890b2d6 100644 --- a/python/pkgs/pypeg2/default.nix +++ b/python/pkgs/pypeg2/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pypeg2"; version = "2.15.2"; pyproject = true; src = fetchPypi { pname = "pyPEG2"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Ky1PgNjhqTcLKpH0ol9Kv39puFyNqEzSPsNkUZWKH20="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "http://fdik.org/pyPEG"; license = lib.licenses.gpl2; }; -} +}) diff --git a/python/pkgs/pyperclip/default.nix b/python/pkgs/pyperclip/default.nix index 91e7eb789..51b8d6095 100644 --- a/python/pkgs/pyperclip/default.nix +++ b/python/pkgs/pyperclip/default.nix @@ -5,20 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "1.11.0"; pname = "pyperclip"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JEA1lj5EKFMNnjphAaHvlyCcaCXtqxVnvqwUjMwdsbY="; }; build-system = [ setuptools ]; # https://github.com/asweigart/pyperclip/issues/263 - doCheck = false; pythonImportsCheck = [ "pyperclip" ]; @@ -27,4 +26,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; description = "Cross-platform clipboard module"; }; -} +}) diff --git a/python/pkgs/pyperf/default.nix b/python/pkgs/pyperf/default.nix index f9bcae51b..ee20bc182 100644 --- a/python/pkgs/pyperf/default.nix +++ b/python/pkgs/pyperf/default.nix @@ -6,13 +6,13 @@ psutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyperf"; version = "2.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3ZPM/aeSFHJSk+lfH6bgDLSmStzxMmA5SG1OH5HKqmI="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://pyperf.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyphen/default.nix b/python/pkgs/pyphen/default.nix index f8d2ee917..604cb8a2b 100644 --- a/python/pkgs/pyphen/default.nix +++ b/python/pkgs/pyphen/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyphen"; version = "0.18.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-265vu+TwHLIGEItDVz2FfGcQe+nQ446xsI1voiEGNKc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/Kozea/Pyphen"; license = lib.licenses.lgpl21; }; -} +}) diff --git a/python/pkgs/pypiserver/default.nix b/python/pkgs/pypiserver/default.nix index 712d712f8..ab2716c29 100644 --- a/python/pkgs/pypiserver/default.nix +++ b/python/pkgs/pypiserver/default.nix @@ -13,7 +13,7 @@ importlib-resources, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pypiserver"; version = "2.4.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pypiserver"; repo = "pypiserver"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nqoAT3g32srJ0c3sGNFQBznLsnymDPUfL7kcON+BP0k="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { ]; mainProgram = "pypi-server"; }; -} +}) diff --git a/python/pkgs/pypng/default.nix b/python/pkgs/pypng/default.nix index 5582ee287..ed3972844 100644 --- a/python/pkgs/pypng/default.nix +++ b/python/pkgs/pypng/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pypng"; version = "0.20220715.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-c5xDO6lvB4MV3lTA25da7lN8vD4dCuTtmqsMoeQn4sE="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Pure Python library for PNG image encoding/decoding"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyppeteer/default.nix b/python/pkgs/pyppeteer/default.nix index d80b71e7b..91e2b6b38 100644 --- a/python/pkgs/pyppeteer/default.nix +++ b/python/pkgs/pyppeteer/default.nix @@ -12,7 +12,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyppeteer"; version = "2.0.0"; pyproject = true; @@ -20,13 +20,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyppeteer"; repo = "pyppeteer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LYyV4Wzz4faewSsGjNe0i/9BLbCHzzEns2ZL2MYkGWw="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ appdirs certifi importlib-metadata @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyppeteer/pyppeteer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyppmd/default.nix b/python/pkgs/pyppmd/default.nix index 7dc9a6f10..a430a2595 100644 --- a/python/pkgs/pyppmd/default.nix +++ b/python/pkgs/pyppmd/default.nix @@ -9,7 +9,7 @@ pytest-timeout, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyppmd"; version = "1.1.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromCodeberg { owner = "miurahr"; repo = "pyppmd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0t1vyVMtmhb38C2teJ/Lq7dx4usm4Bzx+k7Zalf/nXE="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://codeberg.org/miurahr/pyppmd"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/pyprind/default.nix b/python/pkgs/pyprind/default.nix index 7ac2f89cb..6a470d035 100644 --- a/python/pkgs/pyprind/default.nix +++ b/python/pkgs/pyprind/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyprind"; version = "2.11.3"; pyproject = true; src = fetchPypi { pname = "PyPrind"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-433KtuGpyOCn8PzmX956eeLe2hx1qgFZEKSeITe1TL8="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/rasbt/pyprind"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyprof2calltree/default.nix b/python/pkgs/pyprof2calltree/default.nix index f6ea85d2a..cc45490ca 100644 --- a/python/pkgs/pyprof2calltree/default.nix +++ b/python/pkgs/pyprof2calltree/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyprof2calltree"; version = "1.4.5"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pwaller"; repo = "pyprof2calltree"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PrIYpvcoD+zVIoOdcON41JmqzpA5FyRKhI7rqDV8cSo="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/pwaller/pyprof2calltree"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyproj/default.nix b/python/pkgs/pyproj/default.nix index 392fb7009..55f5f69dc 100644 --- a/python/pkgs/pyproj/default.nix +++ b/python/pkgs/pyproj/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyproj"; version = "3.8.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyproj4"; repo = "pyproj"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+2wUMbswg2yltNMLPc9U8MbEFx2xKVWxGjP/TBfCjto="; }; @@ -61,4 +61,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyproj4/pyproj"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyproject-api/default.nix b/python/pkgs/pyproject-api/default.nix index 3d6fdda1f..e65feaf58 100644 --- a/python/pkgs/pyproject-api/default.nix +++ b/python/pkgs/pyproject-api/default.nix @@ -11,14 +11,14 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyproject-api"; version = "1.11.0"; pyproject = true; src = fetchPypi { pname = "pyproject_api"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-uIB9haKT5snxM+ZXWUb+1F8dQrItWMeAszqiQhp5lUk="; }; @@ -29,8 +29,6 @@ buildPythonPackage rec { dependencies = [ packaging ]; - doCheck = false; - pythonImportsCheck = [ "pyproject_api" ]; meta = { @@ -38,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/tox-dev/pyproject-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyproject-hooks/default.nix b/python/pkgs/pyproject-hooks/default.nix index 7ac15f365..c2e32df39 100644 --- a/python/pkgs/pyproject-hooks/default.nix +++ b/python/pkgs/pyproject-hooks/default.nix @@ -6,14 +6,14 @@ pyproject-hooks, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyproject-hooks"; version = "1.2.0"; pyproject = true; src = fetchPypi { pname = "pyproject_hooks"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-HoWb1cQPrpRIZC3Yca30WeXiCEGG6NLCp5qCTJcNofg="; }; @@ -21,7 +21,6 @@ buildPythonPackage rec { # We need to disable tests because this package is part of the bootstrap chain # and its test dependencies cannot be built yet when this is being built. - doCheck = false; pythonImportsCheck = [ "pyproject_hooks" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/pyproject-hooks"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyproject-metadata/default.nix b/python/pkgs/pyproject-metadata/default.nix index 62c2f55ef..01ba7bdb9 100644 --- a/python/pkgs/pyproject-metadata/default.nix +++ b/python/pkgs/pyproject-metadata/default.nix @@ -6,14 +6,14 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyproject-metadata"; version = "0.12.1"; pyproject = true; src = fetchPypi { pname = "pyproject_metadata"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-iAmk32/ggnmzmoiQZpUG7TFY4GF4Vaya/wmPy+dyrkw="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/FFY00/python-pyproject-metadata"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyproject-parser/default.nix b/python/pkgs/pyproject-parser/default.nix index ded87e97f..fec47e5d5 100644 --- a/python/pkgs/pyproject-parser/default.nix +++ b/python/pkgs/pyproject-parser/default.nix @@ -19,14 +19,14 @@ shippinglabel, typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyproject-parser"; version = "0.14.0"; pyproject = true; src = fetchPypi { pname = "pyproject_parser"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-QEe9miURXkABmeZyzZ2Pi6QF2BSNZadsvzr7z3fpZuI="; }; @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; optional-dependencies = { - all = lib.concatAttrValues (lib.removeAttrs optional-dependencies [ "all" ]); + all = lib.concatAttrValues (lib.removeAttrs finalAttrs.optional-dependencies [ "all" ]); cli = [ click consolekit @@ -66,4 +66,4 @@ buildPythonPackage rec { homepage = "https://github.com/repo-helper/pyproject-parser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pypubsub/default.nix b/python/pkgs/pypubsub/default.nix index 7944ff85f..cb9e492d4 100644 --- a/python/pkgs/pypubsub/default.nix +++ b/python/pkgs/pypubsub/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pypubsub"; version = "4.0.3"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "schollii"; repo = "pypubsub"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-i+7IR5s7A+kBApQ9OLCL8scnuQ+mRDRn361+jgQnRwo="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/schollii/pypubsub"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/pypugjs/default.nix b/python/pkgs/pypugjs/default.nix index 5af576341..92966b21c 100644 --- a/python/pkgs/pypugjs/default.nix +++ b/python/pkgs/pypugjs/default.nix @@ -7,7 +7,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pypugjs"; version = "7.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kakulukia"; repo = "pypugjs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-L4vE0INrSsjtMQ2Psx2YUDdfMoetGd1rFgmeP5bSUVo="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/kakulukia/pypugjs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pypykatz/default.nix b/python/pkgs/pypykatz/default.nix index a5f486591..14e183363 100644 --- a/python/pkgs/pypykatz/default.nix +++ b/python/pkgs/pypykatz/default.nix @@ -12,13 +12,13 @@ winsspi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pypykatz"; version = "0.6.13"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+T1E/Dk4OcXa8vBhspuB/8V23TORsXXetZpylW25SJM="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "pypykatz"; }; -} +}) diff --git a/python/pkgs/pyqrcode/default.nix b/python/pkgs/pyqrcode/default.nix index 64d0656fe..9d48992b9 100644 --- a/python/pkgs/pyqrcode/default.nix +++ b/python/pkgs/pyqrcode/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyqrcode"; version = "1.2.1"; pyproject = true; src = fetchPypi { pname = "PyQRCode"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-/b92NHM+VrcuJ/m85G5FULdaOixCBBQDXK6dnSayNNU="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/mnooner256/pyqrcode"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyqt-builder/default.nix b/python/pkgs/pyqt-builder/default.nix index 341c64718..8cf2881f1 100644 --- a/python/pkgs/pyqt-builder/default.nix +++ b/python/pkgs/pyqt-builder/default.nix @@ -8,14 +8,14 @@ sip, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyqt-builder"; version = "1.19.1"; pyproject = true; src = fetchPypi { pname = "pyqt_builder"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-avZka6KWaHUbA5v9ztUWQstRDjAHlrWKTWi3+VagJNg="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Python-PyQt/PyQt-builder"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/pyquaternion/default.nix b/python/pkgs/pyquaternion/default.nix index b8951c346..628d7fe86 100644 --- a/python/pkgs/pyquaternion/default.nix +++ b/python/pkgs/pyquaternion/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyquaternion"; version = "0.9.9"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KieranWynn"; repo = "pyquaternion"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-L0wT9DFUDRcmmN7OpmIDNvtQWQrM7iFnZt6R2xrJ+3A="; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { # The VERSION.txt file is required for setup.py # See: https://github.com/KieranWynn/pyquaternion/blob/master/setup.py#L14-L15 postPatch = '' - echo "${version}" > VERSION.txt + echo "${finalAttrs.version}" > VERSION.txt ''; build-system = [ setuptools ]; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "http://kieranwynn.github.io/pyquaternion/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyquery/default.nix b/python/pkgs/pyquery/default.nix index f7c7644e4..633c5c859 100644 --- a/python/pkgs/pyquery/default.nix +++ b/python/pkgs/pyquery/default.nix @@ -7,13 +7,13 @@ lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyquery"; version = "2.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dSODiHUPxuJUt6UvdxAnub6zpiAriASL71KgCwq+rbs="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/gawel/pyquery"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyramid-chameleon/default.nix b/python/pkgs/pyramid-chameleon/default.nix index cdd717f56..3ae791e23 100644 --- a/python/pkgs/pyramid-chameleon/default.nix +++ b/python/pkgs/pyramid-chameleon/default.nix @@ -9,17 +9,19 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyramid-chameleon"; version = "0.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "pyramid_chameleon"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-0XZ5KlDrAV14ZbRL2bJKe9BIn6mlzrvRe54FBIzvkBc="; }; + build-system = [ setuptools ]; + patches = [ # https://github.com/Pylons/pyramid_chameleon/pull/25 ./test-renderers-pyramid-import.patch @@ -31,7 +33,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + dependencies = [ chameleon pyramid setuptools @@ -45,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/Pylons/pyramid_chameleon"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/pyramid-mako/default.nix b/python/pkgs/pyramid-mako/default.nix index dd34d516c..b3d3272a1 100644 --- a/python/pkgs/pyramid-mako/default.nix +++ b/python/pkgs/pyramid-mako/default.nix @@ -3,21 +3,25 @@ buildPythonPackage, fetchPypi, fetchpatch, + # build-system + setuptools, webtest, pyramid, mako, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyramid-mako"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0066c863441f1c3ddea60cee1ccc50d00a91a317a8052ca44131da1a12a840e2"; }; + build-system = [ setuptools ]; + patches = [ # Fix tests with pyramid >= 2.0 # https://github.com/Pylons/pyramid_mako/pull/54 @@ -28,7 +32,7 @@ buildPythonPackage rec { ]; buildInputs = [ webtest ]; - propagatedBuildInputs = [ + dependencies = [ pyramid mako ]; @@ -38,4 +42,4 @@ buildPythonPackage rec { description = "Mako template bindings for the Pyramid web framework"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/pyrate-limiter/default.nix b/python/pkgs/pyrate-limiter/default.nix index 1c3243567..ebc169969 100644 --- a/python/pkgs/pyrate-limiter/default.nix +++ b/python/pkgs/pyrate-limiter/default.nix @@ -14,7 +14,7 @@ redis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyrate-limiter"; version = "4.5.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vutran1710"; repo = "PyrateLimiter"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UUNXb4lCcZZ+BPO1t8rStuDTj69dnIMMv6wdlNH+gcI="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/vutran1710/PyrateLimiter"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyrdfa3/default.nix b/python/pkgs/pyrdfa3/default.nix index a70c651c4..0ce7e0ccc 100644 --- a/python/pkgs/pyrdfa3/default.nix +++ b/python/pkgs/pyrdfa3/default.nix @@ -8,13 +8,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyrdfa3"; version = "3.6.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-D8KP8UJq+AWxAK/3Fi22pD+iFeN/krzpsRO0Zf61Y+o="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/prrvchr/pyrdfa3/"; license = lib.licenses.w3c; }; -} +}) diff --git a/python/pkgs/pyrect/default.nix b/python/pkgs/pyrect/default.nix index 17ebb0b8a..a91315bd3 100644 --- a/python/pkgs/pyrect/default.nix +++ b/python/pkgs/pyrect/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyrect"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "PyRect"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-9lFV9t+bkptnyv+9V8CUfFrlRJ07WA0XgHS/+0egm3g="; }; + + build-system = [ setuptools ]; pythonImportsCheck = [ "pyrect" ]; meta = { @@ -21,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/asweigart/pyrect"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyrfc3339/default.nix b/python/pkgs/pyrfc3339/default.nix index 59ce21334..b75b76495 100644 --- a/python/pkgs/pyrfc3339/default.nix +++ b/python/pkgs/pyrfc3339/default.nix @@ -7,13 +7,13 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyrfc3339"; version = "2.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xWmpcU+vEVzbILUegw55jB9N6Nq7B/b/JdIhtdCdjX8="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { description = "Generate and parse RFC 3339 timestamps"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyric/default.nix b/python/pkgs/pyric/default.nix index 0826b17de..b112601d8 100644 --- a/python/pkgs/pyric/default.nix +++ b/python/pkgs/pyric/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyric"; version = "0.1.6.3"; pyproject = true; src = fetchPypi { pname = "PyRIC"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-tTmwHK/r0kBsAAl/lFJeoPjs0d2S93MfQ+rA7xbCzMk="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/wraith-wireless/PyRIC"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/pyro-api/default.nix b/python/pkgs/pyro-api/default.nix index 742532766..efbea74cd 100644 --- a/python/pkgs/pyro-api/default.nix +++ b/python/pkgs/pyro-api/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyro-api"; version = "0.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-obkA2VgKocL6s7Ejq3/zNBN0TafF9EC9Sq3E1A0U2SA="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "http://pyro.ai"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyroaring/default.nix b/python/pkgs/pyroaring/default.nix index 3db30e92a..d7d1088aa 100644 --- a/python/pkgs/pyroaring/default.nix +++ b/python/pkgs/pyroaring/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyroaring"; version = "1.1.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Ezibenroc"; repo = "PyRoaringBitMap"; - tag = version; + tag = finalAttrs.version; hash = "sha256-hCllqGcyPRVC7Bh4gvXv0NYRCD7Hqh0OMB6Ab3miA6o="; }; @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "Python library for handling efficiently sorted integer sets"; homepage = "https://github.com/Ezibenroc/PyRoaringBitMap"; - changelog = "https://github.com/Ezibenroc/PyRoaringBitMap/releases/tag/${version}"; + changelog = "https://github.com/Ezibenroc/PyRoaringBitMap/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyrsistent/default.nix b/python/pkgs/pyrsistent/default.nix index 22789a5ca..696eae159 100644 --- a/python/pkgs/pyrsistent/default.nix +++ b/python/pkgs/pyrsistent/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyrsistent"; version = "0.20.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-TEj3j2KrWWxnkIYITQ3RMlSuTz1scqg//fXr3vjyZaQ="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "pyrsistent" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { description = "Persistent/Functional/Immutable data structures"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyrss2gen/default.nix b/python/pkgs/pyrss2gen/default.nix index 7d0ccd9ac..5c96a9695 100644 --- a/python/pkgs/pyrss2gen/default.nix +++ b/python/pkgs/pyrss2gen/default.nix @@ -5,25 +5,24 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyrss2gen"; version = "1.1"; pyproject = true; src = fetchPypi { pname = "PyRSS2Gen"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-eWCu1+mY0kgr9YcWwxZQl4b1lkJvh5sF+NhOmLgsbuc="; }; build-system = [ setuptools ]; # No tests in archive - doCheck = false; meta = { description = "Library for generating RSS 2.0 feeds"; homepage = "http://www.dalkescientific.com/Python/PyRSS2Gen.html"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/pysaml2/default.nix b/python/pkgs/pysaml2/default.nix index d2930d39f..5de25eaa1 100644 --- a/python/pkgs/pysaml2/default.nix +++ b/python/pkgs/pysaml2/default.nix @@ -11,13 +11,13 @@ xmlschema, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysaml2"; version = "7.5.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uCfcqrc8T3/gAclFQB60Qs/aXSIAHOpQwgwTjpre/+o="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/IdentityPython/pysaml2"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pysbd/default.nix b/python/pkgs/pysbd/default.nix index fb5d87c84..c5b716bd9 100644 --- a/python/pkgs/pysbd/default.nix +++ b/python/pkgs/pysbd/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, tqdm, spacy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysbd"; version = "0.3.4"; - format = "setuptools"; + pyproject = true; # provides no sdist on pypi src = fetchFromGitHub { owner = "nipunsadvilkar"; repo = "pySBD"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "12p7qm237z56hw4zr03n8rycgfymhki2m9c4w3ib0mvqq122a5dp"; }; - doCheck = false; # requires pyconll and blingfire + + build-system = [ setuptools ]; pythonImportsCheck = [ "pysbd" ]; @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/nipunsadvilkar/pySBD"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyscaffold/default.nix b/python/pkgs/pyscaffold/default.nix index 46d1354d4..96e76dbbf 100644 --- a/python/pkgs/pyscaffold/default.nix +++ b/python/pkgs/pyscaffold/default.nix @@ -30,13 +30,13 @@ tox, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyscaffold"; version = "4.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QIW43pIAufMZ32+Op5lyiPFZqOSyhLBi2bKk1qnBI0w="; }; @@ -50,7 +50,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "platformdirs>=2,<4" "platformdirs" ''; - propagatedBuildInputs = [ + dependencies = [ colorama configupdater importlib-metadata @@ -101,4 +101,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/PyScaffold/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyscaffoldext-cookiecutter/default.nix b/python/pkgs/pyscaffoldext-cookiecutter/default.nix index 91aecf983..2209bc3f4 100644 --- a/python/pkgs/pyscaffoldext-cookiecutter/default.nix +++ b/python/pkgs/pyscaffoldext-cookiecutter/default.nix @@ -17,13 +17,13 @@ virtualenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyscaffoldext-cookiecutter"; version = "0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-H++p/kPASs3IWk39fCXzq20QmMPGkG0bDTnVAm773cU="; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ + dependencies = [ cookiecutter importlib-metadata pyscaffold @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/pyscaffoldext-cookiecutter/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyscaffoldext-custom-extension/default.nix b/python/pkgs/pyscaffoldext-custom-extension/default.nix index 830c26763..d25478d62 100644 --- a/python/pkgs/pyscaffoldext-custom-extension/default.nix +++ b/python/pkgs/pyscaffoldext-custom-extension/default.nix @@ -17,13 +17,13 @@ virtualenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyscaffoldext-custom-extension"; version = "0.6.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xHtKNqLSCTlbbXubADfLYjD3/53WfM65rRuh9RsyeN4="; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ + dependencies = [ configupdater importlib-metadata packaging @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/pyscaffoldext-custom-extension/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyscaffoldext-django/default.nix b/python/pkgs/pyscaffoldext-django/default.nix index 9ec0d0fca..50c3f5e78 100644 --- a/python/pkgs/pyscaffoldext-django/default.nix +++ b/python/pkgs/pyscaffoldext-django/default.nix @@ -12,13 +12,13 @@ pyscaffold, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyscaffoldext-django"; version = "0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5yzF3VK/9VlCSrRsRJWX4arr9n34G2R6O5A51jTpLhg="; }; @@ -34,8 +34,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "django" ]; - doCheck = false; # tests require git checkout - pythonImportsCheck = [ "pyscaffoldext.django" ]; meta = { @@ -43,4 +41,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/pyscaffoldext-django/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyscaffoldext-dsproject/default.nix b/python/pkgs/pyscaffoldext-dsproject/default.nix index c7e93878b..a5956a743 100644 --- a/python/pkgs/pyscaffoldext-dsproject/default.nix +++ b/python/pkgs/pyscaffoldext-dsproject/default.nix @@ -17,13 +17,13 @@ virtualenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyscaffoldext-dsproject"; version = "0.7.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SF99noD6C31p4LWlwVAwArPYeNspF+ARK8Dzl5B1T9g="; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ + dependencies = [ importlib-metadata pyscaffold pyscaffoldext-markdown @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/pyscaffoldext-dsproject/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyscaffoldext-markdown/default.nix b/python/pkgs/pyscaffoldext-markdown/default.nix index d07070015..b92e06d21 100644 --- a/python/pkgs/pyscaffoldext-markdown/default.nix +++ b/python/pkgs/pyscaffoldext-markdown/default.nix @@ -18,13 +18,13 @@ virtualenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyscaffoldext-markdown"; version = "0.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fycTscq9rjUNFidWyeoH4QwedthdCdqqjXDO9DC4tds="; }; @@ -34,7 +34,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ + dependencies = [ importlib-metadata myst-parser pyscaffold @@ -62,4 +62,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/pyscaffoldext-markdown/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyscaffoldext-travis/default.nix b/python/pkgs/pyscaffoldext-travis/default.nix index d22c36351..6f8bb793b 100644 --- a/python/pkgs/pyscaffoldext-travis/default.nix +++ b/python/pkgs/pyscaffoldext-travis/default.nix @@ -16,13 +16,13 @@ virtualenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyscaffoldext-travis"; version = "0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ztAhA/2ctCHz5kggOAaXd3ed903ClTlhCfaGTl344zI="; }; @@ -32,7 +32,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ + dependencies = [ importlib-metadata pyscaffold ]; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/pyscaffoldext-travis/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyscard/default.nix b/python/pkgs/pyscard/default.nix index 1da0eebaf..c5eb57935 100644 --- a/python/pkgs/pyscard/default.nix +++ b/python/pkgs/pyscard/default.nix @@ -9,7 +9,7 @@ swig, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyscard"; version = "2.3.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LudovicRousseau"; repo = "pyscard"; - tag = version; + tag = finalAttrs.version; hash = "sha256-MW/Cg7Ta/LdY/pOomsEecVIt62rc5qSAGjpJl4m+ruM="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://pyscard.sourceforge.io/"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/pyscreeze/default.nix b/python/pkgs/pyscreeze/default.nix index 65dc9617d..408031751 100644 --- a/python/pkgs/pyscreeze/default.nix +++ b/python/pkgs/pyscreeze/default.nix @@ -3,11 +3,13 @@ stdenv, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: buildPythonPackage { pname = "pyscreeze"; version = "0.1.26"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "asweigart"; @@ -16,6 +18,8 @@ buildPythonPackage { hash = "sha256-gn3ydjf/msdhIhngGlhK+jhEyFy0qGeDr58E7kM2YZs="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "pyscreeze" ]; doCheck = stdenv.hostPlatform.isLinux; meta = { diff --git a/python/pkgs/pyscrypt/default.nix b/python/pkgs/pyscrypt/default.nix index 70b09ff54..f43ff4717 100644 --- a/python/pkgs/pyscrypt/default.nix +++ b/python/pkgs/pyscrypt/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyscrypt"; version = "1.6.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1sd5pd5fpcdnpp4h58kdnvkf0s3afh4ssfqky2ap6z0gy6ax3zds"; }; + build-system = [ setuptools ]; + meta = { homepage = "https://github.com/ricmoo/pyscrypt/"; description = "Pure-Python implementation of Scrypt PBKDF and scrypt file format library"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyscss/default.nix b/python/pkgs/pyscss/default.nix index 3f28e58f6..5301727b7 100644 --- a/python/pkgs/pyscss/default.nix +++ b/python/pkgs/pyscss/default.nix @@ -6,7 +6,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyscss"; version = "1.4.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "pyScss"; owner = "Kronuz"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-z0y4z+/JE6rZWHAvps/taDZvutyVhxxs2gMujV5rNu4="; }; @@ -24,11 +24,10 @@ buildPythonPackage rec { # Test suite is broken. # See https://github.com/Kronuz/pyScss/issues/415 - doCheck = false; meta = { description = "Scss compiler for Python"; homepage = "https://pyscss.readthedocs.org/en/latest/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pysendfile/default.nix b/python/pkgs/pysendfile/default.nix index 46fd911f2..70e373519 100644 --- a/python/pkgs/pysendfile/default.nix +++ b/python/pkgs/pysendfile/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysendfile"; version = "2.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-UQpBSycJhvujx5y3bZCkyRDHAb+0P/mDpdTpKEYFDhc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/giampaolo/pysendfile"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pysequoia/default.nix b/python/pkgs/pysequoia/default.nix index d3d3ea371..1c3211a64 100644 --- a/python/pkgs/pysequoia/default.nix +++ b/python/pkgs/pysequoia/default.nix @@ -6,18 +6,18 @@ cargo, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysequoia"; version = "0.1.34"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-pUJ+fMaV1NlcpOzcBqCdeYCe/XYd1Y9XdwKa1hBbU8k="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-qEn8+CySPwAV0zqbF4ooGsaXil7g6QJew7M+fbKsRqQ="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/wiktor-k/pysequoia"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pyserial-asyncio/default.nix b/python/pkgs/pyserial-asyncio/default.nix index d4374bdd9..e4d2f7f2b 100644 --- a/python/pkgs/pyserial-asyncio/default.nix +++ b/python/pkgs/pyserial-asyncio/default.nix @@ -6,13 +6,13 @@ pyserial, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyserial-asyncio"; version = "0.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tgMpI+BenXXsF6WvmphCnEbSg5rfr4BgTVLg+qzXoy8="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/pyserial/pyserial-asyncio"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyserial/default.nix b/python/pkgs/pyserial/default.nix index 5547339c8..990c78c73 100644 --- a/python/pkgs/pyserial/default.nix +++ b/python/pkgs/pyserial/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyserial"; version = "3.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PHfgFBcN//vYFub/wgXphC77EL6fWOwW0+hnW0klzds="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Python serial port extension"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pysftp/default.nix b/python/pkgs/pysftp/default.nix index 565abb80f..393bff03f 100644 --- a/python/pkgs/pysftp/default.nix +++ b/python/pkgs/pysftp/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, isPyPy, paramiko, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysftp"; version = "0.2.9"; - format = "setuptools"; + pyproject = true; disabled = isPyPy; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0jl5qix5cxzrv4lb8rfpjkpcghbkacnxkb006ikn7mkl5s05mxgv"; }; - propagatedBuildInputs = [ paramiko ]; + build-system = [ setuptools ]; + + dependencies = [ paramiko ]; meta = { homepage = "https://bitbucket.org/dundeemt/pysftp"; @@ -29,4 +33,4 @@ buildPythonPackage rec { Book, in the docs, to see what pysftp can do for you. ''; }; -} +}) diff --git a/python/pkgs/pyshp/default.nix b/python/pkgs/pyshp/default.nix index 17e99f066..2934b61a2 100644 --- a/python/pkgs/pyshp/default.nix +++ b/python/pkgs/pyshp/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyshp"; version = "3.1.6"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GeospatialPython"; repo = "pyshp"; - tag = version; + tag = finalAttrs.version; hash = "sha256-N4+GkxMtfa+EoZaGuun3ZhYMb3QHP2enMdq5MSw7M9g="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/GeospatialPython/pyshp"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pysimplesoap/default.nix b/python/pkgs/pysimplesoap/default.nix index 8e8851958..78e9d0d07 100644 --- a/python/pkgs/pysimplesoap/default.nix +++ b/python/pkgs/pysimplesoap/default.nix @@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; - propagatedBuildInputs = [ m2crypto ]; + dependencies = [ m2crypto ]; # Patches necessary for Python 3 compatibility plus bugfixes patches = diff --git a/python/pkgs/pysmartdl/default.nix b/python/pkgs/pysmartdl/default.nix index 1e5a91215..9b0d06a20 100644 --- a/python/pkgs/pysmartdl/default.nix +++ b/python/pkgs/pysmartdl/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysmartdl"; version = "1.3.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iTaybb"; repo = "pySmartDL"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Etyv3xCB1cGozWDsskygwcTHJfC+V5hvqBNQAF8SIMM="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "Smart Download Manager for Python"; license = lib.licenses.unlicense; }; -} +}) diff --git a/python/pkgs/pysmb/default.nix b/python/pkgs/pysmb/default.nix index 6142ae49b..e2ebed940 100644 --- a/python/pkgs/pysmb/default.nix +++ b/python/pkgs/pysmb/default.nix @@ -7,7 +7,7 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysmb"; version = "1.2.15"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miketeo"; repo = "pysmb"; - tag = "pysmb-${version}"; + tag = "pysmb-${finalAttrs.version}"; hash = "sha256-Unc5CfLOyaoy25x7vhe3wqO2+bocvCbu3yrDwX3K06U="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { # Tests require Network Connectivity and a server up and running # https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt - doCheck = false; pythonImportsCheck = [ "nmb" @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://pysmb.readthedocs.io/"; license = lib.licenses.zlib; }; -} +}) diff --git a/python/pkgs/pysmbc/default.nix b/python/pkgs/pysmbc/default.nix index dde029768..c9822fe47 100644 --- a/python/pkgs/pysmbc/default.nix +++ b/python/pkgs/pysmbc/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pkg-config, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysmbc"; version = "1.0.25.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IvFxXfglif2cxCU/6rOQtO8Lq/FPZFE82NB7N4mWMiY="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ pkg-config ]; pythonImportsCheck = [ "smbc" ]; @@ -24,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/hamano/pysmbc"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/pysmt/default.nix b/python/pkgs/pysmt/default.nix index f6aa54df3..323d121dc 100644 --- a/python/pkgs/pysmt/default.nix +++ b/python/pkgs/pysmt/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysmt"; version = "0.9.6"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pysmt"; repo = "pysmt"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HmEdCJOF04h0z5UPpfYa07b78EEBj5KyVAk6aNRFPEo="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/pysmt/pysmt"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pysnmpcrypto/default.nix b/python/pkgs/pysnmpcrypto/default.nix index 9aa6cd710..90db23ae8 100644 --- a/python/pkgs/pysnmpcrypto/default.nix +++ b/python/pkgs/pysnmpcrypto/default.nix @@ -9,7 +9,7 @@ pycryptodomex, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysnmpcrypto"; version = "0.1.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lextudio"; repo = "pysnmpcrypto"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gNRD8mSWVVLXwJjb3nT7IKnjTdwTutFDnQybgZTY2b0="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/lextudio/pysnmpcrypto"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/pysocks/default.nix b/python/pkgs/pysocks/default.nix index 079eea6ec..999dbf54c 100644 --- a/python/pkgs/pysocks/default.nix +++ b/python/pkgs/pysocks/default.nix @@ -2,23 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysocks"; version = "1.7.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "PySocks"; - inherit version; + inherit (finalAttrs) version; sha256 = "184sg65mbmih6ljblfsxcmq5js5l7dj3gpn618w9q5dy3rbh921z"; }; - doCheck = false; + build-system = [ setuptools ]; meta = { description = "SOCKS module for Python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pysodium/default.nix b/python/pkgs/pysodium/default.nix index 90e8522f7..b7f31ff88 100644 --- a/python/pkgs/pysodium/default.nix +++ b/python/pkgs/pysodium/default.nix @@ -7,7 +7,7 @@ libsodium, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysodium"; version = "0.7.18"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stef"; repo = "pysodium"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-F2215AAI8UIvn6UbaJ/YxI4ZolCzlwY6nS5IafTs+i4="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/stef/pysodium"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/pysol-cards/default.nix b/python/pkgs/pysol-cards/default.nix index c9040dd6a..f27adf5c2 100644 --- a/python/pkgs/pysol-cards/default.nix +++ b/python/pkgs/pysol-cards/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, six, random2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysol-cards"; version = "0.24.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "pysol_cards"; hash = "sha256-qYVJLagaoViN/AVtmnxsqD9mJUwLkPJa/GgqcHE9TUs="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ six random2 ]; @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/shlomif/pysol_cards"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pysolr/default.nix b/python/pkgs/pysolr/default.nix index 3e6fde87f..707a04368 100644 --- a/python/pkgs/pysolr/default.nix +++ b/python/pkgs/pysolr/default.nix @@ -7,13 +7,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysolr"; version = "3.11.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-u9DnRng1MWiA+ZS1U4bJvDwUZzPBfYWj/tMXdVl2xAo="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/toastdriven/pysolr/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyspark/default.nix b/python/pkgs/pyspark/default.nix index adaee0429..e167eeb61 100644 --- a/python/pkgs/pyspark/default.nix +++ b/python/pkgs/pyspark/default.nix @@ -75,7 +75,6 @@ buildPythonPackage (finalAttrs: { }; # Tests assume running spark instance - doCheck = false; pythonImportsCheck = [ "pyspark" ]; diff --git a/python/pkgs/pyspellchecker/default.nix b/python/pkgs/pyspellchecker/default.nix index a79e6a3ef..0bf7ab9d3 100644 --- a/python/pkgs/pyspellchecker/default.nix +++ b/python/pkgs/pyspellchecker/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyspellchecker"; version = "0.9.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "barrust"; repo = "pyspellchecker"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Ui1IPqvVqf7scMg+B1KmI5jWrHSsuaW6sCoWeiF2oMI="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/barrust/pyspellchecker"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyspf/default.nix b/python/pkgs/pyspf/default.nix index c17113019..b85002a15 100644 --- a/python/pkgs/pyspf/default.nix +++ b/python/pkgs/pyspf/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, py3dns, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyspf"; version = "2.0.14"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "sdgathman"; repo = "pyspf"; - rev = "pyspf-${version}"; + tag = "pyspf-${finalAttrs.version}"; sha256 = "0bmimlmwrq9glnjc4i6pwch30n3y5wyqmkjfyayxqxkfrixqwydi"; }; - propagatedBuildInputs = [ py3dns ]; + build-system = [ setuptools ]; + + dependencies = [ py3dns ]; # requires /etc/resolv.conf to exist meta = { @@ -25,4 +29,4 @@ buildPythonPackage rec { description = "Python API for Sendmail Milters (SPF)"; license = lib.licenses.gpl2; }; -} +}) diff --git a/python/pkgs/pyspnego/default.nix b/python/pkgs/pyspnego/default.nix index 249b95b53..d624b177f 100644 --- a/python/pkgs/pyspnego/default.nix +++ b/python/pkgs/pyspnego/default.nix @@ -6,13 +6,13 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyspnego"; version = "0.12.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RIpJGpvw5fuVdWf+RuaAn6g2qkDfzM68x0C7ZKyxvhw="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/jborean93/pyspnego"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyspx/default.nix b/python/pkgs/pyspx/default.nix index 4b925112c..291eb2d9b 100644 --- a/python/pkgs/pyspx/default.nix +++ b/python/pkgs/pyspx/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyspx"; version = "0.5.2"; pyproject = true; @@ -14,14 +14,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphincs"; repo = "pyspx"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hMZ7JZoo5RdUwQYpGjtZznH/O6rBUXv+svfOAI0cjqs="; fetchSubmodules = true; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail 'version="0.5.0"' 'version="${version}"' + --replace-fail 'version="0.5.0"' 'version="${finalAttrs.version}"' ''; build-system = [ @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphincs/pyspx"; license = lib.licenses.cc0; }; -} +}) diff --git a/python/pkgs/pysrt/default.nix b/python/pkgs/pysrt/default.nix index 3b72a83ae..a96fc01ab 100644 --- a/python/pkgs/pysrt/default.nix +++ b/python/pkgs/pysrt/default.nix @@ -7,7 +7,7 @@ fetchpatch2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysrt"; version = "1.1.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "byroot"; repo = "pysrt"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1f5hxyzlh5mdvvi52qapys9qcinffr6ghgivb6k4jxa92cbs3mfg"; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - propagatedBuildInputs = [ chardet ]; + dependencies = [ chardet ]; meta = { homepage = "https://github.com/byroot/pysrt"; @@ -36,4 +36,4 @@ buildPythonPackage rec { description = "Python library used to edit or create SubRip files"; mainProgram = "srt"; }; -} +}) diff --git a/python/pkgs/pystac/default.nix b/python/pkgs/pystac/default.nix index 11312abb6..e1681dede 100644 --- a/python/pkgs/pystac/default.nix +++ b/python/pkgs/pystac/default.nix @@ -12,7 +12,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pystac"; version = "1.14.3"; pyproject = true; @@ -20,13 +20,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stac-utils"; repo = "pystac"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-O17KG8DRr7KpFpZYsl7zHBKDs5Ad0vigaThBnNP17rs="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ python-dateutil ]; + dependencies = [ python-dateutil ]; pythonImportsCheck = [ "pystac" ]; meta = { @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/stac-utils/pystac"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pystache/default.nix b/python/pkgs/pystache/default.nix index 7ced23f87..56f35ba09 100644 --- a/python/pkgs/pystache/default.nix +++ b/python/pkgs/pystache/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pystache"; version = "0.6.8"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PennyDreadfulMTG"; repo = "pystache"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UVmDpg7wCPnY+1BZqujIYdgt/AT4gZ+RTYdD+ORQhzE="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/PennyDreadfulMTG/pystache"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pystemd/default.nix b/python/pkgs/pystemd/default.nix index 4d0b4543d..a2f0f3355 100644 --- a/python/pkgs/pystemd/default.nix +++ b/python/pkgs/pystemd/default.nix @@ -10,7 +10,7 @@ cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pystemd"; version = "0.15.3"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "systemd"; repo = "pystemd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qFBa2hIcF0hyb+QyVpFG0qOpWsVVVTGCqgfChic6JCI="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/facebookincubator/pystemd"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/pystemmer/default.nix b/python/pkgs/pystemmer/default.nix index 808b48f3e..39696ecb9 100644 --- a/python/pkgs/pystemmer/default.nix +++ b/python/pkgs/pystemmer/default.nix @@ -7,16 +7,16 @@ libstemmer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pystemmer"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; pyproejct = true; src = fetchFromGitHub { owner = "snowballstem"; repo = "pystemmer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-c3ucbneUo5UBfdrd5Ktl4HriVusvWBEA1brrgahEQ9A="; }; @@ -36,8 +36,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "Stemmer" ]; - __structuredAttrs = true; - meta = { description = "Snowball stemming algorithms, for information retrieval"; downloadPage = "https://github.com/snowballstem/pystemmer"; @@ -48,4 +46,4 @@ buildPythonPackage rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/pysubs2/default.nix b/python/pkgs/pysubs2/default.nix index d5d4835da..2688278dd 100644 --- a/python/pkgs/pysubs2/default.nix +++ b/python/pkgs/pysubs2/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysubs2"; version = "1.8.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tkarabela"; repo = "pysubs2"; - rev = version; + tag = finalAttrs.version; hash = "sha256-fKSb7MfBHGft8Tp6excjfkVXKnHRER11X0QxbR1zD4I="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { mainProgram = "pysubs2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pysvn/default.nix b/python/pkgs/pysvn/default.nix index 53c9537cb..c4308f7a2 100644 --- a/python/pkgs/pysvn/default.nix +++ b/python/pkgs/pysvn/default.nix @@ -10,13 +10,13 @@ subversion, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysvn"; version = "1.9.25"; pyproject = false; src = fetchurl { - url = "mirror://sourceforge/project/pysvn/pysvn/V${version}/pysvn-${version}.tar.gz"; + url = "mirror://sourceforge/project/pysvn/pysvn/V${finalAttrs.version}/pysvn-${finalAttrs.version}.tar.gz"; hash = "sha256-M9LzUr/6FZSUWFQdGM6Ew1/ySE5C/Q7cNXi+jGa+JdY="; }; @@ -49,8 +49,8 @@ buildPythonPackage rec { cp pysvn/__init__.py $dest/ cp pysvn/_pysvn*.so $dest/ mkdir -p $out/share/doc - mv -v ../Docs $out/share/doc/pysvn-${version} - rm -v $out/share/doc/pysvn-${version}/generate_cpp_docs_from_html_docs.py + mv -v ../Docs $out/share/doc/pysvn-${finalAttrs.version} + rm -v $out/share/doc/pysvn-${finalAttrs.version}/generate_cpp_docs_from_html_docs.py ''; meta = { @@ -60,4 +60,4 @@ buildPythonPackage rec { # g++: command not found broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/python/pkgs/pytablewriter/default.nix b/python/pkgs/pytablewriter/default.nix index e22bc15d4..001e5ef7c 100644 --- a/python/pkgs/pytablewriter/default.nix +++ b/python/pkgs/pytablewriter/default.nix @@ -20,7 +20,7 @@ xlwt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytablewriter"; version = "1.2.1"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thombashi"; repo = "pytablewriter"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YuuSMKTSG3oybvA6TDWNnGg4EiDAw2tRlM0S9mBQlkc="; }; @@ -82,4 +82,4 @@ buildPythonPackage rec { homepage = "https://github.com/thombashi/pytablewriter"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyte/default.nix b/python/pkgs/pyte/default.nix index cd4d0f96e..8fd45340d 100644 --- a/python/pkgs/pyte/default.nix +++ b/python/pkgs/pyte/default.nix @@ -2,28 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, wcwidth, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyte"; version = "0.8.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "selectel"; repo = "pyte"; - rev = version; + tag = finalAttrs.version; hash = "sha256-u24ltX/LEteiZ2a/ioKqxV2AZgrFmKOHXmySmw21sLE="; }; + build-system = [ setuptools ]; + postPatch = '' # Remove pytest-runner dependency since it is not supported in the NixOS # sandbox sed -i '/pytest-runner/d' setup.py ''; - propagatedBuildInputs = [ wcwidth ]; + dependencies = [ wcwidth ]; pythonImportsCheck = [ "pyte" ]; meta = { @@ -31,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/selectel/pyte"; license = lib.licenses.lgpl3; }; -} +}) diff --git a/python/pkgs/pytest-arraydiff/default.nix b/python/pkgs/pytest-arraydiff/default.nix index 2c5edb015..b18fe6167 100644 --- a/python/pkgs/pytest-arraydiff/default.nix +++ b/python/pkgs/pytest-arraydiff/default.nix @@ -2,26 +2,30 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, numpy, pytest, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-arraydiff"; version = "0.6.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-KTexRQ/JNWIPJHCdh9QMZ+BVoEPXuFQaJf36mU3aZ94="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; # The tests requires astropy, which itself requires pytest-arraydiff @@ -32,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/astrofrog/pytest-arraydiff"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-astropy-header/default.nix b/python/pkgs/pytest-astropy-header/default.nix index e07daa08d..eadf00426 100644 --- a/python/pkgs/pytest-astropy-header/default.nix +++ b/python/pkgs/pytest-astropy-header/default.nix @@ -7,13 +7,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-astropy-header"; version = "0.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "77891101c94b75a8ca305453b879b318ab6001b370df02be2c0b6d1bb322db10"; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://astropy.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-astropy/default.nix b/python/pkgs/pytest-astropy/default.nix index bf498569a..366592655 100644 --- a/python/pkgs/pytest-astropy/default.nix +++ b/python/pkgs/pytest-astropy/default.nix @@ -15,13 +15,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-astropy"; version = "0.11.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Tq6qme2RFj7Y+arBMscKgfJbxMEvPNVNujKfwmxnObU="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/astropy/pytest-astropy"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-asyncio/0.nix b/python/pkgs/pytest-asyncio/0.nix index f6c0f8856..28a2d2489 100644 --- a/python/pkgs/pytest-asyncio/0.nix +++ b/python/pkgs/pytest-asyncio/0.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-asyncio"; version = "0.26.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-asyncio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GEhFwwQCXwtqfSiew/sOvJYV3JREqOGD4fQONlRR/Mw="; }; @@ -35,7 +35,6 @@ buildPythonPackage rec { cp -R tests $testout/tests ''; - doCheck = false; passthru.tests.pytest = callPackage ./tests.nix { }; pythonImportsCheck = [ "pytest_asyncio" ]; @@ -43,7 +42,7 @@ buildPythonPackage rec { meta = { description = "Library for testing asyncio code with pytest"; homepage = "https://github.com/pytest-dev/pytest-asyncio"; - changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/${src.tag}/docs/reference/changelog.rst"; + changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/${finalAttrs.src.tag}/docs/reference/changelog.rst"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pytest-asyncio/default.nix b/python/pkgs/pytest-asyncio/default.nix index d20b108c3..a285f835a 100644 --- a/python/pkgs/pytest-asyncio/default.nix +++ b/python/pkgs/pytest-asyncio/default.nix @@ -9,7 +9,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-asyncio"; version = "1.4.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-asyncio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MuTLCRHCuD9TwJkMiFIC5Xv5Xz6NL8j4JZpW8BA45SI="; }; @@ -41,7 +41,6 @@ buildPythonPackage rec { cp -R tests $testout/tests ''; - doCheck = false; passthru.tests.pytest = callPackage ./tests.nix { }; pythonImportsCheck = [ "pytest_asyncio" ]; @@ -51,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-asyncio"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pytest-asyncio/tests.nix b/python/pkgs/pytest-asyncio/tests.nix index 051f710af..502c2292a 100644 --- a/python/pkgs/pytest-asyncio/tests.nix +++ b/python/pkgs/pytest-asyncio/tests.nix @@ -18,7 +18,7 @@ buildPythonPackage { dontBuild = true; dontInstall = true; - propagatedBuildInputs = [ pytest-asyncio ]; + dependencies = [ pytest-asyncio ]; nativeCheckInputs = [ flaky diff --git a/python/pkgs/pytest-base-url/default.nix b/python/pkgs/pytest-base-url/default.nix index 9abd2e5b0..7cd5decdf 100644 --- a/python/pkgs/pytest-base-url/default.nix +++ b/python/pkgs/pytest-base-url/default.nix @@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: { buildInputs = [ pytest ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; pythonImportsCheck = [ "pytest_base_url" ]; meta = { diff --git a/python/pkgs/pytest-bdd/default.nix b/python/pkgs/pytest-bdd/default.nix index 2d390b85f..40b4e6afa 100644 --- a/python/pkgs/pytest-bdd/default.nix +++ b/python/pkgs/pytest-bdd/default.nix @@ -10,7 +10,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-bdd"; version = "7.1.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-bdd"; - tag = version; + tag = finalAttrs.version; hash = "sha256-PC4VSsUU5qEFp/C/7OTgHINo8wmOo0w2d1Hpe0EnFzE="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "pytest-bdd"; }; -} +}) diff --git a/python/pkgs/pytest-benchmark/default.nix b/python/pkgs/pytest-benchmark/default.nix index b70cc6ab6..de12d48ea 100644 --- a/python/pkgs/pytest-benchmark/default.nix +++ b/python/pkgs/pytest-benchmark/default.nix @@ -7,14 +7,14 @@ py-cpuinfo, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-benchmark"; version = "5.2.3"; pyproject = true; src = fetchPypi { pname = "pytest_benchmark"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-3rcxeZiiPGUP1P924SMAZqdstF3OzgrKVgcUPGGed3k="; }; @@ -24,8 +24,6 @@ buildPythonPackage rec { dependencies = [ py-cpuinfo ]; - doCheck = false; - pythonImportsCheck = [ "pytest_benchmark" ]; meta = { @@ -33,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/ionelmc/pytest-benchmark"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/pytest-black/default.nix b/python/pkgs/pytest-black/default.nix index b5613a66a..eb40009f3 100644 --- a/python/pkgs/pytest-black/default.nix +++ b/python/pkgs/pytest-black/default.nix @@ -7,14 +7,14 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-black"; version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "pytest_black"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-7Ld0VfN5gFy0vY9FqBOjdUw7vuMZmt8bNmXA39CGtRE="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/shopkeep/pytest-black"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-cases/default.nix b/python/pkgs/pytest-cases/default.nix index d0a3e17ed..11d57074c 100644 --- a/python/pkgs/pytest-cases/default.nix +++ b/python/pkgs/pytest-cases/default.nix @@ -9,14 +9,14 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-cases"; version = "3.10.1"; pyproject = true; src = fetchPypi { pname = "pytest_cases"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-RR+ePs1dLYGkNiwQxEESb1s9GuOn769Z9gsfuTDfLWk="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/smarie/python-pytest-cases"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-catchlog/default.nix b/python/pkgs/pytest-catchlog/default.nix index ca23e1514..25b1dfe9e 100644 --- a/python/pkgs/pytest-catchlog/default.nix +++ b/python/pkgs/pytest-catchlog/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytest, unzip, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-catchlog"; version = "1.2.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1w7wxh27sbqwm4jgwrjr9c2gy384aca5jzw9c0wzhl0pmk2mvqab"; extension = "zip"; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ unzip ]; buildInputs = [ pytest ]; @@ -27,4 +31,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/pytest-catchlog/"; description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog"; }; -} +}) diff --git a/python/pkgs/pytest-celery/default.nix b/python/pkgs/pytest-celery/default.nix index 2fc668d0c..c222b67e7 100644 --- a/python/pkgs/pytest-celery/default.nix +++ b/python/pkgs/pytest-celery/default.nix @@ -18,7 +18,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-celery"; version = "1.3.0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "celery"; repo = "pytest-celery"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8qDnyMv0NxMFWGRbJ63Ye/dSRr8A6Azh2J5gkiwYYzI="; }; @@ -82,4 +82,4 @@ buildPythonPackage rec { homepage = "https://github.com/celery/pytest-celery"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-check/default.nix b/python/pkgs/pytest-check/default.nix index f8c19a6f2..c5c0c4147 100644 --- a/python/pkgs/pytest-check/default.nix +++ b/python/pkgs/pytest-check/default.nix @@ -6,13 +6,13 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest_check"; version = "2.9.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LYyfH+XM6wtBxIDhRU6V6e1qOlNL8sfj4PORZ7Ec+Is="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/okken/pytest-check"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-click/default.nix b/python/pkgs/pytest-click/default.nix index 9af9eff6a..8049a3fa0 100644 --- a/python/pkgs/pytest-click/default.nix +++ b/python/pkgs/pytest-click/default.nix @@ -2,29 +2,33 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytest, click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-click"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Stranger6667"; repo = "pytest-click"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-A/RF+SgPu2yYF3eHEFiZwKJW2VwQ185Ln6S3wn2cS0k="; }; + build-system = [ setuptools ]; + buildInputs = [ pytest ]; - propagatedBuildInputs = [ click ]; + dependencies = [ click ]; meta = { description = "Pytest plugin for click"; homepage = "https://github.com/Stranger6667/pytest-click"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-codspeed/default.nix b/python/pkgs/pytest-codspeed/default.nix index 44dac5744..821034316 100644 --- a/python/pkgs/pytest-codspeed/default.nix +++ b/python/pkgs/pytest-codspeed/default.nix @@ -21,7 +21,7 @@ let }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-codspeed"; version = "5.0.3"; pyproject = true; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "pytest-codspeed"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qlv7iCT1q/U8fWbXGYQyw2mcR7GS9w41FlRQvRxnHh8="; }; @@ -65,4 +65,4 @@ buildPythonPackage rec { homepage = "https://github.com/CodSpeedHQ/pytest-codspeed"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-console-scripts/default.nix b/python/pkgs/pytest-console-scripts/default.nix index 67f7efb32..4b6db25e3 100644 --- a/python/pkgs/pytest-console-scripts/default.nix +++ b/python/pkgs/pytest-console-scripts/default.nix @@ -11,13 +11,13 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-console-scripts"; version = "1.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-WoJu2EzAr6IC655EOB19di973ajgwj+feafx9Ez0qJU="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/kvas-it/pytest-console-scripts"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-cov/default.nix b/python/pkgs/pytest-cov/default.nix index 4d8b0cca6..ad3c52beb 100644 --- a/python/pkgs/pytest-cov/default.nix +++ b/python/pkgs/pytest-cov/default.nix @@ -10,14 +10,14 @@ tomli, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-cov"; version = "7.1.0"; pyproject = true; src = fetchPypi { pname = "pytest_cov"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-MGdPK19jUaoJcCqcjDZPagHCeq4ME2augBYWDR78VrI="; }; @@ -34,8 +34,6 @@ buildPythonPackage rec { tomli ]; - doCheck = false; - pythonImportsCheck = [ "pytest_cov" ]; meta = { @@ -43,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-cov"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-datadir/default.nix b/python/pkgs/pytest-datadir/default.nix index d8cc100bb..572e1560e 100644 --- a/python/pkgs/pytest-datadir/default.nix +++ b/python/pkgs/pytest-datadir/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-datadir"; version = "1.8.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gabrielcnr"; repo = "pytest-datadir"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ttzYFzePPpFY6DfMGLVImZMiehuR9IhmIFxBlgrDDmk="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/gabrielcnr/pytest-datadir"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-datafiles/default.nix b/python/pkgs/pytest-datafiles/default.nix index c663e8ea4..2d5d50e0f 100644 --- a/python/pkgs/pytest-datafiles/default.nix +++ b/python/pkgs/pytest-datafiles/default.nix @@ -6,7 +6,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-datafiles"; version = "3.0.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "omarkohl"; repo = "pytest-datafiles"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xB96JAUlEicIrTET1L363H8O2JwCTuUWr9jX/70uFvs="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/omarkohl/pytest-datafiles"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-dependency/default.nix b/python/pkgs/pytest-dependency/default.nix index 80a3dd513..4c1d1e4a2 100644 --- a/python/pkgs/pytest-dependency/default.nix +++ b/python/pkgs/pytest-dependency/default.nix @@ -6,13 +6,13 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-dependency"; version = "0.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-k0sOajnZWZUGLBk/fq7tio/6Bv8bzvS2Kw3HSnCLrME="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/RKrahl/pytest-dependency"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pytest-django/default.nix b/python/pkgs/pytest-django/default.nix index 5a280b8ec..6c3f93711 100644 --- a/python/pkgs/pytest-django/default.nix +++ b/python/pkgs/pytest-django/default.nix @@ -8,14 +8,14 @@ django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-django"; version = "4.14.0"; pyproject = true; src = fetchPypi { pname = "pytest_django"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Jnh90/Qiz7q49VuAp3bi7ep6EQkst06WC+8TElFXCO8="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://pytest-django.readthedocs.org/en/latest/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-docker/default.nix b/python/pkgs/pytest-docker/default.nix index b4105a3f8..ab897748a 100644 --- a/python/pkgs/pytest-docker/default.nix +++ b/python/pkgs/pytest-docker/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-docker"; version = "3.2.5"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "avast"; repo = "pytest-docker"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AkVLfCt2aQZrvSfa/5oXr95XUIR5mRqcMRz67kmuKKw="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/avast/pytest-docker"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-doctestplus/default.nix b/python/pkgs/pytest-doctestplus/default.nix index 1a03cbac9..a1319f057 100644 --- a/python/pkgs/pytest-doctestplus/default.nix +++ b/python/pkgs/pytest-doctestplus/default.nix @@ -10,7 +10,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-doctestplus"; version = "1.7.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scientific-python"; repo = "pytest-doctestplus"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5vvLnvE0dvLYBNx34gsyQEcWlr7Cd063+rRjlnHM7OE="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://astropy.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-dotenv/default.nix b/python/pkgs/pytest-dotenv/default.nix index db4d359ee..7964089e3 100644 --- a/python/pkgs/pytest-dotenv/default.nix +++ b/python/pkgs/pytest-dotenv/default.nix @@ -7,13 +7,13 @@ python-dotenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-dotenv"; version = "0.5.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LcbDrG2HZMccbSgE6QLQ/4EPoZaS6V/hOK78mxqnNzI="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/quiqua/pytest-dotenv"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-env/default.nix b/python/pkgs/pytest-env/default.nix index 960acd842..e0aae68f6 100644 --- a/python/pkgs/pytest-env/default.nix +++ b/python/pkgs/pytest-env/default.nix @@ -12,14 +12,14 @@ python-dotenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-env"; version = "1.7.0"; pyproject = true; src = fetchPypi { pname = "pytest_env"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-DB3BEB+406s2Eej41le6BsPAwWf8hckEV+WyfyUI9D4="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/MobileDynasty/pytest-env"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-expect/default.nix b/python/pkgs/pytest-expect/default.nix index f3839077d..15f8af1f5 100644 --- a/python/pkgs/pytest-expect/default.nix +++ b/python/pkgs/pytest-expect/default.nix @@ -2,6 +2,8 @@ buildPythonPackage, lib, fetchPypi, + # build-system + setuptools, pytest, u-msgpack-python, six, @@ -10,15 +12,17 @@ buildPythonPackage (finalAttrs: { pname = "pytest-expect"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; sha256 = "36b4462704450798197d090809a05f4e13649d9cba9acdc557ce9517da1fd847"; }; + build-system = [ setuptools ]; + buildInputs = [ pytest ]; - propagatedBuildInputs = [ + dependencies = [ u-msgpack-python six ]; diff --git a/python/pkgs/pytest-factoryboy/default.nix b/python/pkgs/pytest-factoryboy/default.nix index 9dd668f5c..2e666f4ec 100644 --- a/python/pkgs/pytest-factoryboy/default.nix +++ b/python/pkgs/pytest-factoryboy/default.nix @@ -9,7 +9,7 @@ # unpropagated pytest, - # propagated + # dependencies inflection, factory-boy, typing-extensions, @@ -17,7 +17,7 @@ # tests }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-factoryboy"; version = "2.8.1"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-factoryboy"; - rev = version; + tag = finalAttrs.version; sha256 = "sha256-9dMsUujMCk89Ze4H9VJRS+ihjk0PAxKb8xqlw0+ROEI="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://pytest-factoryboy.readthedocs.io/en/latest/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-filter-subpackage/default.nix b/python/pkgs/pytest-filter-subpackage/default.nix index 51b6f4eb2..5aa9f12f4 100644 --- a/python/pkgs/pytest-filter-subpackage/default.nix +++ b/python/pkgs/pytest-filter-subpackage/default.nix @@ -2,27 +2,31 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pytest, pytest-cov-stub, pytest-doctestplus, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-filter-subpackage"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-P0aPGzZRgSiGm5Xeq2YbpF7WKThUMp/vFNpMjKx4r1Y="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ + dependencies = [ pytest-doctestplus pytest-cov-stub ]; @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/astropy/pytest-filter-subpackage"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-fixture-config/default.nix b/python/pkgs/pytest-fixture-config/default.nix index 9160589a8..7a1cae69d 100644 --- a/python/pkgs/pytest-fixture-config/default.nix +++ b/python/pkgs/pytest-fixture-config/default.nix @@ -6,7 +6,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-fixture-config"; version = "1.8.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "man-group"; repo = "pytest-plugins"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fLctuuvHVk9GvQB5cTL4/T7GeWzJ2zLJpwZqq9/6C30="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/manahl/pytest-plugins"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-flake8/default.nix b/python/pkgs/pytest-flake8/default.nix index c3277fea3..f363f63ca 100644 --- a/python/pkgs/pytest-flake8/default.nix +++ b/python/pkgs/pytest-flake8/default.nix @@ -7,7 +7,7 @@ flake8, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-flake8"; version = "1.3.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "coherent-oss"; repo = "pytest-flake8"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uc5DOqqdoLfhzI2ogDOqhbJOHzdu+uqSOojIH+S1LZI="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/coherent-oss/pytest-flake8"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/pytest-flakes/default.nix b/python/pkgs/pytest-flakes/default.nix index f178d5e16..780f9e381 100644 --- a/python/pkgs/pytest-flakes/default.nix +++ b/python/pkgs/pytest-flakes/default.nix @@ -7,13 +7,13 @@ pyflakes, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-flakes"; version = "4.0.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lTE06XIVrjH2h5+9c2jBjUP3Cdwvq1t3d9srsrrDqSQ="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/pytest-flakes/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-forked/default.nix b/python/pkgs/pytest-forked/default.nix index 0cd127051..30337b5bc 100644 --- a/python/pkgs/pytest-forked/default.nix +++ b/python/pkgs/pytest-forked/default.nix @@ -8,13 +8,13 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-forked"; version = "1.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ta/UappgD2XYIrj2BRM+z1s+GUHrs1iOlDtOPrcaWj8="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-forked"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-freezegun/default.nix b/python/pkgs/pytest-freezegun/default.nix index 7bb790caf..505609dd6 100644 --- a/python/pkgs/pytest-freezegun/default.nix +++ b/python/pkgs/pytest-freezegun/default.nix @@ -3,22 +3,26 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + # build-system + setuptools, freezegun, pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-freezegun"; version = "0.4.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ktosiek"; repo = "pytest-freezegun"; - rev = version; + tag = finalAttrs.version; sha256 = "10c4pbh03b4s1q8cjd75lr0fvyf9id0zmdk29566qqsmaz28npas"; }; + build-system = [ setuptools ]; + patches = [ (fetchpatch { # https://github.com/ktosiek/pytest-freezegun/pull/38 @@ -30,10 +34,10 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ freezegun ]; + dependencies = [ freezegun ]; meta = { description = "Wrap tests with fixtures in freeze_time"; homepage = "https://github.com/ktosiek/pytest-freezegun"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-freezer/default.nix b/python/pkgs/pytest-freezer/default.nix index e0d4e8d48..129d9ec95 100644 --- a/python/pkgs/pytest-freezer/default.nix +++ b/python/pkgs/pytest-freezer/default.nix @@ -7,7 +7,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-freezer"; version = "0.4.9"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-freezer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WJGwkON/RAiUiGzNkeqjzch4CEr6mPXij5dqz1ncRXs="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-freezer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-golden/default.nix b/python/pkgs/pytest-golden/default.nix index 441412cbe..1da1f8c62 100644 --- a/python/pkgs/pytest-golden/default.nix +++ b/python/pkgs/pytest-golden/default.nix @@ -9,7 +9,7 @@ testfixtures, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-golden"; version = "1.0.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oprypin"; repo = "pytest-golden"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mjb8lBAoZxwUCN4AIMK/n70aC41Y4IV/+hrW11S9rcw="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/oprypin/pytest-golden"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-harvest/default.nix b/python/pkgs/pytest-harvest/default.nix index b65e0b127..4b0857715 100644 --- a/python/pkgs/pytest-harvest/default.nix +++ b/python/pkgs/pytest-harvest/default.nix @@ -9,7 +9,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-harvest"; version = "1.10.5"; pyproject = true; @@ -17,14 +17,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "smarie"; repo = "python-pytest-harvest"; - tag = version; + tag = finalAttrs.version; hash = "sha256-s8QiuUFRTTRhSpLa0DHScKFC9xdu+w2rssWCg8sIjsg="; }; # create file, that is created by setuptools_scm # we disable this file creation as it touches internet postPatch = '' - echo "version = '${version}'" > pytest_harvest/_version.py + echo "version = '${finalAttrs.version}'" > pytest_harvest/_version.py substituteInPlace pytest_harvest/tests/test_lazy_and_harvest.py \ --replace-fail "from distutils.version import LooseVersion" "from packaging.version import parse" \ @@ -37,7 +37,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ + dependencies = [ decopatch makefun six @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/smarie/python-pytest-harvest"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-helpers-namespace/default.nix b/python/pkgs/pytest-helpers-namespace/default.nix index 642764fef..e14a595dc 100644 --- a/python/pkgs/pytest-helpers-namespace/default.nix +++ b/python/pkgs/pytest-helpers-namespace/default.nix @@ -7,18 +7,19 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-helpers-namespace"; version = "2021.12.29"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "792038247e0021beb966a7ea6e3a70ff5fcfba77eb72c6ec8fd6287af871c35b"; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ - setuptools setuptools-declarative-requirements setuptools-scm ]; @@ -30,4 +31,4 @@ buildPythonPackage rec { description = "PyTest Helpers Namespace"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pytest-httpbin/default.nix b/python/pkgs/pytest-httpbin/default.nix index fa47cfcaf..eb3ca2de1 100644 --- a/python/pkgs/pytest-httpbin/default.nix +++ b/python/pkgs/pytest-httpbin/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-httpbin"; version = "2.1.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kevin1024"; repo = "pytest-httpbin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gESU1SDpqSQs8GRcGJclWM0WpS4DZicfdtwxk2sQubQ="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ httpbin ]; + dependencies = [ httpbin ]; pythonImportsCheck = [ "pytest_httpbin" ]; meta = { @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/kevin1024/pytest-httpbin"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-httpserver/default.nix b/python/pkgs/pytest-httpserver/default.nix index d41ad1ce9..b0222fb8b 100644 --- a/python/pkgs/pytest-httpserver/default.nix +++ b/python/pkgs/pytest-httpserver/default.nix @@ -8,7 +8,7 @@ werkzeug, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-httpserver"; version = "1.1.5"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "csernazs"; repo = "pytest-httpserver"; - tag = version; + tag = finalAttrs.version; hash = "sha256-6GU7LwCy5BacgdT1owrzN1NYazRE4zHSVl4hxPhrYSo="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ werkzeug ]; + dependencies = [ werkzeug ]; pythonImportsCheck = [ "pytest_httpserver" ]; meta = { @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://www.github.com/csernazs/pytest-httpserver"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-httpx/default.nix b/python/pkgs/pytest-httpx/default.nix index d2f602b42..0afc83793 100644 --- a/python/pkgs/pytest-httpx/default.nix +++ b/python/pkgs/pytest-httpx/default.nix @@ -9,7 +9,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-httpx"; version = "0.36.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WuvfhLRKbfhVehyz/0PAUlIYbwfTYlQMRC8uTWD1T00="; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ httpx ]; + dependencies = [ httpx ]; pythonRelaxDeps = [ "httpx" ]; pythonImportsCheck = [ "pytest_httpx" ]; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Colin-b/pytest_httpx"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-instafail/default.nix b/python/pkgs/pytest-instafail/default.nix index 99d6b130e..118bdd294 100644 --- a/python/pkgs/pytest-instafail/default.nix +++ b/python/pkgs/pytest-instafail/default.nix @@ -6,13 +6,13 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-instafail"; version = "0.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-M6YG9+DI5kbcO/7g1eOkt7eO98NhaM+h89k698pwbJ4="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - doCheck = false; - pythonImportsCheck = [ "pytest_instafail" ]; meta = { @@ -29,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-instafail"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-isort/default.nix b/python/pkgs/pytest-isort/default.nix index 4ccce4f6f..ef4ab7e3c 100644 --- a/python/pkgs/pytest-isort/default.nix +++ b/python/pkgs/pytest-isort/default.nix @@ -7,7 +7,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-isort"; version = "4.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stephrdev"; repo = "pytest-isort"; - tag = version; + tag = finalAttrs.version; hash = "sha256-fMt2tYc+Ngb57T/VJYxI2UN25qvIrgIsEoImVIitDK4="; }; @@ -23,7 +23,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ isort ]; + dependencies = [ isort ]; pythonImportsCheck = [ "pytest_isort" ]; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/moccu/pytest-isort/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-json-report/default.nix b/python/pkgs/pytest-json-report/default.nix index 1c544a780..aef41accf 100644 --- a/python/pkgs/pytest-json-report/default.nix +++ b/python/pkgs/pytest-json-report/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-json-report"; version = "1.5.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "numirias"; repo = "pytest-json-report"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hMB/atDuo7CjwhHFUOxVfgJ7Qp4AA9J428iv7hyQFcs="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/numirias/pytest-json-report"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-jupyter/default.nix b/python/pkgs/pytest-jupyter/default.nix index 1aecfecca..c59ece311 100644 --- a/python/pkgs/pytest-jupyter/default.nix +++ b/python/pkgs/pytest-jupyter/default.nix @@ -14,44 +14,41 @@ nbformat, }: -let - self = buildPythonPackage rec { - pname = "pytest-jupyter"; - version = "0.11.0"; - pyproject = true; +buildPythonPackage (finalAttrs: { + pname = "pytest-jupyter"; + version = "0.11.0"; + pyproject = true; - src = fetchFromGitHub { - owner = "jupyter-server"; - repo = "pytest-jupyter"; - tag = "v${version}"; - hash = "sha256-x3Q9Ei4WIMDjjrYfWees30eooWep60EljGYyUyypxqQ="; - }; + src = fetchFromGitHub { + owner = "jupyter-server"; + repo = "pytest-jupyter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-x3Q9Ei4WIMDjjrYfWees30eooWep60EljGYyUyypxqQ="; + }; - nativeBuildInputs = [ hatchling ]; + nativeBuildInputs = [ hatchling ]; - buildInputs = [ pytest ]; + buildInputs = [ pytest ]; - propagatedBuildInputs = [ jupyter-core ]; + dependencies = [ jupyter-core ]; - optional-dependencies = { - client = [ - jupyter-client - nbformat - ipykernel - ]; - server = [ - jupyter-server - jupyter-client - nbformat - ipykernel - ]; - }; + optional-dependencies = { + client = [ + jupyter-client + nbformat + ipykernel + ]; + server = [ + jupyter-server + jupyter-client + nbformat + ipykernel + ]; + }; - meta = { - description = "Pytest plugin for testing Jupyter core libraries and extensions"; - homepage = "https://github.com/jupyter-server/pytest-jupyter"; - license = lib.licenses.bsd3; - }; + meta = { + description = "Pytest plugin for testing Jupyter core libraries and extensions"; + homepage = "https://github.com/jupyter-server/pytest-jupyter"; + license = lib.licenses.bsd3; }; -in -self +}) diff --git a/python/pkgs/pytest-lazy-fixture/default.nix b/python/pkgs/pytest-lazy-fixture/default.nix index 3a7494ad2..c72693777 100644 --- a/python/pkgs/pytest-lazy-fixture/default.nix +++ b/python/pkgs/pytest-lazy-fixture/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-lazy-fixture"; version = "0.6.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1b0hmnsxw4s2wf9pks8dg6dfy5cx3zcbzs8517lfccxsfizhqz8f"; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/tvorog/pytest-lazy-fixture"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-lazy-fixtures/default.nix b/python/pkgs/pytest-lazy-fixtures/default.nix index a2b45bfd9..f9500ed60 100644 --- a/python/pkgs/pytest-lazy-fixtures/default.nix +++ b/python/pkgs/pytest-lazy-fixtures/default.nix @@ -6,7 +6,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-lazy-fixtures"; version = "1.4.1"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dev-petrov"; repo = "pytest-lazy-fixtures"; - tag = version; + tag = finalAttrs.version; hash = "sha256-z4j9mITPUkug2/YaKwij5nlJYIoMpkDUPUmW/peNUXQ="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ hatchling ]; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/dev-petrov/pytest-lazy-fixtures"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-localserver/default.nix b/python/pkgs/pytest-localserver/default.nix index 96e413c15..a81051f27 100644 --- a/python/pkgs/pytest-localserver/default.nix +++ b/python/pkgs/pytest-localserver/default.nix @@ -10,14 +10,14 @@ werkzeug, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-localserver"; version = "0.10.0"; pyproject = true; src = fetchPypi { pname = "pytest_localserver"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-JgcZfzkJEqslUl0SmsQ8PIdQSSVzaLP+CbXNA9zFJq8="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-localserver"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-metadata/default.nix b/python/pkgs/pytest-metadata/default.nix index cf7263db8..3e3e2e075 100644 --- a/python/pkgs/pytest-metadata/default.nix +++ b/python/pkgs/pytest-metadata/default.nix @@ -11,14 +11,14 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-metadata"; version = "3.1.1"; pyproject = true; src = fetchPypi { pname = "pytest_metadata"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-0qKbA1X7wD8WiqltQf+IsaO0SjsCrL5JGAHJigSAF8g="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-metadata"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/pytest-mock/default.nix b/python/pkgs/pytest-mock/default.nix index 185beb9cc..fccd18223 100644 --- a/python/pkgs/pytest-mock/default.nix +++ b/python/pkgs/pytest-mock/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-mock"; version = "3.15.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-mock"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9h5/cssWs4F0LKnFLjWDsEjB2AYczLvnSjiUdsaEcBQ="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-mock"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-mpi/default.nix b/python/pkgs/pytest-mpi/default.nix index 3b9204630..d72ca436d 100644 --- a/python/pkgs/pytest-mpi/default.nix +++ b/python/pkgs/pytest-mpi/default.nix @@ -8,7 +8,7 @@ mpi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-mpi"; version = "0.6"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aragilar"; repo = "pytest-mpi"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-m3HTGLoPnYeg0oeIA1nzTzch7FtkuXTYpox4rRgo5MU="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/aragilar/pytest-mpi"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-mypy-plugins/default.nix b/python/pkgs/pytest-mypy-plugins/default.nix index 1d9050470..9cb19a9a2 100644 --- a/python/pkgs/pytest-mypy-plugins/default.nix +++ b/python/pkgs/pytest-mypy-plugins/default.nix @@ -14,7 +14,7 @@ tomlkit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-mypy-plugins"; version = "4.0.3"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "typeddjango"; repo = "pytest-mypy-plugins"; - tag = version; + tag = finalAttrs.version; hash = "sha256-RyHoZniVLtunqz42tuVeAoiUm/e5JvvwX2MMCAJBhy8="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/TypedDjango/pytest-mypy-plugins"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-mypy/default.nix b/python/pkgs/pytest-mypy/default.nix index bfd8dbe9f..cf2cbf328 100644 --- a/python/pkgs/pytest-mypy/default.nix +++ b/python/pkgs/pytest-mypy/default.nix @@ -10,14 +10,14 @@ filelock, }: -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="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/dbader/pytest-mypy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-order/default.nix b/python/pkgs/pytest-order/default.nix index 72ac861b2..5a4840bb2 100644 --- a/python/pkgs/pytest-order/default.nix +++ b/python/pkgs/pytest-order/default.nix @@ -8,7 +8,7 @@ pytest-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-order"; version = "1.5.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-order"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LLQy5dO3OWmm7W9eI8yfrOFVp9MQOU+pjoAyWl03tZ0="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-order"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-parallel/default.nix b/python/pkgs/pytest-parallel/default.nix index a3441a109..0959bd408 100644 --- a/python/pkgs/pytest-parallel/default.nix +++ b/python/pkgs/pytest-parallel/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, # build inputs tblib, pytest, @@ -13,7 +15,7 @@ let in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "kevlened"; @@ -22,7 +24,9 @@ buildPythonPackage { hash = "sha256-ddpoWBTf7Zor569p6uOMjHSTx3Qa551f4mSwyTLDdBU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ tblib pytest py diff --git a/python/pkgs/pytest-param-files/default.nix b/python/pkgs/pytest-param-files/default.nix index aead000e5..c33d32aab 100644 --- a/python/pkgs/pytest-param-files/default.nix +++ b/python/pkgs/pytest-param-files/default.nix @@ -7,7 +7,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-param-files"; version = "0.6.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chrisjsewell"; repo = "pytest-param-files"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hgEEfKf9Kmah5WDNHoFWQJKLOs9Z5BDHiebXCdDc1zE="; }; @@ -23,7 +23,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ ruamel-yaml ]; + dependencies = [ ruamel-yaml ]; pythonImportsCheck = [ "pytest_param_files" ]; meta = { @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/chrisjsewell/pytest-param-files"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-plus/default.nix b/python/pkgs/pytest-plus/default.nix index 20850ae71..28b4f73b5 100644 --- a/python/pkgs/pytest-plus/default.nix +++ b/python/pkgs/pytest-plus/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-plus"; version = "0.8.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-plus"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XlEtekOASIjZretTbQAf0eyQN6qZ9c6zI1ESss/hxfI="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-plus"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-pook/default.nix b/python/pkgs/pytest-pook/default.nix index 9b0b37f1c..94acf5b1b 100644 --- a/python/pkgs/pytest-pook/default.nix +++ b/python/pkgs/pytest-pook/default.nix @@ -32,7 +32,6 @@ buildPythonPackage { ]; # fails in various ways - doCheck = false; pythonImportsCheck = [ "pytest_pook" ]; diff --git a/python/pkgs/pytest-pycodestyle/default.nix b/python/pkgs/pytest-pycodestyle/default.nix index 7ccb80e75..01b758720 100644 --- a/python/pkgs/pytest-pycodestyle/default.nix +++ b/python/pkgs/pytest-pycodestyle/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-pycodestyle"; version = "2.5.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "henry0312"; repo = "pytest-pycodestyle"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-X/vacxI0RFHIqlZ2omzvvFDePS/SZYSFQHEmfcbvf/4="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/henry0312/pytest-pycodestyle"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-pylint/default.nix b/python/pkgs/pytest-pylint/default.nix index 5c8c2f3e9..6675ced05 100644 --- a/python/pkgs/pytest-pylint/default.nix +++ b/python/pkgs/pytest-pylint/default.nix @@ -9,13 +9,13 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-pylint"; version = "0.21.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iHZLjh1c+hiAkkjgzML8BQNfCMNfCwIi3c/qHDxOVT4="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/carsongee/pytest-pylint"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-qt/default.nix b/python/pkgs/pytest-qt/default.nix index fa6d7b7b2..91c92d70f 100644 --- a/python/pkgs/pytest-qt/default.nix +++ b/python/pkgs/pytest-qt/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-qt"; version = "4.5.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-qt"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ZCWWhd1/7qdSgGLNbsjPlxg24IFdqbNtLRktgMFVCJY="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-qt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-random-order/default.nix b/python/pkgs/pytest-random-order/default.nix index 697957999..a67d9468a 100644 --- a/python/pkgs/pytest-random-order/default.nix +++ b/python/pkgs/pytest-random-order/default.nix @@ -9,7 +9,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-random-order"; version = "1.2.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jbasko"; repo = "pytest-random-order"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-c282PrdXxG7WChnkpLWe059OmtTOl1Mn6yWgMRfCjBA="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { description = "Randomise the order of tests with some control over the randomness"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-randomly/default.nix b/python/pkgs/pytest-randomly/default.nix index aea0938b9..605f0c320 100644 --- a/python/pkgs/pytest-randomly/default.nix +++ b/python/pkgs/pytest-randomly/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-randomly"; version = "4.0.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "pytest-randomly"; owner = "pytest-dev"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UQ1G9o4dsVEEo4y2u1TYYurJPfih7QlbilkwPqi39H0="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-randomly"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-recording/default.nix b/python/pkgs/pytest-recording/default.nix index 8a9c17218..bc6aaa681 100644 --- a/python/pkgs/pytest-recording/default.nix +++ b/python/pkgs/pytest-recording/default.nix @@ -13,7 +13,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-recording"; version = "0.13.4"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kiwicom"; repo = "pytest-recording"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-S++MnI0GgpQxS6kFkt05kcE4JMW7jyFjJ3o7DhfYoVA="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/kiwicom/pytest-recording"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-regressions/default.nix b/python/pkgs/pytest-regressions/default.nix index d001b1bc9..3d8666e77 100644 --- a/python/pkgs/pytest-regressions/default.nix +++ b/python/pkgs/pytest-regressions/default.nix @@ -13,7 +13,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-regressions"; version = "2.11.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ESSS"; repo = "pytest-regressions"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BojXizPr1b09YOa4wEeHQheyubKR2nBvtzLlcvt3380="; }; @@ -64,4 +64,4 @@ buildPythonPackage rec { homepage = "https://github.com/ESSS/pytest-regressions"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-relaxed/default.nix b/python/pkgs/pytest-relaxed/default.nix index 91418db15..4c2c3bf16 100644 --- a/python/pkgs/pytest-relaxed/default.nix +++ b/python/pkgs/pytest-relaxed/default.nix @@ -3,20 +3,24 @@ buildPythonPackage, decorator, fetchPypi, + # build-system + setuptools, invoke, pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-relaxed"; version = "2.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lW6gKOww27+2gN2Oe0p/uPgKI5WV6Ius4Bi/LA1xgkg="; }; + build-system = [ setuptools ]; + patches = [ # https://github.com/bitprophet/pytest-relaxed/issues/28 # https://github.com/bitprophet/pytest-relaxed/pull/29 @@ -25,7 +29,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ decorator ]; + dependencies = [ decorator ]; pythonImportsCheck = [ "pytest_relaxed" ]; meta = { @@ -33,4 +37,4 @@ buildPythonPackage rec { description = "Relaxed test discovery/organization for pytest"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/pytest-remotedata/default.nix b/python/pkgs/pytest-remotedata/default.nix index 01f24eeb6..3c36839b5 100644 --- a/python/pkgs/pytest-remotedata/default.nix +++ b/python/pkgs/pytest-remotedata/default.nix @@ -8,14 +8,14 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-remotedata"; version = "0.4.1"; pyproject = true; src = fetchPypi { pname = "pytest-remotedata"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-BcCL9jjN0e1m6wFzihZHw8cUc3w+w6vgCdLB95O0u1k="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/astropy/pytest-remotedata"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-repeat/default.nix b/python/pkgs/pytest-repeat/default.nix index 8d24518b0..760253054 100644 --- a/python/pkgs/pytest-repeat/default.nix +++ b/python/pkgs/pytest-repeat/default.nix @@ -7,14 +7,14 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-repeat"; version = "0.9.4"; pyproject = true; src = fetchPypi { pname = "pytest_repeat"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-2SrBTfqm/8/mkX5dFvDJvII4DBNbA8Kl9BLSY38iRIU="; }; @@ -25,8 +25,6 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - doCheck = false; - pythonImportsCheck = [ "pytest_repeat" ]; meta = { @@ -34,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-repeat"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/pytest-reraise/default.nix b/python/pkgs/pytest-reraise/default.nix index c284fb560..9343f10ae 100644 --- a/python/pkgs/pytest-reraise/default.nix +++ b/python/pkgs/pytest-reraise/default.nix @@ -6,7 +6,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-reraise"; version = "2.1.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bjoluc"; repo = "pytest-reraise"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mgNKoZ+2sinArTZhSwhLxzBTb4QfiT1LWBs7w5MHXWA="; }; @@ -28,8 +28,6 @@ buildPythonPackage rec { dependencies = [ pytest ]; - doCheck = false; - pythonImportsCheck = [ "pytest_reraise" ]; meta = { @@ -37,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/bjoluc/pytest-reraise"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-rerunfailures/default.nix b/python/pkgs/pytest-rerunfailures/default.nix index 25409aef6..28b36e869 100644 --- a/python/pkgs/pytest-rerunfailures/default.nix +++ b/python/pkgs/pytest-rerunfailures/default.nix @@ -7,7 +7,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-rerunfailures"; version = "16.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-rerunfailures"; - tag = version; + tag = finalAttrs.version; hash = "sha256-wdUNGc50Yqrctc8OXBmgRwmHVjSeOq+ADRYcLtKSraM="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-rerunfailures"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/pytest-retry/default.nix b/python/pkgs/pytest-retry/default.nix index 8ea55b6a1..8df9cd6bb 100644 --- a/python/pkgs/pytest-retry/default.nix +++ b/python/pkgs/pytest-retry/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-retry"; version = "1.7.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "str0zzapreti"; repo = "pytest-retry"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Gf+L7zvC1FGAm0Wd6E6fV3KynassoGyHSD0CPgEJ02k="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/str0zzapreti/pytest-retry"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-services/default.nix b/python/pkgs/pytest-services/default.nix index 8f986dd7e..3c356111a 100644 --- a/python/pkgs/pytest-services/default.nix +++ b/python/pkgs/pytest-services/default.nix @@ -10,7 +10,7 @@ zc-lockfile, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-services"; version = "2.2.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-services"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kWgqb7+3/hZKUz7B3PnfxHZq6yU3JUeJ+mruqrMD/NE="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-services"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-snapshot/default.nix b/python/pkgs/pytest-snapshot/default.nix index 96bb28160..9f85272c6 100644 --- a/python/pkgs/pytest-snapshot/default.nix +++ b/python/pkgs/pytest-snapshot/default.nix @@ -7,7 +7,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-snapshot"; version = "0.9.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "joseph-roitman"; repo = "pytest-snapshot"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0PZu9wL29iEppLxxbl4D0E4WfOHe61KUUld003cRBRU="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/joseph-roitman/pytest-snapshot/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-socket/default.nix b/python/pkgs/pytest-socket/default.nix index 59b17efc9..b699b9a81 100644 --- a/python/pkgs/pytest-socket/default.nix +++ b/python/pkgs/pytest-socket/default.nix @@ -6,7 +6,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-socket"; version = "0.8.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miketheman"; repo = "pytest-socket"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Z8aCucbYR6kIgrtZlITPjElwBiIW7DhAk5oTnuiEwWQ="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { buildInputs = [ pytest ]; # pytest-socket require network for majority of tests - doCheck = false; pythonImportsCheck = [ "pytest_socket" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/miketheman/pytest-socket"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-subprocess/default.nix b/python/pkgs/pytest-subprocess/default.nix index 09c804f52..d974e7309 100644 --- a/python/pkgs/pytest-subprocess/default.nix +++ b/python/pkgs/pytest-subprocess/default.nix @@ -12,7 +12,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-subprocess"; version = "1.6.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aklajnert"; repo = "pytest-subprocess"; - tag = version; + tag = finalAttrs.version; hash = "sha256-zPKExIrCt8ZwhKGU0l3tyTcDhRIGPSiM8OWy5cpmsuE="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/aklajnert/pytest-subprocess"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-subtests/default.nix b/python/pkgs/pytest-subtests/default.nix index 6f38da337..459f3954a 100644 --- a/python/pkgs/pytest-subtests/default.nix +++ b/python/pkgs/pytest-subtests/default.nix @@ -12,14 +12,14 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-subtests"; version = "0.15.0"; pyproject = true; src = fetchPypi { pname = "pytest_subtests"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-y0lb3gVVG3hLjwuK36on7bQTFGmifDObgP2Na6M/iHw="; }; @@ -33,8 +33,6 @@ buildPythonPackage rec { pytest ]; - doCheck = false; - pythonImportsCheck = [ "pytest_subtests" ]; meta = { @@ -42,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-subtests"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-sugar/default.nix b/python/pkgs/pytest-sugar/default.nix index 606a53aa2..46c993701 100644 --- a/python/pkgs/pytest-sugar/default.nix +++ b/python/pkgs/pytest-sugar/default.nix @@ -8,13 +8,13 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-sugar"; version = "1.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-c7i2UWPr8Q+fZx76ue7T1W8g0spovag/pkdAqSwI9l0="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/Teemu/pytest-sugar"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-test-utils/default.nix b/python/pkgs/pytest-test-utils/default.nix index d776f9168..b4f7ed250 100644 --- a/python/pkgs/pytest-test-utils/default.nix +++ b/python/pkgs/pytest-test-utils/default.nix @@ -7,7 +7,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-test-utils"; version = "0.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = "pytest-test-utils"; - tag = version; + tag = finalAttrs.version; hash = "sha256-19oNAFff++7ntMdlnMXYc2w5I+EzGwWJh+rB1IjNZGk="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/iterative/pytest-test-utils"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pytest-testinfra/default.nix b/python/pkgs/pytest-testinfra/default.nix index 8fd8a509d..b7e9d1e4c 100644 --- a/python/pkgs/pytest-testinfra/default.nix +++ b/python/pkgs/pytest-testinfra/default.nix @@ -7,14 +7,14 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-testinfra"; version = "10.2.2"; pyproject = true; src = fetchPypi { pname = "pytest_testinfra"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-U3/V64jaYYwfRhJIqiBZTPjURRLoUZsjmDfoOHXh6c0="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-testinfra"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pytest-testmon/default.nix b/python/pkgs/pytest-testmon/default.nix index 1805d79a7..1d35cd19f 100644 --- a/python/pkgs/pytest-testmon/default.nix +++ b/python/pkgs/pytest-testmon/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-testmon"; version = "2.2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tarpas"; repo = "pytest-testmon"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BVQ7rEusbW0G1C6cUeHH7fZWndSErcBQfGNdw0/4eTg="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { dependencies = [ coverage ]; # The project does not include tests since version 1.3.0 - doCheck = false; pythonImportsCheck = [ "testmon" ]; @@ -35,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/tarpas/pytest-testmon/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-textual-snapshot/default.nix b/python/pkgs/pytest-textual-snapshot/default.nix index 5928c27a2..d9d75f008 100644 --- a/python/pkgs/pytest-textual-snapshot/default.nix +++ b/python/pkgs/pytest-textual-snapshot/default.nix @@ -14,7 +14,7 @@ textual, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-textual-snapshot"; version = "1.1.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Textualize"; repo = "pytest-textual-snapshot"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ItwwaODnlya/T0Fk5DOPRLoBOwkUN5wq69cELuvy/Js="; }; @@ -53,7 +53,6 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "pytest_textual_snapshot" ]; @@ -67,4 +66,4 @@ buildPythonPackage rec { homepage = "https://github.com/Textualize/pytest-textual-snapshot"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-timeout/default.nix b/python/pkgs/pytest-timeout/default.nix index 69d622c83..684d181be 100644 --- a/python/pkgs/pytest-timeout/default.nix +++ b/python/pkgs/pytest-timeout/default.nix @@ -6,7 +6,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-timeout"; version = "2.4.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-timeout"; - tag = version; + tag = finalAttrs.version; hash = "sha256-NGTy3Hua6yEMWXQDJQO2Z5DD3clXTZXEH6DNQBMSGtQ="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-timeout/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-tornado/default.nix b/python/pkgs/pytest-tornado/default.nix index ee9e4a3a6..ed21ff178 100644 --- a/python/pkgs/pytest-tornado/default.nix +++ b/python/pkgs/pytest-tornado/default.nix @@ -7,13 +7,13 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-tornado"; version = "0.8.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ufoZMMMzud/im96Q+fQuZkMni10MlVKKgwKnRU/T8bE="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/eugeniy/pytest-tornado"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pytest-tornasync/default.nix b/python/pkgs/pytest-tornasync/default.nix index 496020c28..4c8e7467f 100644 --- a/python/pkgs/pytest-tornasync/default.nix +++ b/python/pkgs/pytest-tornasync/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytest, tornado, }: @@ -9,7 +11,7 @@ buildPythonPackage { pname = "pytest-tornasync"; version = "0.6.0.post2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "eukaryote"; @@ -20,9 +22,11 @@ buildPythonPackage { sha256 = "04cg1cfrr55dbi8nljkpcsc103i5c6p0nr46vjr0bnxgkxx03x36"; }; + build-system = [ setuptools ]; + buildInputs = [ pytest ]; - propagatedBuildInputs = [ tornado ]; + dependencies = [ tornado ]; checkPhase = '' pytest test ''; diff --git a/python/pkgs/pytest-trio/default.nix b/python/pkgs/pytest-trio/default.nix index b37660dfa..23df2efdf 100644 --- a/python/pkgs/pytest-trio/default.nix +++ b/python/pkgs/pytest-trio/default.nix @@ -9,7 +9,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-trio"; version = "0.8.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-trio"; repo = "pytest-trio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gUH35Yk/pBD2EdCEt8D0XQKWU8BwmX5xtAW10qRhoYk="; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { outcome ]; # broken with pytest 5 and 6 - doCheck = false; checkPhase = '' rm pytest.ini PYTHONPATH=$PWD:$PYTHONPATH pytest @@ -46,4 +45,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/pytest-twisted/default.nix b/python/pkgs/pytest-twisted/default.nix index b7177f101..e4d2e8c0a 100644 --- a/python/pkgs/pytest-twisted/default.nix +++ b/python/pkgs/pytest-twisted/default.nix @@ -9,7 +9,7 @@ twisted, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-twisted"; version = "1.14.3"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-twisted"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1dAfCa6hON0Vh9StI1Xw69IAwBzUkR6DdjQ0HNyoyME="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-twisted"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytest-unordered/default.nix b/python/pkgs/pytest-unordered/default.nix index e8590461b..ca0cbe96f 100644 --- a/python/pkgs/pytest-unordered/default.nix +++ b/python/pkgs/pytest-unordered/default.nix @@ -6,7 +6,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-unordered"; version = "0.8.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "utapyngo"; repo = "pytest-unordered"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0Zh58qWKJIUL/7ELiZmyFNVKUyiJeckpYTQBnqKROo4="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/utapyngo/pytest-unordered"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-vcr/default.nix b/python/pkgs/pytest-vcr/default.nix index 28dee9ce5..2128da15b 100644 --- a/python/pkgs/pytest-vcr/default.nix +++ b/python/pkgs/pytest-vcr/default.nix @@ -2,29 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytest, vcrpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-vcr"; version = "1.0.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ktosiek"; repo = "pytest-vcr"; - rev = version; + tag = finalAttrs.version; sha256 = "1i6fin91mklvbi8jzfiswvwf1m91f43smpj36a17xrzk4gisfs6i"; }; + build-system = [ setuptools ]; + buildInputs = [ pytest ]; - propagatedBuildInputs = [ vcrpy ]; + dependencies = [ vcrpy ]; # Tests are using an obsolete attribute 'config' # https://github.com/ktosiek/pytest-vcr/issues/43 - doCheck = false; pythonImportsCheck = [ "pytest_vcr" ]; meta = { @@ -32,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/ktosiek/pytest-vcr"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-watch/default.nix b/python/pkgs/pytest-watch/default.nix index fea282491..982209f4e 100644 --- a/python/pkgs/pytest-watch/default.nix +++ b/python/pkgs/pytest-watch/default.nix @@ -9,13 +9,13 @@ watchdog, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-watch"; version = "4.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BhNvA9WzYXGLjQ0jQEL3svIDkQ2FaPY98vhmtUez1Lk="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/joeyespo/pytest-watch"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-xdist/default.nix b/python/pkgs/pytest-xdist/default.nix index 3ab366e75..56325b839 100644 --- a/python/pkgs/pytest-xdist/default.nix +++ b/python/pkgs/pytest-xdist/default.nix @@ -11,7 +11,7 @@ setproctitle, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-xdist"; version = "3.8.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-xdist"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2x3znm92wo8DCshf5sYK0stnESg0oVXbxsWRAaTj6oQ="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-xdist"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest-xprocess/default.nix b/python/pkgs/pytest-xprocess/default.nix index 497f9691d..84e43617d 100644 --- a/python/pkgs/pytest-xprocess/default.nix +++ b/python/pkgs/pytest-xprocess/default.nix @@ -8,13 +8,13 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-xprocess"; version = "1.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-FeJwY3WG6rxWdV7l/MgcSL20a6fvfA1bG2QwLQgMxg8="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest/7.nix b/python/pkgs/pytest/7.nix index b73029b70..75367ecee 100644 --- a/python/pkgs/pytest/7.nix +++ b/python/pkgs/pytest/7.nix @@ -24,83 +24,79 @@ xmlschema, }: -let - self = buildPythonPackage rec { - pname = "pytest"; - version = "7.4.4"; - pyproject = true; +buildPythonPackage (finalAttrs: { + pname = "pytest"; + version = "7.4.4"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-LPAAWSLGrOSj4uyLQIDrDZdT/ckxB0FTMvUM6eeZQoA="; - }; + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-LPAAWSLGrOSj4uyLQIDrDZdT/ckxB0FTMvUM6eeZQoA="; + }; - outputs = [ - "out" - "testout" - ]; + outputs = [ + "out" + "testout" + ]; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ - iniconfig - packaging - pluggy - ]; + dependencies = [ + iniconfig + packaging + pluggy + ]; - optional-dependencies = { - testing = [ - argcomplete - attrs - hypothesis - mock - pygments - requests - setuptools - xmlschema - ]; - }; + optional-dependencies = { + testing = [ + argcomplete + attrs + hypothesis + mock + pygments + requests + setuptools + xmlschema + ]; + }; - postInstall = '' - mkdir $testout - cp -R testing $testout/testing - ''; + postInstall = '' + mkdir $testout + cp -R testing $testout/testing + ''; - doCheck = false; - passthru.tests.pytest = callPackage ./tests.nix { pytest = self; }; + passthru.tests.pytest = callPackage ./tests.nix { pytest = self; }; - # Remove .pytest_cache when using py.test in a Nix build - setupHook = writeText "pytest-hook" '' - pytestcachePhase() { - find $out -name .pytest_cache -type d -exec rm -rf {} + - } - appendToVar preDistPhases pytestcachePhase + # Remove .pytest_cache when using py.test in a Nix build + setupHook = writeText "pytest-hook" '' + pytestcachePhase() { + find $out -name .pytest_cache -type d -exec rm -rf {} + + } + appendToVar preDistPhases pytestcachePhase - # pytest generates it's own bytecode files to improve assertion messages. - # These files similar to cpython's bytecode files but are never laoded - # by python interpreter directly. We remove them for a few reasons: - # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292 - # (file headers are generatedt by pytest directly and contain timestamps) - # - files are not needed after tests are finished - pytestRemoveBytecodePhase () { - # suffix is defined at: - # https://github.com/pytest-dev/pytest/blob/7.2.1/src/_pytest/assertion/rewrite.py#L51-L53 - find $out -name "*-pytest-*.py[co]" -delete - } - appendToVar preDistPhases pytestRemoveBytecodePhase - ''; + # pytest generates it's own bytecode files to improve assertion messages. + # These files similar to cpython's bytecode files but are never laoded + # by python interpreter directly. We remove them for a few reasons: + # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292 + # (file headers are generatedt by pytest directly and contain timestamps) + # - files are not needed after tests are finished + pytestRemoveBytecodePhase () { + # suffix is defined at: + # https://github.com/pytest-dev/pytest/blob/7.2.1/src/_pytest/assertion/rewrite.py#L51-L53 + find $out -name "*-pytest-*.py[co]" -delete + } + appendToVar preDistPhases pytestRemoveBytecodePhase + ''; - pythonImportsCheck = [ "pytest" ]; + pythonImportsCheck = [ "pytest" ]; - meta = { - description = "Framework for writing tests"; - homepage = "https://docs.pytest.org"; - changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}"; - license = lib.licenses.mit; - }; + meta = { + description = "Framework for writing tests"; + homepage = "https://docs.pytest.org"; + changelog = "https://github.com/pytest-dev/pytest/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; }; -in -self +}) diff --git a/python/pkgs/pytest/8_3.nix b/python/pkgs/pytest/8_3.nix index eb4458c01..ba3204217 100644 --- a/python/pkgs/pytest/8_3.nix +++ b/python/pkgs/pytest/8_3.nix @@ -24,13 +24,13 @@ xmlschema, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest"; version = "8.3.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-9O/nDMFOURVlrEdrV8J54SqFWxH0jyEq8QgO8iY9OEU="; }; @@ -68,7 +68,6 @@ buildPythonPackage rec { cp -R testing $testout/testing ''; - doCheck = false; passthru.tests.pytest = callPackage ./tests.nix { }; # Remove .pytest_cache when using py.test in a Nix build @@ -97,7 +96,7 @@ buildPythonPackage rec { meta = { description = "Framework for writing tests"; homepage = "https://docs.pytest.org"; - changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}"; + changelog = "https://github.com/pytest-dev/pytest/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest/9_0.nix b/python/pkgs/pytest/9_0.nix index b07d5d438..94e31f11a 100644 --- a/python/pkgs/pytest/9_0.nix +++ b/python/pkgs/pytest/9_0.nix @@ -24,13 +24,13 @@ xmlschema, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest"; version = "9.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uGraUIr4HRnt6yE8aBsdSCRsGpHTBMbIGkJ2dMF+uRw="; }; @@ -68,7 +68,6 @@ buildPythonPackage rec { cp -R testing $testout/testing ''; - doCheck = false; passthru.tests.pytest = callPackage ./tests.nix { }; # Remove .pytest_cache when using py.test in a Nix build @@ -97,7 +96,7 @@ buildPythonPackage rec { meta = { description = "Framework for writing tests"; homepage = "https://docs.pytest.org"; - changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}"; + changelog = "https://github.com/pytest-dev/pytest/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest/default.nix b/python/pkgs/pytest/default.nix index 5865ab588..2fa040af6 100644 --- a/python/pkgs/pytest/default.nix +++ b/python/pkgs/pytest/default.nix @@ -24,13 +24,13 @@ xmlschema, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest"; version = "9.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-EIj73o8rSdlaVJoZVwevp6dqPOm8rcJrbXHw/9pf4xM="; }; @@ -68,7 +68,6 @@ buildPythonPackage rec { cp -R testing $testout/testing ''; - doCheck = false; passthru.tests.pytest = callPackage ./tests.nix { }; # Remove .pytest_cache when using py.test in a Nix build @@ -99,4 +98,4 @@ buildPythonPackage rec { homepage = "https://docs.pytest.org"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytest/tests.nix b/python/pkgs/pytest/tests.nix index 586f94a3f..284258447 100644 --- a/python/pkgs/pytest/tests.nix +++ b/python/pkgs/pytest/tests.nix @@ -4,7 +4,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-tests"; inherit (pytest) version; pyproject = false; @@ -28,10 +28,10 @@ buildPythonPackage rec { -k "not test_collect_pyargs_with_testpaths and not test_missing_required_plugins" # tests leave behind unreproducible pytest binaries in the output directory, remove: - find $out/lib -name "*-pytest-${version}.pyc" -delete + find $out/lib -name "*-pytest-${finalAttrs.version}.pyc" -delete # specifically testing/test_assertion.py and testing/test_assertrewrite.py leave behind those: find $out/lib -name "*opt-2.pyc" -delete runHook postCheck ''; -} +}) diff --git a/python/pkgs/pytestcache/default.nix b/python/pkgs/pytestcache/default.nix index 4e605bd72..6580cf556 100644 --- a/python/pkgs/pytestcache/default.nix +++ b/python/pkgs/pytestcache/default.nix @@ -7,14 +7,14 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytestcache"; version = "1.0"; pyproject = true; src = fetchPypi { pname = "pytest-cache"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-vnRo7dTT2D8ehElZ/W4/0o53pIFECnEY1DATDqMbB6k="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/pytest-cache/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-arango/default.nix b/python/pkgs/python-arango/default.nix index 983af97da..788dfb9f5 100644 --- a/python/pkgs/python-arango/default.nix +++ b/python/pkgs/python-arango/default.nix @@ -26,7 +26,7 @@ let }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-arango"; version = "8.3.5"; pyproject = true; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arangodb"; repo = "python-arango"; - tag = version; + tag = finalAttrs.version; hash = "sha256-GHpmWQKvF0gKoemytiAkMQfd3vBWlrRzSSveSE/5PAo="; }; @@ -43,7 +43,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ importlib-metadata requests requests-toolbelt @@ -65,7 +65,6 @@ buildPythonPackage rec { # nonetheless, the client library should remain in nixpkgs - since # the client library will talk to arangodb across the network and # architecture issues will be irrelevant. - doCheck = false; #preCheck = lib.optionalString doCheck '' # # Start test DB @@ -95,4 +94,4 @@ buildPythonPackage rec { homepage = "https://github.com/ArangoDB-Community/python-arango"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-axolotl-curve25519/default.nix b/python/pkgs/python-axolotl-curve25519/default.nix index 08103355d..177127e04 100644 --- a/python/pkgs/python-axolotl-curve25519/default.nix +++ b/python/pkgs/python-axolotl-curve25519/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-axolotl-curve25519"; version = "0.4.1.post2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3"; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { description = "Curve25519 with ed25519 signatures"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/python-bidi/default.nix b/python/pkgs/python-bidi/default.nix index 065318f78..bff6f53f5 100644 --- a/python/pkgs/python-bidi/default.nix +++ b/python/pkgs/python-bidi/default.nix @@ -6,7 +6,7 @@ libiconv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-bidi"; version = "0.6.11"; pyproject = true; @@ -14,12 +14,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MeirKriheli"; repo = "python-bidi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sDr/i7MC3aNAzl/+cDbstS5QBdQqVtaLlG09qsl7krU="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-djfKvD7+JEV65xvk0AgRBUMBSWrEGcsgIh/vJh3+lJs="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { gpl3Only ]; }; -} +}) diff --git a/python/pkgs/python-box/default.nix b/python/pkgs/python-box/default.nix index 0d1ad16c0..b3bc8f586 100644 --- a/python/pkgs/python-box/default.nix +++ b/python/pkgs/python-box/default.nix @@ -11,7 +11,7 @@ tomli-w, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-box"; version = "7.4.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cdgriffith"; repo = "Box"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tzkTiuH9zBUFYXda6iv4Ohh72WBVcW/BykMS5W7BPPo="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/cdgriffith/Box"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-bugzilla/default.nix b/python/pkgs/python-bugzilla/default.nix index 2999c6979..6e89d96a3 100644 --- a/python/pkgs/python-bugzilla/default.nix +++ b/python/pkgs/python-bugzilla/default.nix @@ -5,14 +5,14 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-bugzilla"; version = "3.3.0"; pyproject = true; src = fetchPypi { pname = "python_bugzilla"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-4YIgFx4DPrO6YAxNE5NZ0BqhrOwdrrxDCJEORQdj3kc="; }; @@ -20,4 +20,4 @@ buildPythonPackage rec { dependencies = [ requests ]; -} +}) diff --git a/python/pkgs/python-calamine/default.nix b/python/pkgs/python-calamine/default.nix index c11ce1b4d..09dd8da46 100644 --- a/python/pkgs/python-calamine/default.nix +++ b/python/pkgs/python-calamine/default.nix @@ -10,7 +10,7 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-calamine"; version = "0.6.0"; pyproject = true; @@ -18,12 +18,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dimastbk"; repo = "python-calamine"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vPI2SWOMwEpN0w7BWvFFz1eeXiU9t4xhdl3TpO39l/Q="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-DR84RulbTpwipYKHLtXdCa8Yr2Irv1W1o3NrCT8FRq4="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "python-calamine"; }; -} +}) diff --git a/python/pkgs/python-can/default.nix b/python/pkgs/python-can/default.nix index c669e4a33..b2e3ba163 100644 --- a/python/pkgs/python-can/default.nix +++ b/python/pkgs/python-can/default.nix @@ -17,7 +17,7 @@ uptime, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-can"; version = "4.6.1"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hardbyte"; repo = "python-can"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yF/Ir9FUf9Q8GINeT0H4SixzZGetqumU5N6O3GT3M6A="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://python-can.readthedocs.io"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/python-constraint/default.nix b/python/pkgs/python-constraint/default.nix index 819c74111..050a713b0 100644 --- a/python/pkgs/python-constraint/default.nix +++ b/python/pkgs/python-constraint/default.nix @@ -7,7 +7,7 @@ cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-constraint"; version = "2.5.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-constraint"; repo = "python-constraint"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-VTecK82VSDoUOkPnuC+PnQYPjPBsaPeWCqm2st6Wwvg="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { downloadPage = "https://github.com/python-constraint/python-constraint/releases"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/python-crfsuite/default.nix b/python/pkgs/python-crfsuite/default.nix index 69ef30d1b..054801e53 100644 --- a/python/pkgs/python-crfsuite/default.nix +++ b/python/pkgs/python-crfsuite/default.nix @@ -5,13 +5,13 @@ cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-crfsuite"; version = "0.9.12"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "python_crfsuite"; hash = "sha256-2zf8zDvY8MScKKdpfKecidZ7P9W/EZEihmFpJArExIA="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/scrapinghub/python-crfsuite"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-crontab/default.nix b/python/pkgs/python-crontab/default.nix index dbaefe2f7..1d261b574 100644 --- a/python/pkgs/python-crontab/default.nix +++ b/python/pkgs/python-crontab/default.nix @@ -10,14 +10,14 @@ python-dateutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-crontab"; version = "3.4.0"; pyproject = true; src = fetchPypi { pname = "python_crontab"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-0rWtkfemQdd0Zht/O6UiWP1oJzhiyIcT9MwJK6YU5wc="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/doctormo/python-crontab/"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/python-daemon/default.nix b/python/pkgs/python-daemon/default.nix index a9e383ab2..02d75eb1c 100644 --- a/python/pkgs/python-daemon/default.nix +++ b/python/pkgs/python-daemon/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-daemon"; version = "3.1.2"; pyproject = true; src = fetchPypi { pname = "python_daemon"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-97BDNa3Ec96Hf1EX4m1fEUL0yffNdlQI8Id3V75a+/Q="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { asl20 ]; }; -} +}) diff --git a/python/pkgs/python-dateutil/default.nix b/python/pkgs/python-dateutil/default.nix index 0be0b9383..382f6559a 100644 --- a/python/pkgs/python-dateutil/default.nix +++ b/python/pkgs/python-dateutil/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-dateutil"; version = "2.9.0.post0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-N91UII2n4c2HU4ghfV4A69QXkkn5D7ckN+kaNUWaCtM="; }; @@ -23,10 +23,9 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ six ]; + dependencies = [ six ]; # cyclic dependency: tests need freezegun, which depends on python-dateutil - doCheck = false; pythonImportsCheck = [ "dateutil.easter" @@ -46,4 +45,4 @@ buildPythonPackage rec { bsd3 ]; }; -} +}) diff --git a/python/pkgs/python-dbusmock/default.nix b/python/pkgs/python-dbusmock/default.nix index b8b89c5d4..cb1210695 100644 --- a/python/pkgs/python-dbusmock/default.nix +++ b/python/pkgs/python-dbusmock/default.nix @@ -22,7 +22,7 @@ let ln -s "${bluez.test}/test/pbap-client" "$out/bin/pbap-client" ''; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-dbusmock"; version = "0.38.1"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "martinpitt"; repo = "python-dbusmock"; - tag = version; + tag = finalAttrs.version; hash = "sha256-nOsTgeZC0qvPOwx0woZZDxDxZm1ODG/bwltBhRCT8vY="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl3Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/python-decouple/default.nix b/python/pkgs/python-decouple/default.nix index 2649a5e49..796f8d0c5 100644 --- a/python/pkgs/python-decouple/default.nix +++ b/python/pkgs/python-decouple/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-decouple"; version = "3.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "HBNetwork"; repo = "python-decouple"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-F9Gu7Y/dJhwOJi/ZaoVclF3+4U/N5JdvpXwgGB3SF3Q="; }; + + build-system = [ setuptools ]; pythonImportsCheck = [ "decouple" ]; meta = { @@ -23,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/HBNetwork/python-decouple"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-didl-lite/default.nix b/python/pkgs/python-didl-lite/default.nix index 90578b708..509cecd93 100644 --- a/python/pkgs/python-didl-lite/default.nix +++ b/python/pkgs/python-didl-lite/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-didl-lite"; version = "1.5.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "StevenLooman"; repo = "python-didl-lite"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kzE3k1GXn+6dZTiywr4YYBrjmWY13ZQSRWL4N882+7U="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/StevenLooman/python-didl-lite"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/python-discovery/default.nix b/python/pkgs/python-discovery/default.nix index 8fec43ae3..241348070 100644 --- a/python/pkgs/python-discovery/default.nix +++ b/python/pkgs/python-discovery/default.nix @@ -19,7 +19,6 @@ buildPythonPackage (finalAttrs: { pname = "python-discovery"; version = "1.6.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "tox-dev"; diff --git a/python/pkgs/python-docx/default.nix b/python/pkgs/python-docx/default.nix index 24da84efb..a8ea59995 100644 --- a/python/pkgs/python-docx/default.nix +++ b/python/pkgs/python-docx/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-docx"; version = "1.2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-openxml"; repo = "python-docx"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5x2VmMiY5fZiXoswCDcs89olL0vbpGzmJZThrNS/SmI="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://python-docx.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-dotenv/default.nix b/python/pkgs/python-dotenv/default.nix index de8239d8c..0b4c84588 100644 --- a/python/pkgs/python-dotenv/default.nix +++ b/python/pkgs/python-dotenv/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-dotenv"; version = "1.2.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "theskumar"; repo = "python-dotenv"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SfLmKAvMRbeNJOwTYiPf4dAXLxXLnwkDIRex4hai0j0="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/theskumar/python-dotenv"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/python-editor/default.nix b/python/pkgs/python-editor/default.nix index 25704be86..1037af825 100644 --- a/python/pkgs/python-editor/default.nix +++ b/python/pkgs/python-editor/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-editor"; version = "1.0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Uf2mvMXdu7cGOyr3UJ5DvYS/wypP9xNJ7HhHcTiCMns="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { description = "Programmatically open an editor, capture the result"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/python-engineio/default.nix b/python/pkgs/python-engineio/default.nix index 46ca28a82..85ffa14a0 100644 --- a/python/pkgs/python-engineio/default.nix +++ b/python/pkgs/python-engineio/default.nix @@ -6,14 +6,14 @@ simple-websocket, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-engineio"; version = "4.14.0"; pyproject = true; src = fetchPypi { pname = "python_engineio"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-6qHjhrr5wseVnu9/nZFlxeqRDFs5L1MW540p7Qc8tD0="; }; @@ -21,8 +21,6 @@ buildPythonPackage rec { dependencies = [ simple-websocket ]; - doCheck = false; - pythonImportsCheck = [ "engineio" ]; meta = { @@ -30,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/miguelgrinberg/python-engineio/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-frontmatter/default.nix b/python/pkgs/python-frontmatter/default.nix index 7eaf27580..7b94fc331 100644 --- a/python/pkgs/python-frontmatter/default.nix +++ b/python/pkgs/python-frontmatter/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-frontmatter"; version = "1.3.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "eyeseast"; repo = "python-frontmatter"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-b/ruWPPiKvDzMjcVhxiBtnAaMNWnWvy1v8GZxGeibyY="; }; @@ -39,7 +39,6 @@ buildPythonPackage rec { # tries to import test.test, which conflicts with module # exported by python interpreter - doCheck = false; pythonImportsCheck = [ "frontmatter" ]; meta = { @@ -48,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/python-gitlab/default.nix b/python/pkgs/python-gitlab/default.nix index fe747c3a7..f9b2375db 100644 --- a/python/pkgs/python-gitlab/default.nix +++ b/python/pkgs/python-gitlab/default.nix @@ -7,14 +7,14 @@ requests-toolbelt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-gitlab"; version = "8.5.0"; pyproject = true; src = fetchPypi { pname = "python_gitlab"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-YoUp7Ezh+ae6LBRbLPXk7sowFUGOUEsub7pwFxtrG1k="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-gitlab/python-gitlab"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/python-gnupg/default.nix b/python/pkgs/python-gnupg/default.nix index be5cbe6d8..5d1cec822 100644 --- a/python/pkgs/python-gnupg/default.nix +++ b/python/pkgs/python-gnupg/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-gnupg"; version = "0.5.6"; pyproject = true; src = fetchPypi { pname = "python_gnupg"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-V0PpYhLTiSP8GQg4EtwSeQfkTb07zw201lfikdPCHqw="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { description = "API for the GNU Privacy Guard (GnuPG)"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/python-hcl2/default.nix b/python/pkgs/python-hcl2/default.nix index 89832517b..60be4ad0c 100644 --- a/python/pkgs/python-hcl2/default.nix +++ b/python/pkgs/python-hcl2/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-hcl2"; version = "8.1.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amplify-education"; repo = "python-hcl2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hqGl9H0qwqPhBWD/KUkLklMVuUCENdCOWs6QtePloyQ="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/amplify-education/python-hcl2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-hglib/default.nix b/python/pkgs/python-hglib/default.nix index 1c1fccb0a..4279ce1a0 100644 --- a/python/pkgs/python-hglib/default.nix +++ b/python/pkgs/python-hglib/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-hglib"; version = "2.6.2"; pyproject = true; src = fetchzip { - url = "https://repo.mercurial-scm.org/python-hglib/archive/${version}.tar.gz"; + url = "https://repo.mercurial-scm.org/python-hglib/archive/${finalAttrs.version}.tar.gz"; hash = "sha256-UXersegqJ9VAxy4Kvpb2IiOJfQbWryeeaGvwiR4ncW8="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://www.mercurial-scm.org/wiki/PythonHglibs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-http-client/default.nix b/python/pkgs/python-http-client/default.nix index a734e56b0..21386caa7 100644 --- a/python/pkgs/python-http-client/default.nix +++ b/python/pkgs/python-http-client/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-http-client"; version = "3.3.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "sendgrid"; repo = "python-http-client"; - rev = version; + tag = finalAttrs.version; hash = "sha256-8Qs5Jw0LMV2UucLnlFKJQ2PUhYaQx6uJdIV/4gaPH3w="; }; + + build-system = [ setuptools ]; pythonImportsCheck = [ "python_http_client" ]; meta = { @@ -23,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/sendgrid/python-http-client"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-ipware/default.nix b/python/pkgs/python-ipware/default.nix index 511fc37a4..a7d048b99 100644 --- a/python/pkgs/python-ipware/default.nix +++ b/python/pkgs/python-ipware/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-ipware"; version = "3.0.0"; pyproject = true; src = fetchPypi { pname = "python_ipware"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-kRexxN3ctdXKSeapYX3i/Gauwu81OUVjrE7sq99YwGI="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/un33k/python-ipware"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-jenkins/default.nix b/python/pkgs/python-jenkins/default.nix index a5afe02f3..0803c14cf 100644 --- a/python/pkgs/python-jenkins/default.nix +++ b/python/pkgs/python-jenkins/default.nix @@ -10,14 +10,14 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-jenkins"; version = "1.8.3"; pyproject = true; src = fetchPypi { pname = "python_jenkins"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-j0dhw5GsEejB8j93EBCSDBBEBJdwWrcXXVI1j1oS3Jg="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/python-jenkins/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/python-jose/default.nix b/python/pkgs/python-jose/default.nix index 3df6a73ea..ff3e8a29f 100644 --- a/python/pkgs/python-jose/default.nix +++ b/python/pkgs/python-jose/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-jose"; version = "3.5.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mpdavis"; repo = "python-jose"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8DQ0RBQ4ZgEIwcosgX3dzr928cYIQoH0obIOgk0+Ozs="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/mpdavis/python-jose"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-json-logger/default.nix b/python/pkgs/python-json-logger/default.nix index 0b9509589..84ffb76cc 100644 --- a/python/pkgs/python-json-logger/default.nix +++ b/python/pkgs/python-json-logger/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-json-logger"; version = "4.2.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nhairs"; repo = "python-json-logger"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1ir27G7JWq/uOuzv7eOqdXOs8UFxWVeqoPRypysv0AU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/madzak/python-json-logger"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/python-keystoneclient/default.nix b/python/pkgs/python-keystoneclient/default.nix index 90e8279f4..ef5078370 100644 --- a/python/pkgs/python-keystoneclient/default.nix +++ b/python/pkgs/python-keystoneclient/default.nix @@ -9,14 +9,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-keystoneclient"; version = "6.0.0"; pyproject = true; src = fetchPypi { pname = "python_keystoneclient"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-1qw6Ca3yMZqqxXKOO/fL6vlSwpW9eDHx35pXOyX7z4I="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/python-keystoneclient"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/python-louvain/default.nix b/python/pkgs/python-louvain/default.nix index 4ee993a17..37760f5a9 100644 --- a/python/pkgs/python-louvain/default.nix +++ b/python/pkgs/python-louvain/default.nix @@ -3,20 +3,24 @@ fetchPypi, buildPythonPackage, fetchpatch, + # build-system + setuptools, networkx, numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-louvain"; version = "0.16"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-t7ot9QAv0o0+54mklTK6rRH+ZI5PIRfPB5jnUgodpWs="; }; + build-system = [ setuptools ]; + patches = [ # Fix test_karate (fetchpatch { @@ -26,7 +30,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + dependencies = [ networkx numpy ]; @@ -39,4 +43,4 @@ buildPythonPackage rec { mainProgram = "community"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/python-lsp-black/default.nix b/python/pkgs/python-lsp-black/default.nix index b46a437b5..a77ea6fe2 100644 --- a/python/pkgs/python-lsp-black/default.nix +++ b/python/pkgs/python-lsp-black/default.nix @@ -10,7 +10,7 @@ python-lsp-server, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-lsp-black"; version = "2.0.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-lsp"; repo = "python-lsp-black"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nV6mePSWzfPW2RwXg/mxgzfT9wD95mmTuPnPEro1kEY="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { description = "Black plugin for the Python LSP Server"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-lsp-jsonrpc/default.nix b/python/pkgs/python-lsp-jsonrpc/default.nix index 6835f5435..2a9630fba 100644 --- a/python/pkgs/python-lsp-jsonrpc/default.nix +++ b/python/pkgs/python-lsp-jsonrpc/default.nix @@ -8,7 +8,7 @@ ujson, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-lsp-jsonrpc"; version = "1.1.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-lsp"; repo = "python-lsp-jsonrpc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5WN/31e6WCgXVzevMuQbNjyo/2jjWDF+m48nrLKS+64="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ ujson ]; + dependencies = [ ujson ]; pythonImportsCheck = [ "pylsp_jsonrpc" ]; meta = { @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-lsp/python-lsp-jsonrpc"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-lsp-server/default.nix b/python/pkgs/python-lsp-server/default.nix index 38bb4f844..a2f4789df 100644 --- a/python/pkgs/python-lsp-server/default.nix +++ b/python/pkgs/python-lsp-server/default.nix @@ -27,7 +27,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-lsp-server"; version = "1.14.0"; pyproject = true; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-lsp"; repo = "python-lsp-server"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Yq5dYaX+/hLvmPpHI8rhCcSlabQBPAyUrIQRgnoi17c="; }; @@ -100,4 +100,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "pylsp"; }; -} +}) diff --git a/python/pkgs/python-lzo/default.nix b/python/pkgs/python-lzo/default.nix index b50f24fb2..272be0591 100644 --- a/python/pkgs/python-lzo/default.nix +++ b/python/pkgs/python-lzo/default.nix @@ -7,7 +7,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-lzo"; version = "1.16"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jd-boyd"; repo = "python-lzo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iXAvOCzHPvNERMkE5y4QTHi4ZieW1wrYWYScs7zyb2c="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/jd-boyd/python-lzo"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/python-magic/default.nix b/python/pkgs/python-magic/default.nix index 1e9565609..96325388f 100644 --- a/python/pkgs/python-magic/default.nix +++ b/python/pkgs/python-magic/default.nix @@ -6,13 +6,13 @@ file, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-magic"; version = "0.4.27"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-wboUsI5KX1wxowK3chI5aVsvDwWNElvVzh7ja52dPDs="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { description = "Python interface to the libmagic file type identification library"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-markdown-math/default.nix b/python/pkgs/python-markdown-math/default.nix index b695c0303..b2d75e8c4 100644 --- a/python/pkgs/python-markdown-math/default.nix +++ b/python/pkgs/python-markdown-math/default.nix @@ -6,7 +6,7 @@ markdown, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-markdown-math"; version = "0.9"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mitya57"; repo = "python-markdown-math"; - tag = version; + tag = finalAttrs.version; hash = "sha256-m/i43lvOehZSazHXhoAZTRSB5BQgn2VFjXADxSKeXfs="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/mitya57/python-markdown-math"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/python-memcached/default.nix b/python/pkgs/python-memcached/default.nix index c6bec4aa6..52152782a 100644 --- a/python/pkgs/python-memcached/default.nix +++ b/python/pkgs/python-memcached/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-memcached"; version = "1.62"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "linsomniac"; repo = "python-memcached"; - rev = version; + tag = finalAttrs.version; hash = "sha256-Qko4Qr9WofeklU0uRRrSPrT8YaBYMCy0GP+TF7YZHLI="; }; postPatch = '' substituteInPlace memcache.py \ - --replace-fail '__version__ = "1.60"' '__version__ = "${version}"' + --replace-fail '__version__ = "1.60"' '__version__ = "${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/linsomniac/python-memcached"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/python-mimeparse/default.nix b/python/pkgs/python-mimeparse/default.nix index 58b35e7b1..a85ba1db0 100644 --- a/python/pkgs/python-mimeparse/default.nix +++ b/python/pkgs/python-mimeparse/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-mimeparse"; version = "2.0.0"; pyproject = true; src = fetchPypi { pname = "python_mimeparse"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-W5qdz3qoJGXjG9Zn9ctwAGBIEdzoNVTxyKQ2k6MsswM="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { description = "Basic functions for parsing mime-type names and matching them against a list of media-ranges"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-nmap/default.nix b/python/pkgs/python-nmap/default.nix index f44510343..49532ec6d 100644 --- a/python/pkgs/python-nmap/default.nix +++ b/python/pkgs/python-nmap/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, nmap, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-nmap"; version = "0.7.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-91r2uR3Y47DDH4adsyFj9iraaGlF5bfCX4S8D3+tO2Q="; }; - propagatedBuildInputs = [ nmap ]; + build-system = [ setuptools ]; + + dependencies = [ nmap ]; postPatch = '' substituteInPlace setup.cfg \ @@ -29,4 +33,4 @@ buildPythonPackage rec { homepage = "https://xael.org/pages/python-nmap-en.html"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/python-nvd3/default.nix b/python/pkgs/python-nvd3/default.nix index 2d0b19ed2..916d2c4e4 100644 --- a/python/pkgs/python-nvd3/default.nix +++ b/python/pkgs/python-nvd3/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-nvd3"; version = "0.16.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "areski"; repo = "python-nvd3"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+J0lHAOjX3hbymjESQ6WpEnly+1Lv9o0ucIpBxTuS6s="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "nvd3"; }; -} +}) diff --git a/python/pkgs/python-on-whales/default.nix b/python/pkgs/python-on-whales/default.nix index f62e18b8d..722d603c5 100644 --- a/python/pkgs/python-on-whales/default.nix +++ b/python/pkgs/python-on-whales/default.nix @@ -10,7 +10,7 @@ pydantic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-on-whales"; version = "0.81.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gabrieldemarmiesse"; repo = "python-on-whales"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aCIKWrOg+tzI9KJWcBK0ElssgOdxU/RTXgDOhSlBG3g="; }; @@ -28,8 +28,6 @@ buildPythonPackage rec { pydantic ]; - doCheck = false; # majority of tests require Docker and/or network access - pythonImportsCheck = [ "python_on_whales" ]; meta = { @@ -37,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/gabrieldemarmiesse/python-on-whales"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-oxmsg/default.nix b/python/pkgs/python-oxmsg/default.nix index 83c9a9452..60d5c48a4 100644 --- a/python/pkgs/python-oxmsg/default.nix +++ b/python/pkgs/python-oxmsg/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-oxmsg"; version = "0.0.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scanny"; repo = "python-oxmsg"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ramM27+SylBeJyb3kkRm1xn3qAefiLuBOvI/iucK2wM="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "oxmsg"; }; -} +}) diff --git a/python/pkgs/python-pam/default.nix b/python/pkgs/python-pam/default.nix index 7879179c0..3574317f4 100644 --- a/python/pkgs/python-pam/default.nix +++ b/python/pkgs/python-pam/default.nix @@ -8,7 +8,7 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-pam"; version = "2.0.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "FirefighterBlu3"; repo = "python-pam"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MR9LYXtkbltAmn7yoyyKZn4yMHyh3rj/i/pA8nJy2xU="; }; @@ -30,7 +30,7 @@ buildPythonPackage rec { buildInputs = [ pam ]; - propagatedBuildInputs = [ + dependencies = [ six toml ]; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/FirefighterBlu3/python-pam"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-periphery/default.nix b/python/pkgs/python-periphery/default.nix index 360b2e72d..4bc99d7e0 100644 --- a/python/pkgs/python-periphery/default.nix +++ b/python/pkgs/python-periphery/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-periphery"; version = "2.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-YdRh1zaYKm92boeHIKsQpoFR4ujBCGYA2TiaxH5A6Io="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Linux Peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) with Python 2 & 3"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-pkcs11/default.nix b/python/pkgs/python-pkcs11/default.nix index 750df9cac..efd4ad0df 100644 --- a/python/pkgs/python-pkcs11/default.nix +++ b/python/pkgs/python-pkcs11/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-pkcs11"; version = "0.10.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danni"; repo = "python-pkcs11"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-GhBpqVVdN1pD2zjlXxtHACIoP9Bw44rzT+w+sGO7PV0="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { ]; # Test require additional setup - doCheck = false; pythonImportsCheck = [ "pkcs11" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/danni/python-pkcs11"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-poppler/default.nix b/python/pkgs/python-poppler/default.nix index dc0b8b5d0..0c611911a 100644 --- a/python/pkgs/python-poppler/default.nix +++ b/python/pkgs/python-poppler/default.nix @@ -9,13 +9,13 @@ pybind11, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-poppler"; version = "0.4.1"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "python_poppler"; hash = "sha256-5spcI+wCNQvyzvhaa/nxsmF5ZDbbR4F2+dJPsU7uzGo="; }; @@ -37,7 +37,7 @@ buildPythonPackage rec { pkg-config ]; - propagatedBuildInputs = [ poppler ]; + dependencies = [ poppler ]; pythonImportsCheck = [ "poppler" ]; @@ -48,4 +48,4 @@ buildPythonPackage rec { # https://github.com/cbrunet/python-poppler/issues/90 license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/python-pptx/default.nix b/python/pkgs/python-pptx/default.nix index 7368cb429..f9ba80496 100644 --- a/python/pkgs/python-pptx/default.nix +++ b/python/pkgs/python-pptx/default.nix @@ -9,7 +9,7 @@ xlsxwriter, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-pptx"; version = "1.0.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scanny"; repo = "python-pptx"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KyBttTAtP8sVPjYdrY0XReB+4Xfru8GdyYWuiyNZ67w="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/scanny/python-pptx"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-pskc/default.nix b/python/pkgs/python-pskc/default.nix index 679254e4f..2627a71eb 100644 --- a/python/pkgs/python-pskc/default.nix +++ b/python/pkgs/python-pskc/default.nix @@ -10,7 +10,7 @@ signxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-pskc"; version = "1.4"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arthurdejong"; repo = "python-pskc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WBpS0EJA4arAn7O47ZHq3sBOd9D4tjYZKIi24xX5Hvs="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/arthurdejong/python-pskc"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/python-ptrace/default.nix b/python/pkgs/python-ptrace/default.nix index 1a5585e9f..5554621d6 100644 --- a/python/pkgs/python-ptrace/default.nix +++ b/python/pkgs/python-ptrace/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-ptrace"; version = "0.9.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Vrv+9E6vOne+SBOMyldnzfRx6CeP4Umfm3LxUZB/Jc8="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/vstinner/python-ptrace"; license = lib.licenses.gpl2; }; -} +}) diff --git a/python/pkgs/python-rapidjson/default.nix b/python/pkgs/python-rapidjson/default.nix index f3dbb3336..7925d974f 100644 --- a/python/pkgs/python-rapidjson/default.nix +++ b/python/pkgs/python-rapidjson/default.nix @@ -7,7 +7,7 @@ replaceVars, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "1.23"; pname = "python-rapidjson"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-rapidjson"; repo = "python-rapidjson"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BlEmEvwGAm3Ix2YwJSwrxgqqANqmgiWRiRWP91JITio="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { description = "Python wrapper around rapidjson"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-slugify/default.nix b/python/pkgs/python-slugify/default.nix index ef2d3c9fc..56f4568bd 100644 --- a/python/pkgs/python-slugify/default.nix +++ b/python/pkgs/python-slugify/default.nix @@ -6,7 +6,7 @@ text-unidecode, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-slugify"; version = "8.0.4"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "un33k"; repo = "python-slugify"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zReUMIkItnDot3XyYCoPUNHrrAllbClWFYcxdTy3A30="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ text-unidecode ]; + dependencies = [ text-unidecode ]; pythonImportsCheck = [ "slugify" ]; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/un33k/python-slugify"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-snappy/default.nix b/python/pkgs/python-snappy/default.nix index d0ed5f685..e0da8d05b 100644 --- a/python/pkgs/python-snappy/default.nix +++ b/python/pkgs/python-snappy/default.nix @@ -7,14 +7,14 @@ snappy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-snappy"; version = "0.7.3"; pyproject = true; src = fetchPypi { pname = "python_snappy"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-QCFsG637LTiseB7LFiodDsQPjul0fmELz+/fp5SGzuM="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/intake/python-snappy"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/python-socketio/default.nix b/python/pkgs/python-socketio/default.nix index c0a6d13d3..4ffd7ec15 100644 --- a/python/pkgs/python-socketio/default.nix +++ b/python/pkgs/python-socketio/default.nix @@ -7,14 +7,14 @@ python-engineio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-socketio"; version = "5.16.4"; pyproject = true; src = fetchPypi { pname = "python_socketio"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-9/pKQ8yOaHkwtcbkTW4u/CBx7KS+9JuLs9wIJ/f5IjU="; }; @@ -25,8 +25,6 @@ buildPythonPackage rec { python-engineio ]; - doCheck = false; - pythonImportsCheck = [ "socketio" ]; meta = { @@ -34,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/miguelgrinberg/python-socketio/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-sql/default.nix b/python/pkgs/python-sql/default.nix index fd79df67f..dfb739a94 100644 --- a/python/pkgs/python-sql/default.nix +++ b/python/pkgs/python-sql/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-sql"; version = "1.7.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { domain = "foss.heptapod.net"; owner = "tryton"; repo = "python-sql"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JhMJEng6QftWBmJIC2pYlf9fkHHmSd3k0tSwr35MmVQ="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://foss.heptapod.net/tryton/python-sql"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/python-stdnum/default.nix b/python/pkgs/python-stdnum/default.nix index b7ed13306..575a23050 100644 --- a/python/pkgs/python-stdnum/default.nix +++ b/python/pkgs/python-stdnum/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-stdnum"; version = "2.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arthurdejong"; repo = "python-stdnum"; - tag = version; + tag = finalAttrs.version; hash = "sha256-X/VmD9bgOfs58m4YtmIdsYI5B4T0a68Wiiq2Ae27A8w="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Python module to handle standardized numbers and codes"; homepage = "https://arthurdejong.org/python-stdnum/"; - changelog = "https://github.com/arthurdejong/python-stdnum/blob/${version}/ChangeLog"; + changelog = "https://github.com/arthurdejong/python-stdnum/blob/${finalAttrs.version}/ChangeLog"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/python-string-utils/default.nix b/python/pkgs/python-string-utils/default.nix index ffa5e88eb..66cecdeb1 100644 --- a/python/pkgs/python-string-utils/default.nix +++ b/python/pkgs/python-string-utils/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-string-utils"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3PkGCwPwdkfApgNAjciwP4B/O1SgXG4Z6xRGAlb6wMs="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "string_utils" ]; meta = { @@ -21,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/daveoncode/python-string-utils"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-tds/default.nix b/python/pkgs/python-tds/default.nix index 54e841b90..abf0d0ffe 100644 --- a/python/pkgs/python-tds/default.nix +++ b/python/pkgs/python-tds/default.nix @@ -11,7 +11,7 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-tds"; version = "1.17.1"; pyproject = true; @@ -19,13 +19,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "denisenkom"; repo = "pytds"; - tag = version; + tag = finalAttrs.version; hash = "sha256-W9Sk2X2bSMjtRu1XPnjWXOLjVVa+MYC7+ttrZc48c4I="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail "version.get_git_version()" '"${version}"' + --replace-fail "version.get_git_version()" '"${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://python-tds.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-telegram-bot/default.nix b/python/pkgs/python-telegram-bot/default.nix index e3b2a0db6..8c4034239 100644 --- a/python/pkgs/python-telegram-bot/default.nix +++ b/python/pkgs/python-telegram-bot/default.nix @@ -12,7 +12,7 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-telegram-bot"; version = "22.8"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-telegram-bot"; repo = "python-telegram-bot"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BfNERx2AuzXi7H3NR5jvaaqTQdnSALo2pf4c/Aen+ao="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://python-telegram-bot.org"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/python-ulid/default.nix b/python/pkgs/python-ulid/default.nix index 280375d6b..997a28bef 100644 --- a/python/pkgs/python-ulid/default.nix +++ b/python/pkgs/python-ulid/default.nix @@ -9,7 +9,7 @@ freezegun, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-ulid"; version = "4.0.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mdomke"; repo = "python-ulid"; - tag = version; + tag = finalAttrs.version; hash = "sha256-U53hfviygdp6S+ZLXpLc0AeiAARfp3f5EBcCrufS2dA="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/mdomke/python-ulid"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-utils/default.nix b/python/pkgs/python-utils/default.nix index cd53d6024..a91282952 100644 --- a/python/pkgs/python-utils/default.nix +++ b/python/pkgs/python-utils/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-utils"; version = "3.9.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "WoLpH"; repo = "python-utils"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lzLzYI5jShfIwQqvfA8UtPjGawXE80ww7jb/gPzpeDo="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/WoLpH/python-utils"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/python-vagrant/default.nix b/python/pkgs/python-vagrant/default.nix index 0eeaf3c42..a4fe93975 100644 --- a/python/pkgs/python-vagrant/default.nix +++ b/python/pkgs/python-vagrant/default.nix @@ -7,7 +7,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "1.1.0"; pname = "python-vagrant"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pycontribs"; repo = "python-vagrant"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-apvYzH0IY6ZyUP/FiOVbGN3dXejgN7gn7Mq2tlEaTww="; }; @@ -26,7 +26,6 @@ buildPythonPackage rec { ]; # The tests try to connect to qemu - doCheck = false; pythonImportsCheck = [ "vagrant" ]; @@ -35,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/todddeluca/python-vagrant"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-whois/default.nix b/python/pkgs/python-whois/default.nix index f585ef408..e97378027 100644 --- a/python/pkgs/python-whois/default.nix +++ b/python/pkgs/python-whois/default.nix @@ -6,13 +6,13 @@ python-dateutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python_whois"; version = "0.9.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Lm3nttcOMFqF9IWc0XeB7j8No6AqjpTyPLTNzS5AC/o="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/richardpenman/whois"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/python-xlib/default.nix b/python/pkgs/python-xlib/default.nix index 3fd685f85..e8505099c 100644 --- a/python/pkgs/python-xlib/default.nix +++ b/python/pkgs/python-xlib/default.nix @@ -7,13 +7,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-xlib"; version = "0.33"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Va95BqLHXObLKApYR3YIBgJET3WBWnr/TSh7stcBizI="; }; @@ -24,8 +24,6 @@ buildPythonPackage rec { dependencies = [ six ]; - doCheck = false; - pythonImportsCheck = [ "Xlib" ]; meta = { @@ -33,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-xlib/python-xlib"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/python3-openid/default.nix b/python/pkgs/python3-openid/default.nix index 473c053a4..c7361c628 100644 --- a/python/pkgs/python3-openid/default.nix +++ b/python/pkgs/python3-openid/default.nix @@ -6,13 +6,13 @@ defusedxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python3-openid"; version = "3.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-M/v2ko9AHgt5AVHtK1KQsCVF6HdfmCSFIFoGb4dKrq8="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/necaris/python3-openid"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pythondialog/default.nix b/python/pkgs/pythondialog/default.nix index 2fb348c0b..216949888 100644 --- a/python/pkgs/pythondialog/default.nix +++ b/python/pkgs/pythondialog/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pythondialog"; version = "3.5.3"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "b2a34a8af0a6625ccbdf45cd343b854fc6c1a85231dadc80b8805db836756323"; }; + build-system = [ setuptools ]; + patchPhase = '' substituteInPlace dialog.py --replace ":/bin:/usr/bin" ":$out/bin" ''; @@ -25,4 +29,4 @@ buildPythonPackage rec { homepage = "http://pythondialog.sourceforge.net/"; license = lib.licenses.lgpl3; }; -} +}) diff --git a/python/pkgs/pythonqwt/default.nix b/python/pkgs/pythonqwt/default.nix index aeb121bce..4391e8ac0 100644 --- a/python/pkgs/pythonqwt/default.nix +++ b/python/pkgs/pythonqwt/default.nix @@ -9,7 +9,7 @@ qtpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pythonqwt"; version = "0.16.3"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PlotPyStack"; repo = "PythonQwt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uCCbKlyqeXUcmFYz/0b/+vpL7vivO8qn0L2PHgfN1H8="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/PlotPyStack/PythonQwt"; license = lib.licenses.lgpl21Only; }; -} +}) diff --git a/python/pkgs/pythran/default.nix b/python/pkgs/pythran/default.nix index 6cbc9a2f4..b0021c5bb 100644 --- a/python/pkgs/pythran/default.nix +++ b/python/pkgs/pythran/default.nix @@ -14,7 +14,7 @@ let inherit (python) stdenv; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pythran"; version = "0.18.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; - tag = version; + tag = finalAttrs.version; hash = "sha256-H13FGApWCgBLWOtoZ5yEIV4Z+KAOK3Xs4KFM4oLmKmk="; }; @@ -69,4 +69,4 @@ buildPythonPackage rec { homepage = "https://github.com/serge-sans-paille/pythran"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytimeparse/default.nix b/python/pkgs/pytimeparse/default.nix index a139aea48..ae583fdd2 100644 --- a/python/pkgs/pytimeparse/default.nix +++ b/python/pkgs/pytimeparse/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytimeparse"; version = "1.1.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6GE2R3vpJNfmcGRqmFYZV+jKcwjUSEHiH13ep1dVago="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "pytimeparse" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/wroberts/pytimeparse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytimeparse2/default.nix b/python/pkgs/pytimeparse2/default.nix index b9cb2eecd..0cc8a42f3 100644 --- a/python/pkgs/pytimeparse2/default.nix +++ b/python/pkgs/pytimeparse2/default.nix @@ -1,23 +1,27 @@ { lib, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, dateutils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytimeparse2"; version = "1.7.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "onegreyonewhite"; repo = "pytimeparse2"; - tag = version; + tag = finalAttrs.version; hash = "sha256-zWRbSohTvbVd3GcRRoxH/UReVGYHC0YmbNgbt8N0X48="; }; - propagatedBuildInputs = [ dateutils ]; + build-system = [ setuptools ]; + + dependencies = [ dateutils ]; # custom checks, see # https://github.com/onegreyonewhite/pytimeparse2/blob/e00df7506b6925f2c6a5783e89e9f239d128271a/tox.ini#L36C20-L36C78 @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/onegreyonewhite/pytimeparse2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytlv/default.nix b/python/pkgs/pytlv/default.nix index 50779d5b5..93026679e 100644 --- a/python/pkgs/pytlv/default.nix +++ b/python/pkgs/pytlv/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytlv"; version = "0.71"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-btxZ0oQzn1ZpwXihHlg6CduLh8nkerLV7SoFyXzJjVY="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/timgabets/pytlv"; license = lib.licenses.lgpl2; }; -} +}) diff --git a/python/pkgs/pytokens/default.nix b/python/pkgs/pytokens/default.nix index 0e2bffb2b..a0765ad18 100644 --- a/python/pkgs/pytokens/default.nix +++ b/python/pkgs/pytokens/default.nix @@ -12,7 +12,6 @@ buildPythonPackage (finalAttrs: { pname = "pytokens"; version = "0.4.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "tusharsadhwani"; diff --git a/python/pkgs/pytomlpp/default.nix b/python/pkgs/pytomlpp/default.nix index 20417b371..2c8ae7dba 100644 --- a/python/pkgs/pytomlpp/default.nix +++ b/python/pkgs/pytomlpp/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pybind11, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytomlpp"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "bobfang1992"; repo = "pytomlpp"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-RRsjnZK0FJiSkpWxurs9vJFyo2SUAKyFKXoJ8bcsHKI="; }; + build-system = [ setuptools ]; + # The latest setuptools has deprecated `setup_requires` and will attempt to automatically invoke `pip` to install dependencies during the build. patches = [ ./0001-remove-setup_requires.patch ]; @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/bobfang1992/pytomlpp"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytoolconfig/default.nix b/python/pkgs/pytoolconfig/default.nix index db60bdd47..a3c930981 100644 --- a/python/pkgs/pytoolconfig/default.nix +++ b/python/pkgs/pytoolconfig/default.nix @@ -14,7 +14,7 @@ tabulate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytoolconfig"; version = "1.3.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bagel897"; repo = "pytoolconfig"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-h21SDgVsnCDZQf5GS7sFE19L/p+OlAFZGEYKc0RHn30="; }; @@ -30,7 +30,7 @@ buildPythonPackage rec { "out" ]; - env.PDM_PEP517_SCM_VERSION = version; + env.PDM_PEP517_SCM_VERSION = finalAttrs.version; nativeBuildInputs = [ pdm-backend @@ -41,7 +41,7 @@ buildPythonPackage rec { sphinx-rtd-theme sphinxHook ]; - propagatedBuildInputs = [ packaging ]; + dependencies = [ packaging ]; optional-dependencies = { validation = [ pydantic ]; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/bagel897/pytoolconfig"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/pyttsx3/default.nix b/python/pkgs/pyttsx3/default.nix index 79c430f11..41a53c943 100644 --- a/python/pkgs/pyttsx3/default.nix +++ b/python/pkgs/pyttsx3/default.nix @@ -4,13 +4,13 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyttsx3"; version = "2.99"; format = "wheel"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; format = "wheel"; sha256 = "sha256-/z5P91bCTXK58/LzBODtqv0PWK2w5vS5DZMEQM2osgc="; dist = "py3"; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/nateshmbhat/pyttsx3"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/pytube/default.nix b/python/pkgs/pytube/default.nix index 877e2a2bd..0b0977cda 100644 --- a/python/pkgs/pytube/default.nix +++ b/python/pkgs/pytube/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytube"; version = "15.0.0"; pyproject = true; @@ -13,14 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytube"; repo = "pytube"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Nvs/YlOjk/P5nd1kpUnCM2n6yiEaqZP830UQI0Ug1rk="; }; build-system = [ setuptools ]; # Most tests require network access - doCheck = false; pythonImportsCheck = [ "pytube" ]; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/nficano/pytube"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pytweening/default.nix b/python/pkgs/pytweening/default.nix index 45883ec42..dd3c5578d 100644 --- a/python/pkgs/pytweening/default.nix +++ b/python/pkgs/pytweening/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytweening"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JDMYt3NmmAZsXzYuxcK2Q07PQpfDyOfKqKv+avTKxxs="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/asweigart/pytweening"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pytz-deprecation-shim/default.nix b/python/pkgs/pytz-deprecation-shim/default.nix index e9f329c60..971fe191f 100644 --- a/python/pkgs/pytz-deprecation-shim/default.nix +++ b/python/pkgs/pytz-deprecation-shim/default.nix @@ -6,14 +6,14 @@ tzdata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytz-deprecation-shim"; version = "0.1.0.post0"; pyproject = true; src = fetchPypi { pname = "pytz_deprecation_shim"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-rwl7rhthbd5cV0REHi3caedN/csMJjEpYQ2FuHRFpZ0="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/pganssle/pytz-deprecation-shim"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pytz/default.nix b/python/pkgs/pytz/default.nix index baf255223..99ca800ba 100644 --- a/python/pkgs/pytz/default.nix +++ b/python/pkgs/pytz/default.nix @@ -6,13 +6,13 @@ pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytz"; version = "2026.3.post1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IhHT/Pmnl9NAXKyWrH9h2A5qZE9yozCWBygv6KIBDF0="; }; @@ -24,8 +24,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "pytz" ]; meta = { @@ -33,4 +31,4 @@ buildPythonPackage rec { homepage = "https://pythonhosted.org/pytz"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyu2f/default.nix b/python/pkgs/pyu2f/default.nix index f600c0600..a2f3c4f62 100644 --- a/python/pkgs/pyu2f/default.nix +++ b/python/pkgs/pyu2f/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyu2f"; version = "0.1.5a"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "pyu2f"; - tag = version; + tag = finalAttrs.version; sha256 = "0mx7bn1p3n0fxyxa82wg3c719hby7vqkxv57fhf7zvhlg2zfnr0v"; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; postPatch = '' for path in \ @@ -42,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/pyu2f"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pyuca/default.nix b/python/pkgs/pyuca/default.nix index 229ba3268..3a75a1175 100644 --- a/python/pkgs/pyuca/default.nix +++ b/python/pkgs/pyuca/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyuca"; version = "1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ijgv50Yn8IwNGJCMBxPKSiCq1ThfB3V55WIIvuook7I="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Python implementation of the Unicode Collation Algorithm"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyudev/default.nix b/python/pkgs/pyudev/default.nix index fc5cbb29f..050afb8fb 100644 --- a/python/pkgs/pyudev/default.nix +++ b/python/pkgs/pyudev/default.nix @@ -8,13 +8,13 @@ stdenvNoCC, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyudev"; version = "0.24.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-54i7mDcAsahO/C6IhisKUa8qmV1bhryZl1RlBc97Nrw="; }; @@ -27,8 +27,6 @@ buildPythonPackage rec { dependencies = [ six ]; - doCheck = false; - pythonImportsCheck = [ "pyudev" ]; meta = { @@ -36,4 +34,4 @@ buildPythonPackage rec { homepage = "https://pyudev.readthedocs.org/"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/pyunormalize/default.nix b/python/pkgs/pyunormalize/default.nix index 63acf8795..e13663492 100644 --- a/python/pkgs/pyunormalize/default.nix +++ b/python/pkgs/pyunormalize/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyunormalize"; version = "17.0.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mlodewijck"; repo = "pyunormalize"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JDcMWaA6r8YRZYJseyKUyPAInrqHHYhQXYmw9rr3ls4="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/mlodewijck/pyunormalize"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyupgrade/default.nix b/python/pkgs/pyupgrade/default.nix index 52db7a0f2..5295042ba 100644 --- a/python/pkgs/pyupgrade/default.nix +++ b/python/pkgs/pyupgrade/default.nix @@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "asottile"; repo = "pyupgrade"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-u4iudzPhVuAOS9cL3z6FCVpWKJZHg7UGpe9aHnN7Byc="; }; diff --git a/python/pkgs/pyusb/default.nix b/python/pkgs/pyusb/default.nix index 970a3011f..6da57eb3a 100644 --- a/python/pkgs/pyusb/default.nix +++ b/python/pkgs/pyusb/default.nix @@ -8,13 +8,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyusb"; version = "1.3.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OvBwtgdGfBwWT0nVsMqr6Kx42+2SmNcDqNv530BS0X4="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://pyusb.github.io/pyusb/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyutil/default.nix b/python/pkgs/pyutil/default.nix index 1c6844685..c540b5a9f 100644 --- a/python/pkgs/pyutil/default.nix +++ b/python/pkgs/pyutil/default.nix @@ -8,13 +8,13 @@ versioneer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyutil"; version = "3.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8RHsCEieQ3/uHPkNai+sUBR2hDJAVrYy5DMlp6YRw6c="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/tpltnt/pyutil"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/pyuv/default.nix b/python/pkgs/pyuv/default.nix index ea1354f60..a0ec5c092 100644 --- a/python/pkgs/pyuv/default.nix +++ b/python/pkgs/pyuv/default.nix @@ -7,7 +7,7 @@ libuv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyuv"; version = "1.4.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "saghul"; repo = "pyuv"; - rev = "pyuv-${version}"; + tag = "pyuv-${finalAttrs.version}"; sha256 = "1wiwwdylz66lfsjh6p4iv7pfhzvnhwjk332625njizfhz3gq9fwr"; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/saghul/pyuv"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyvcd/default.nix b/python/pkgs/pyvcd/default.nix index 5942e3faf..ffb1fe39f 100644 --- a/python/pkgs/pyvcd/default.nix +++ b/python/pkgs/pyvcd/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyvcd"; version = "0.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-luPHuUCeY/WOtLXCKwF/nzQS3b38c0zsLh361cKag98="; }; @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "Python package for writing Value Change Dump (VCD) files"; homepage = "https://github.com/SanDisk-Open-Source/pyvcd"; - changelog = "https://github.com/SanDisk-Open-Source/pyvcd/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/SanDisk-Open-Source/pyvcd/blob/${finalAttrs.version}/CHANGELOG.rst"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyvis/default.nix b/python/pkgs/pyvis/default.nix index ba9112cc5..d96e96b37 100644 --- a/python/pkgs/pyvis/default.nix +++ b/python/pkgs/pyvis/default.nix @@ -9,7 +9,7 @@ jsonpickle, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyvis"; version = "0.3.2"; pyproject = true; @@ -17,13 +17,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "WestHealth"; repo = "pyvis"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eo9Mk2c0hrBarCrzwmkXha3Qt4Bl1qR7Lhl9EkUx96E="; }; postPatch = '' substituteInPlace pyvis/_version.py \ - --replace-fail "__version__ = '0.2.0'" "__version__ = '${version}'" + --replace-fail "__version__ = '0.2.0'" "__version__ = '${finalAttrs.version}'" ''; build-system = [ setuptools ]; @@ -42,4 +42,4 @@ buildPythonPackage rec { description = "Python package for creating and visualizing interactive network graphs"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/pyvisa/default.nix b/python/pkgs/pyvisa/default.nix index b055c2604..cac57b047 100644 --- a/python/pkgs/pyvisa/default.nix +++ b/python/pkgs/pyvisa/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyvisa"; version = "1.16.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyvisa"; repo = "pyvisa"; - tag = version; + tag = finalAttrs.version; hash = "sha256-wxWva02nKkuFjralzVIrVTXfDHEeBYihckUcj8p44/k="; }; @@ -24,11 +24,11 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ typing-extensions ]; + dependencies = [ typing-extensions ]; meta = { description = "Python package for support of the Virtual Instrument Software Architecture (VISA)"; homepage = "https://github.com/pyvisa/pyvisa"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyviz-comms/default.nix b/python/pkgs/pyviz-comms/default.nix index 0ba97ca5c..6c2cb8fcf 100644 --- a/python/pkgs/pyviz-comms/default.nix +++ b/python/pkgs/pyviz-comms/default.nix @@ -34,7 +34,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ param ]; # there are not tests with the package - doCheck = false; pythonImportsCheck = [ "pyviz_comms" ]; meta = { diff --git a/python/pkgs/pyvmomi/default.nix b/python/pkgs/pyvmomi/default.nix index 71a24b125..a9016a11e 100644 --- a/python/pkgs/pyvmomi/default.nix +++ b/python/pkgs/pyvmomi/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyvmomi"; version = "9.1.0.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vmware"; repo = "pyvmomi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-r7knotP4vRX7LA3dsdUoCjzj6Z3TjMLEBs7BnRWSl0A="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/vmware/pyvmomi"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/pywavelets/default.nix b/python/pkgs/pywavelets/default.nix index eb6d73fc3..ad96a2797 100644 --- a/python/pkgs/pywavelets/default.nix +++ b/python/pkgs/pywavelets/default.nix @@ -7,7 +7,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pywavelets"; version = "1.9.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyWavelets"; repo = "pywt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UVQWZPuOyUPcWI3cV2u+jQyAZN/RV3aKAT6BQxqRE4M="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/PyWavelets/pywt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pywayland/default.nix b/python/pkgs/pywayland/default.nix index 02c8dfdd3..4f0fe9ac4 100644 --- a/python/pkgs/pywayland/default.nix +++ b/python/pkgs/pywayland/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, python, cffi, pkg-config, @@ -9,21 +11,23 @@ wayland-scanner, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pywayland"; version = "0.4.18"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-WYreAng6rQWjKPZjtRtpTFq2i9XR4JJsDaPFISxWZTM="; }; + build-system = [ setuptools ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ wayland-scanner ]; propagatedNativeBuildInputs = [ cffi ]; buildInputs = [ wayland ]; - propagatedBuildInputs = [ cffi ]; + dependencies = [ cffi ]; postBuild = '' ${python.pythonOnBuildForHost.interpreter} pywayland/ffi_build.py @@ -35,4 +39,4 @@ buildPythonPackage rec { mainProgram = "pywayland-scanner"; license = lib.licenses.ncsa; }; -} +}) diff --git a/python/pkgs/pywebpush/default.nix b/python/pkgs/pywebpush/default.nix index 50a057670..158be16ee 100644 --- a/python/pkgs/pywebpush/default.nix +++ b/python/pkgs/pywebpush/default.nix @@ -11,13 +11,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pywebpush"; version = "2.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gmD45C1w7ZWjvQBSf/y0O1s9+Jg6SkiwWf4psG3D2Sw="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { license = lib.licenses.mpl20; mainProgram = "pywebpush"; }; -} +}) diff --git a/python/pkgs/pywikibot/default.nix b/python/pkgs/pywikibot/default.nix index 59846f70a..33c7cb5be 100644 --- a/python/pkgs/pywikibot/default.nix +++ b/python/pkgs/pywikibot/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pywikibot"; version = "11.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vX9MW1miCEPkbNVUCgPZKSL120bJ1hXOAJztVqHvaDs="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://www.mediawiki.org/wiki/Manual:Pywikibot"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pywinrm/default.nix b/python/pkgs/pywinrm/default.nix index ba9272cea..d4a56b310 100644 --- a/python/pkgs/pywinrm/default.nix +++ b/python/pkgs/pywinrm/default.nix @@ -8,13 +8,13 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pywinrm"; version = "0.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VCjrHklK95VFRs1P8Vye8aMKdeBbJaOf1gbO8iIB6fE="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/diyan/pywinrm"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyx/default.nix b/python/pkgs/pyx/default.nix index 958cc1c2e..0b4f198c0 100644 --- a/python/pkgs/pyx/default.nix +++ b/python/pkgs/pyx/default.nix @@ -2,26 +2,29 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyx"; version = "0.17"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-O8iqgJExVZ96XA4fESm0LHGt423wMyET9cV3k4SjmvE="; }; + build-system = [ setuptools ]; + # No tests in archive - doCheck = false; meta = { description = "Python package for the generation of PostScript, PDF, and SVG files"; homepage = "https://pyx.sourceforge.net/"; license = lib.licenses.gpl2; }; -} +}) diff --git a/python/pkgs/pyxdg/default.nix b/python/pkgs/pyxdg/default.nix index 6a6b2b7f8..610268785 100644 --- a/python/pkgs/pyxdg/default.nix +++ b/python/pkgs/pyxdg/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyxdg"; version = "0.28"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Mme7MHTpNN8gKvLuCGhXVIQQhYHm88sAavHaNTleiLQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "http://freedesktop.org/wiki/Software/pyxdg"; license = lib.licenses.lgpl2; }; -} +}) diff --git a/python/pkgs/pyxlsb/default.nix b/python/pkgs/pyxlsb/default.nix index 4fe58596b..76c79b50f 100644 --- a/python/pkgs/pyxlsb/default.nix +++ b/python/pkgs/pyxlsb/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyxlsb"; version = "1.0.10"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gGLR6oYm0/GYDosc/pGkSDdHRJJC7LYQE7wt+FQ19oU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/willtrnr/pyxlsb"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/pyyaml-ft/default.nix b/python/pkgs/pyyaml-ft/default.nix index 5354c2268..12bf4413b 100644 --- a/python/pkgs/pyyaml-ft/default.nix +++ b/python/pkgs/pyyaml-ft/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyyaml-ft"; version = "8.0.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Quansight-Labs"; repo = "pyyaml-ft"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GiXYpcAccKgROw144eOPY0gS0xW+3K/jRUl+JnBEaO8="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/Quansight-Labs/pyyaml-ft"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyyaml-include/default.nix b/python/pkgs/pyyaml-include/default.nix index b13a35ba8..9e26a3cb8 100644 --- a/python/pkgs/pyyaml-include/default.nix +++ b/python/pkgs/pyyaml-include/default.nix @@ -15,7 +15,7 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyyaml-include"; version = "2.2"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tanbro"; repo = "pyyaml-include"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nswSYRTZ6LTLSGh78DnrXl3q06Ap1J1IMKOESv1lJoY="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/tanbro/pyyaml-include"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/pyyaml/default.nix b/python/pkgs/pyyaml/default.nix index 8ee1df405..37a831ac9 100644 --- a/python/pkgs/pyyaml/default.nix +++ b/python/pkgs/pyyaml/default.nix @@ -7,7 +7,7 @@ libyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyyaml"; version = "6.0.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "yaml"; repo = "pyyaml"; - tag = version; + tag = finalAttrs.version; hash = "sha256-jUooIBp80cLxvdU/zLF0X8Yjrf0Yp9peYeiFjuV8AHA="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/yaml/pyyaml"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/pyzabbix/default.nix b/python/pkgs/pyzabbix/default.nix index 3002407c9..69f1dbc13 100644 --- a/python/pkgs/pyzabbix/default.nix +++ b/python/pkgs/pyzabbix/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyzabbix"; version = "1.3.1"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lukecyca"; repo = "pyzabbix"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2yCbxPUlbTrtjD9eKmkw0fKnjiwPzmjIo5vKGv4aerU="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ packaging requests ]; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/lukecyca/pyzabbix"; license = lib.licenses.lgpl21Only; }; -} +}) diff --git a/python/pkgs/pyzmq/default.nix b/python/pkgs/pyzmq/default.nix index 7089e751e..ff6a47230 100644 --- a/python/pkgs/pyzmq/default.nix +++ b/python/pkgs/pyzmq/default.nix @@ -14,13 +14,13 @@ zeromq, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyzmq"; version = "27.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VNQlnRv64k7Ntcp596zC6sbChqAtagrmF3l8tF8HJtM="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { lgpl3Only ]; }; -} +}) diff --git a/python/pkgs/pyzstd/default.nix b/python/pkgs/pyzstd/default.nix index 02d6f3794..060ef2216 100644 --- a/python/pkgs/pyzstd/default.nix +++ b/python/pkgs/pyzstd/default.nix @@ -10,7 +10,7 @@ zstd, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyzstd"; version = "0.19.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Rogdham"; repo = "pyzstd"; - tag = version; + tag = finalAttrs.version; hash = "sha256-1oUqnZCBJYu8haFIQ+T2KaSQaa1xnZyJHLzOQg4Fdw8="; }; @@ -60,4 +60,4 @@ buildPythonPackage rec { homepage = "https://pyzstd.readthedocs.io"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/qasync/default.nix b/python/pkgs/qasync/default.nix index 226c8ada3..d8f406ab3 100644 --- a/python/pkgs/qasync/default.nix +++ b/python/pkgs/qasync/default.nix @@ -5,7 +5,7 @@ uv-build, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qasync"; version = "0.28.0"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CabbageDevelopment"; repo = "qasync"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eQJ1Yszl95IycggSyWcD3opAO1rfBdNp14y8eHDMJY4="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/CabbageDevelopment/qasync"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/qbittorrent-api/default.nix b/python/pkgs/qbittorrent-api/default.nix index 55cf61763..1500c750a 100644 --- a/python/pkgs/qbittorrent-api/default.nix +++ b/python/pkgs/qbittorrent-api/default.nix @@ -9,13 +9,13 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qbittorrent_api"; version = "2026.8.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lkLEUouu5nIW6rhwIs4pcEislt8vjJ8c+SDeB461C2I="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/rmartin16/qbittorrent-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/qcelemental/default.nix b/python/pkgs/qcelemental/default.nix index 77ed390c5..83aa3360e 100644 --- a/python/pkgs/qcelemental/default.nix +++ b/python/pkgs/qcelemental/default.nix @@ -15,13 +15,13 @@ scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qcelemental"; version = "0.51.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2S7sa14rKd8b+yDy2eIpk1TUElA6XepeTPuzWW6S4TU="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://github.com/MolSSI/QCElemental"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/qcengine/default.nix b/python/pkgs/qcengine/default.nix index 9f67674d1..83668ae7a 100644 --- a/python/pkgs/qcengine/default.nix +++ b/python/pkgs/qcengine/default.nix @@ -13,13 +13,13 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qcengine"; version = "0.51.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-I6Ei0TIylYWordjNAj0wXAxMH1Ayv4p6siJz4F18TA0="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "qcengine"; }; -} +}) diff --git a/python/pkgs/qcs-api-client/default.nix b/python/pkgs/qcs-api-client/default.nix index dfc693acc..c65408a15 100644 --- a/python/pkgs/qcs-api-client/default.nix +++ b/python/pkgs/qcs-api-client/default.nix @@ -14,7 +14,7 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qcs-api-client"; version = "0.27.8"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rigetti"; repo = "qcs-api-client-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9BRmfgRp/nyiqM6P/WjnaovsrZrZx6Pcg7sFJjdcWlo="; }; @@ -58,8 +58,6 @@ buildPythonPackage rec { toml ]; - doCheck = false; - # qcs_api_client.client requires qcs-api-client-common (Rust native extension) # which is not yet packaged, so skip import check pythonImportsCheck = [ ]; @@ -69,4 +67,4 @@ buildPythonPackage rec { homepage = "https://qcs-api-client-python.readthedocs.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/qdarkstyle/default.nix b/python/pkgs/qdarkstyle/default.nix index fe7c89285..837308169 100644 --- a/python/pkgs/qdarkstyle/default.nix +++ b/python/pkgs/qdarkstyle/default.nix @@ -1,25 +1,29 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, helpdev, qtpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qdarkstyle"; version = "3.2.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "QDarkStyle"; hash = "sha256-DAt/dKbpISEAiZKzabq2BGgVfbHALNMNZKXpo7QC8a4="; }; + build-system = [ setuptools ]; + # No tests available - propagatedBuildInputs = [ + dependencies = [ helpdev qtpy ]; @@ -29,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/ColinDuquesnoy/QDarkStyleSheet"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/qdldl/default.nix b/python/pkgs/qdldl/default.nix index be8e3c9a5..99fc3eec8 100644 --- a/python/pkgs/qdldl/default.nix +++ b/python/pkgs/qdldl/default.nix @@ -11,7 +11,7 @@ scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qdldl"; version = "0.1.7.post5"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "osqp"; repo = "qdldl-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XHdvYWORHDYy/EIqmlmFQZwv+vK3I+rPIrvcEW1JyIw="; }; @@ -44,7 +44,7 @@ buildPythonPackage rec { scipy ]; - propagatedBuildInputs = [ + buildInputs = [ pkgs.qdldl ]; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/osqp/qdldl-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/qdrant-client/default.nix b/python/pkgs/qdrant-client/default.nix index 55a9e9de0..69e09b322 100644 --- a/python/pkgs/qdrant-client/default.nix +++ b/python/pkgs/qdrant-client/default.nix @@ -12,7 +12,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qdrant-client"; version = "1.19.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7d5FJhG5+uMBS7juolNpeYTJkPGbORXsBj7GvZSDWts="; }; @@ -43,11 +43,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "qdrant_client" ]; - doCheck = false; - meta = { description = "Python client for Qdrant vector search engine"; homepage = "https://github.com/qdrant/qdrant-client"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/qrcode/default.nix b/python/pkgs/qrcode/default.nix index c15edaf5b..ab7d5f735 100644 --- a/python/pkgs/qrcode/default.nix +++ b/python/pkgs/qrcode/default.nix @@ -10,7 +10,7 @@ pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qrcode"; version = "8.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lincolnloop"; repo = "python-qrcode"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qLIYUFnBJQGidnfC0bQAkO/aUmT94uXFMeMhnUgUnfQ="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/lincolnloop/python-qrcode"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/qstylizer/default.nix b/python/pkgs/qstylizer/default.nix index dbe666ae4..de69f1aa2 100644 --- a/python/pkgs/qstylizer/default.nix +++ b/python/pkgs/qstylizer/default.nix @@ -10,7 +10,7 @@ tinycss2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qstylizer"; version = "0.2.4"; pyproject = true; @@ -18,11 +18,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "blambright"; repo = "qstylizer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Is/kYkSX9fOX+pLv5g1ns2OxeLpSkaCfO2jPIbiuIxA="; }; - env.PBR_VERSION = version; + env.PBR_VERSION = finalAttrs.version; build-system = [ pbr @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/blambright/qstylizer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/qt-material/default.nix b/python/pkgs/qt-material/default.nix index cf53f5d1b..91936ba85 100644 --- a/python/pkgs/qt-material/default.nix +++ b/python/pkgs/qt-material/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qt-material"; version = "2.17"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dunderlab"; repo = "qt-material"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ilrPA8SoVCo6FgwxWQ4sOjqURCFDQJLlTTkCZzTZQKI="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/dunderlab/qt-material"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/qtpy/default.nix b/python/pkgs/qtpy/default.nix index e277fd2d4..446e103c8 100644 --- a/python/pkgs/qtpy/default.nix +++ b/python/pkgs/qtpy/default.nix @@ -2,28 +2,31 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, # propagates packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "qtpy"; version = "2.4.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-23RPeDLm09qQVoumzLyj7is7SokMPW+7xjFC9uTN9bs="; }; - propagatedBuildInputs = [ packaging ]; + build-system = [ setuptools ]; + + dependencies = [ packaging ]; - doCheck = false; # ModuleNotFoundError: No module named 'PyQt5.QtConnectivity' meta = { description = "Abstraction layer for PyQt5/PyQt6/PySide2/PySide6"; mainProgram = "qtpy"; homepage = "https://github.com/spyder-ide/qtpy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/quadprog/default.nix b/python/pkgs/quadprog/default.nix index b80ad27f9..f0d79fcae 100644 --- a/python/pkgs/quadprog/default.nix +++ b/python/pkgs/quadprog/default.nix @@ -7,7 +7,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "quadprog"; version = "0.1.13"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "quadprog"; repo = "quadprog"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8gPuqDY3ajw/+B6kJdtpq+HL+Oq2Nsy/O7m+IWzxP38="; }; @@ -24,11 +24,11 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; meta = { homepage = "https://github.com/quadprog/quadprog"; description = "Quadratic Programming Solver"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/quantile-python/default.nix b/python/pkgs/quantile-python/default.nix index 81c3bf15d..ab9d66a65 100644 --- a/python/pkgs/quantile-python/default.nix +++ b/python/pkgs/quantile-python/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "quantile-python"; version = "1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VYYp6IxJfvO5sQgTScGuamG1NZDjF3JCmP9UxnTbeWk="; }; + build-system = [ setuptools ]; + # package has no tests - doCheck = false; pythonImportsCheck = [ "quantile" ]; @@ -24,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/matttproud/python_quantile_estimation"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/quantiphy-eval/default.nix b/python/pkgs/quantiphy-eval/default.nix index 66a0e54ea..de1749f12 100644 --- a/python/pkgs/quantiphy-eval/default.nix +++ b/python/pkgs/quantiphy-eval/default.nix @@ -7,7 +7,7 @@ sly, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "quantiphy-eval"; version = "0.5"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KenKundert"; repo = "quantiphy_eval"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7VHcuINhe17lRNkHUnZkVOEtD6mVWk5gu0NbrLZwprg="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ inform sly ]; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/KenKundert/quantiphy_eval/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/quantities/default.nix b/python/pkgs/quantities/default.nix index 27d155dc9..d827a0239 100644 --- a/python/pkgs/quantities/default.nix +++ b/python/pkgs/quantities/default.nix @@ -7,7 +7,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "quantities"; version = "0.16.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-quantities"; repo = "python-quantities"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-a+UtNvcnQr4z87tpidx99u46M2H+EKtQ1EzIG5zQnmI="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://python-quantities.readthedocs.io/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/quart-trio/default.nix b/python/pkgs/quart-trio/default.nix index c0ca7a4aa..6e47b71a7 100644 --- a/python/pkgs/quart-trio/default.nix +++ b/python/pkgs/quart-trio/default.nix @@ -10,7 +10,7 @@ trio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "quart-trio"; version = "0.12.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pgjones"; repo = "quart-trio"; - tag = version; + tag = finalAttrs.version; hash = "sha256-n41XATex20iw3ZYxud/5cTdx+F6tTQQJmP91TIw2xJo="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/pgjones/quart-trio"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/quart/default.nix b/python/pkgs/quart/default.nix index 14cf91744..ee68f1e79 100644 --- a/python/pkgs/quart/default.nix +++ b/python/pkgs/quart/default.nix @@ -27,7 +27,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "quart"; version = "0.20.0"; pyproject = true; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pallets"; repo = "quart"; - tag = version; + tag = finalAttrs.version; hash = "sha256-NApev3nRBS4QDMGq8++rSmK5YgeljkaVAsdezsTbZr4="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { homepage = "https://github.com/pallets/quart/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/querystring-parser/default.nix b/python/pkgs/querystring-parser/default.nix index ce3bd00f6..8777617d2 100644 --- a/python/pkgs/querystring-parser/default.nix +++ b/python/pkgs/querystring-parser/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "querystring_parser"; version = "1.2.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZE/OHP/gUwRTtDqDo4CU2+QizLqMmy8qHAAoDhTKimI="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/bernii/querystring-parser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/questionary/default.nix b/python/pkgs/questionary/default.nix index ec88c6a05..ec209f5e3 100644 --- a/python/pkgs/questionary/default.nix +++ b/python/pkgs/questionary/default.nix @@ -7,7 +7,7 @@ prompt-toolkit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "questionary"; version = "2.1.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tmbo"; repo = "questionary"; - tag = version; + tag = finalAttrs.version; hash = "sha256-r7F5y6KD6zonQGtO/9OuCTMTWdkCdd9aqTgKg6eWp08="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/tmbo/questionary"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/queuelib/default.nix b/python/pkgs/queuelib/default.nix index 3ae4c790f..f0ce95499 100644 --- a/python/pkgs/queuelib/default.nix +++ b/python/pkgs/queuelib/default.nix @@ -5,20 +5,18 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "queuelib"; version = "1.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BjyCHDKFmui9zizJ50FWZFwHQhikZPgmLimjuN6Dlzc="; }; build-system = [ hatchling ]; - doCheck = false; - pythonImportsCheck = [ "queuelib" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/scrapy/queuelib"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/radish-bdd/default.nix b/python/pkgs/radish-bdd/default.nix index 9e5c4140b..f14c54414 100644 --- a/python/pkgs/radish-bdd/default.nix +++ b/python/pkgs/radish-bdd/default.nix @@ -4,6 +4,8 @@ colorful, docopt, fetchFromGitHub, + # build-system + setuptools, freezegun, humanize, lxml, @@ -13,19 +15,21 @@ tag-expressions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "radish-bdd"; version = "0.18.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { - owner = pname; + owner = finalAttrs.pname; repo = "radish"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pnZ/vqjMd1Q/wF1W6joYrIulZSXAzS2G3E5Ke5VSAQg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ colorful docopt humanize @@ -41,4 +45,4 @@ buildPythonPackage rec { homepage = "https://radish-bdd.github.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/radon/default.nix b/python/pkgs/radon/default.nix index b0ba2b1da..039b78f69 100644 --- a/python/pkgs/radon/default.nix +++ b/python/pkgs/radon/default.nix @@ -11,7 +11,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "radon"; version = "6.0.1"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rubik"; repo = "radon"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yY+j9kuX0ou/uDoVI/Qfqsmq0vNHv735k+vRl22LwwY="; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ mando colorama ]; @@ -54,4 +54,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "radon"; }; -} +}) diff --git a/python/pkgs/railroad-diagrams/default.nix b/python/pkgs/railroad-diagrams/default.nix index 2afbcbdd0..8d1ea6b38 100644 --- a/python/pkgs/railroad-diagrams/default.nix +++ b/python/pkgs/railroad-diagrams/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "railroad-diagrams"; version = "3.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-qRMyuskAyzw2czH6m2mfCJe8+GtyZPZUWGdd9DDQTOM="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/tabatkins/railroad-diagrams"; license = lib.licenses.cc0; }; -} +}) diff --git a/python/pkgs/random2/default.nix b/python/pkgs/random2/default.nix index 59257d387..ce41d26bf 100644 --- a/python/pkgs/random2/default.nix +++ b/python/pkgs/random2/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "random2"; version = "1.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-NK0wqsNBA5hyQBWV35qyydw20LfAd9sc6preQw7RwAc="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "http://pypi.org/pypi/random2/"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/rangehttpserver/default.nix b/python/pkgs/rangehttpserver/default.nix index 600b8f9fa..5aedfde6c 100644 --- a/python/pkgs/rangehttpserver/default.nix +++ b/python/pkgs/rangehttpserver/default.nix @@ -6,7 +6,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rangehttpserver"; version = "1.4.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danvk"; repo = "RangeHTTPServer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-wvGJ5wHYLb7wJUGgurkdRTABV6kTH7/GXzXgpd0Ypbc="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/danvk/RangeHTTPServer"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/rangeparser/default.nix b/python/pkgs/rangeparser/default.nix index ac9562524..b99903da4 100644 --- a/python/pkgs/rangeparser/default.nix +++ b/python/pkgs/rangeparser/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rangeparser"; version = "0.1.3"; pyproject = true; src = fetchPypi { pname = "RangeParser"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-gjA7Iytg802Lv7/rLfhGE0yjz4e6FfOXbEoWNPjhCOY="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/RangeParser/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/rank-bm25/default.nix b/python/pkgs/rank-bm25/default.nix index 5a1d65c73..36c60ec7d 100644 --- a/python/pkgs/rank-bm25/default.nix +++ b/python/pkgs/rank-bm25/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, numpy, }: let @@ -10,7 +12,7 @@ let in buildPythonPackage { inherit version pname; - format = "setuptools"; + pyproject = true; # Pypi source package doesn't contain tests src = fetchFromGitHub { @@ -20,12 +22,14 @@ buildPythonPackage { hash = "sha256-+BxQBflMm2AvCLAFFj52Jpkqn+KErwYXU1wztintgOg="; }; + build-system = [ setuptools ]; + postPatch = '' # Upstream doesn't provide a PKG-INFO file substituteInPlace setup.py --replace "get_version()" "'${version}'" ''; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; pythonImportsCheck = [ "rank_bm25" ]; diff --git a/python/pkgs/rapidfuzz-capi/default.nix b/python/pkgs/rapidfuzz-capi/default.nix index 8b6e4e2bf..ab74b5013 100644 --- a/python/pkgs/rapidfuzz-capi/default.nix +++ b/python/pkgs/rapidfuzz-capi/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rapidfuzz-capi"; version = "1.0.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz_capi"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0IvJl2JU/k1WbGPWRoucVGbVsEFNPHZT1ozEQAKQnPk="; }; + build-system = [ setuptools ]; + # upstream has no tests pythonImportsCheck = [ "rapidfuzz_capi" ]; @@ -25,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/maxbachmann/rapidfuzz_capi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rapidfuzz/default.nix b/python/pkgs/rapidfuzz/default.nix index 979927f92..39748e864 100644 --- a/python/pkgs/rapidfuzz/default.nix +++ b/python/pkgs/rapidfuzz/default.nix @@ -11,7 +11,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rapidfuzz"; version = "3.14.5"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wF7eeSD6GQfN0EOwDvrgjMqN5u2wxXFlktQS7nIKgkU="; }; @@ -67,4 +67,4 @@ buildPythonPackage rec { homepage = "https://github.com/maxbachmann/RapidFuzz"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rarfile/default.nix b/python/pkgs/rarfile/default.nix index 7968021e8..b939fd74d 100644 --- a/python/pkgs/rarfile/default.nix +++ b/python/pkgs/rarfile/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rarfile"; version = "4.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dCXQr6GA8AktuQOrsVJqEws2hYmAqtkLNpT0jkFCAVU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "RAR archive reader for Python"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/ratelim/default.nix b/python/pkgs/ratelim/default.nix index de8bccddd..32e2ee1b9 100644 --- a/python/pkgs/ratelim/default.nix +++ b/python/pkgs/ratelim/default.nix @@ -6,13 +6,13 @@ decorator, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ratelim"; version = "0.1.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gm0yF34R+aEoMZAcn9pmef1bvqNgWRCCAWcIj1rLsR0="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/themiurgo/ratelim"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ratelimit/default.nix b/python/pkgs/ratelimit/default.nix index cea0bf7df..9e65afe70 100644 --- a/python/pkgs/ratelimit/default.nix +++ b/python/pkgs/ratelimit/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ratelimit"; version = "2.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-r4qbZLghUprKCeuvbY0nkQDXZvGekLUFmsanGMpt7kI="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/tomasbasham/ratelimit"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/raven/default.nix b/python/pkgs/raven/default.nix index 81d3e20bb..c508fc26f 100644 --- a/python/pkgs/raven/default.nix +++ b/python/pkgs/raven/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, blinker, flask, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "raven"; version = "6.10.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "getsentry"; repo = "raven-python"; - rev = version; + tag = finalAttrs.version; sha256 = "16x9ldl8cy7flw5kh7qmgbmflqyf210j3q6ac2lw61sgwajsnvw8"; }; + build-system = [ setuptools ]; + # requires outdated dependencies which have no official support for python 3.4 pythonImportsCheck = [ "raven" ]; @@ -35,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/getsentry/raven-python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/rbtools/default.nix b/python/pkgs/rbtools/default.nix index 7e6308051..294e0713f 100644 --- a/python/pkgs/rbtools/default.nix +++ b/python/pkgs/rbtools/default.nix @@ -17,7 +17,7 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rbtools"; version = "5.2.1"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "reviewboard"; repo = "rbtools"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-Ci9lHlP2X95y7ldHBbqb5qWozPj3TJ0AxeVhqzVsdFA="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { mainProgram = "rbt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rchitect/default.nix b/python/pkgs/rchitect/default.nix index 7a4ace836..8ff492bb6 100644 --- a/python/pkgs/rchitect/default.nix +++ b/python/pkgs/rchitect/default.nix @@ -10,7 +10,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rchitect"; version = "0.4.10"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "randy3k"; repo = "rchitect"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CTXvca687RL1aFxf7jptcNIKPUcugzFdVTSyApcaWS4="; }; @@ -32,7 +32,7 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ cffi six packaging @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/randy3k/rchitect"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rcssmin/default.nix b/python/pkgs/rcssmin/default.nix index 15600777b..7ab210dd6 100644 --- a/python/pkgs/rcssmin/default.nix +++ b/python/pkgs/rcssmin/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rcssmin"; version = "1.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gGmG6vdBRUXtwoodKVI+lWDknhUf9KM32dHwJx1uHMQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "CSS minifier written in pure python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/rdflib/default.nix b/python/pkgs/rdflib/default.nix index d27de8b33..ab1ff6999 100644 --- a/python/pkgs/rdflib/default.nix +++ b/python/pkgs/rdflib/default.nix @@ -13,13 +13,13 @@ networkx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rdflib"; version = "7.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bIMSiNXkpafs6F0MzemHfVEqPQ8C18BkVdANbQ6jed8="; }; @@ -33,8 +33,6 @@ buildPythonPackage rec { networkx = [ networkx ]; }; - doCheck = false; - pythonImportsCheck = [ "rdflib" ]; meta = { @@ -42,4 +40,4 @@ buildPythonPackage rec { description = "Python library for working with RDF"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/re-assert/default.nix b/python/pkgs/re-assert/default.nix index 80279a13b..f9b0bcad9 100644 --- a/python/pkgs/re-assert/default.nix +++ b/python/pkgs/re-assert/default.nix @@ -6,14 +6,14 @@ regex, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "re-assert"; version = "1.1.0"; pyproject = true; src = fetchPypi { pname = "re_assert"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-UXLfvSBHoV3/I0dzXep+SVR5zH5YhBGZpKSXMlayBGQ="; }; @@ -23,11 +23,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "re_assert" ]; - doCheck = false; - meta = { description = "Show where your regex match assertion failed"; homepage = "https://github.com/asottile/re-assert"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/reactivex/default.nix b/python/pkgs/reactivex/default.nix index 56d7ba778..d824b94db 100644 --- a/python/pkgs/reactivex/default.nix +++ b/python/pkgs/reactivex/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "reactivex"; version = "4.1.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ReactiveX"; repo = "RxPY"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-napPfp72gqy43UmkPu1/erhjmJbZypHZQikmjIFVBqA="; }; @@ -35,7 +35,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version for their GitHub releases substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' + --replace 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; pythonImportsCheck = [ "reactivex" ]; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/ReactiveX/RxPY"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/readability-lxml/default.nix b/python/pkgs/readability-lxml/default.nix index b8ca6ef6f..3c578421d 100644 --- a/python/pkgs/readability-lxml/default.nix +++ b/python/pkgs/readability-lxml/default.nix @@ -9,7 +9,7 @@ lxml-html-clean, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "readability-lxml"; version = "0.9"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "buriy"; repo = "python-readability"; - rev = "${version}"; + tag = "${finalAttrs.version}"; hash = "sha256-N7f4PYwuTP5MSRw3xXm3lopZfKe6UHkSOJbUMeL5VBU="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/buriy/python-readability"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/readchar/default.nix b/python/pkgs/readchar/default.nix index d016ca76a..735c8ac85 100644 --- a/python/pkgs/readchar/default.nix +++ b/python/pkgs/readchar/default.nix @@ -28,8 +28,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "readchar" ]; - doCheck = false; - meta = { description = "Python library to read characters and key strokes"; homepage = "https://github.com/magmax/python-readchar"; diff --git a/python/pkgs/readlike/default.nix b/python/pkgs/readlike/default.nix index a8a4f54e7..467b2b9fa 100644 --- a/python/pkgs/readlike/default.nix +++ b/python/pkgs/readlike/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "readlike"; version = "0.1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RIa6XxwXcNxkWDFuy5XqEuG6f1nzKIBPoXqCErdD/Ag="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/jangler/readlike"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/readme-renderer/default.nix b/python/pkgs/readme-renderer/default.nix index 6f8a99a4a..9cb61e126 100644 --- a/python/pkgs/readme-renderer/default.nix +++ b/python/pkgs/readme-renderer/default.nix @@ -8,14 +8,14 @@ pygments, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "readme-renderer"; version = "46.0"; pyproject = true; src = fetchPypi { pname = "readme_renderer"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-rz6WSRT2MQoz/2e3KkvdlAvtjXw73s0tFPQO3yhL/pA="; }; @@ -27,8 +27,6 @@ buildPythonPackage rec { pygments ]; - doCheck = false; - pythonImportsCheck = [ "readme_renderer" ]; meta = { @@ -36,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/readme_renderer"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/rebulk/default.nix b/python/pkgs/rebulk/default.nix index 769217fbf..2fe85285a 100644 --- a/python/pkgs/rebulk/default.nix +++ b/python/pkgs/rebulk/default.nix @@ -6,13 +6,13 @@ regex, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rebulk"; version = "6.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1t8MjIluFgCHxpgfN3DtUT7Jc6n0BmueSwYU6wi6DOE="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/Toilal/rebulk/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/recommonmark/default.nix b/python/pkgs/recommonmark/default.nix index 1e8530ccf..d0eaa44a9 100644 --- a/python/pkgs/recommonmark/default.nix +++ b/python/pkgs/recommonmark/default.nix @@ -2,25 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, commonmark, docutils, sphinx, isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "recommonmark"; version = "0.7.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "rtfd"; repo = "recommonmark"; - rev = version; + tag = finalAttrs.version; sha256 = "0kwm4smxbgq0c0ybkxfvlgrfb3gq9amdw94141jyykk9mmz38379"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ commonmark docutils sphinx @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/rtfd/recommonmark"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/recordlinkage/default.nix b/python/pkgs/recordlinkage/default.nix index ca37a6548..60ea463fe 100644 --- a/python/pkgs/recordlinkage/default.nix +++ b/python/pkgs/recordlinkage/default.nix @@ -17,13 +17,13 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "recordlinkage"; version = "0.16"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7NoMEN/xOLFwaBXeMysShfZwrn6MzpJZYhNQHVieaqQ="; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ + dependencies = [ pyarrow jellyfish numpy @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://recordlinkage.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/rectangle-packer/default.nix b/python/pkgs/rectangle-packer/default.nix index a5f13ab29..b0c57181d 100644 --- a/python/pkgs/rectangle-packer/default.nix +++ b/python/pkgs/rectangle-packer/default.nix @@ -5,7 +5,7 @@ cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rectangle-packer"; version = "2.1.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Penlect"; repo = "rectangle-packer"; - rev = version; + tag = finalAttrs.version; hash = "sha256-rdryJvY1kSRVIlC8LOr+//0fQLWEIExRQxuI3W53n18="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { pythonImportsCheck = [ "rpack" ]; -} +}) diff --git a/python/pkgs/recurring-ical-events/default.nix b/python/pkgs/recurring-ical-events/default.nix index 918a1b1cd..7e1df5ea1 100644 --- a/python/pkgs/recurring-ical-events/default.nix +++ b/python/pkgs/recurring-ical-events/default.nix @@ -10,7 +10,7 @@ x-wr-timezone, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "recurring-ical-events"; version = "3.9.0"; pyproject = true; @@ -18,13 +18,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hBZg1u6JtWGC+l1D1M18al6OQ298Z76tkiqYrBQYIzQ="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'dynamic = ["urls", "version"]' 'version = "${version}"' + --replace 'dynamic = ["urls", "version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/niccokunzmann/python-recurring-ical-events"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/red-black-tree-mod/default.nix b/python/pkgs/red-black-tree-mod/default.nix index b671c7482..2974514b7 100644 --- a/python/pkgs/red-black-tree-mod/default.nix +++ b/python/pkgs/red-black-tree-mod/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "red-black-tree-mod"; version = "1.22"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OONlKQOiv5Y3nCfCCCygt7kFFYZi3X7wyX9P2TqaqQg="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://stromberg.dnsalias.org/~strombrg/red-black-tree-mod/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/redis/default.nix b/python/pkgs/redis/default.nix index 321c744d6..a6f99231a 100644 --- a/python/pkgs/redis/default.nix +++ b/python/pkgs/redis/default.nix @@ -17,7 +17,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "redis"; version = "8.1.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "redis"; repo = "redis-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qKrJaI4IaqTzdeaxx7Q7vEvE6qmmtkrRKefkrhCy4Q4="; }; @@ -55,11 +55,10 @@ buildPythonPackage rec { ]; # Tests require a running redis - doCheck = false; meta = { description = "Python client for Redis key-value store"; homepage = "https://github.com/redis/redis-py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/redisvl/default.nix b/python/pkgs/redisvl/default.nix index d2a37a435..e1b48db23 100644 --- a/python/pkgs/redisvl/default.nix +++ b/python/pkgs/redisvl/default.nix @@ -43,7 +43,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "redisvl" ]; # tests require a live Redis server with the search/vector module - doCheck = false; meta = { description = "Python client library and CLI for using Redis as a vector database"; diff --git a/python/pkgs/redshift-connector/default.nix b/python/pkgs/redshift-connector/default.nix index c1c4451eb..715022e53 100644 --- a/python/pkgs/redshift-connector/default.nix +++ b/python/pkgs/redshift-connector/default.nix @@ -20,7 +20,7 @@ pytest-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "redshift-connector"; version = "2.1.16"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws"; repo = "amazon-redshift-python-driver"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-itcFWp5iWeCK628KBTgcbO1hgfyFkKUNS3S9/R7zEME="; }; @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/aws/amazon-redshift-python-driver"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/referencing/default.nix b/python/pkgs/referencing/default.nix index 9786be202..7af52af0a 100644 --- a/python/pkgs/referencing/default.nix +++ b/python/pkgs/referencing/default.nix @@ -9,7 +9,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "referencing"; version = "0.37.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-jsonschema"; repo = "referencing"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cuy9NS4PtfBILjw9gv7GRfheKez4FEf8ym94/O6nNcE="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-jsonschema/referencing"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/reflink/default.nix b/python/pkgs/reflink/default.nix index 46889706b..b6acafd3d 100644 --- a/python/pkgs/reflink/default.nix +++ b/python/pkgs/reflink/default.nix @@ -2,20 +2,24 @@ buildPythonPackage, cffi, fetchPypi, + # build-system + setuptools, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "reflink"; version = "0.2.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iCN17nMZJ1rl9qahKHQGNl2sHpZDuRrRDlGH0/hCU70="; }; - propagatedBuildInputs = [ cffi ]; + build-system = [ setuptools ]; + + dependencies = [ cffi ]; propagatedNativeBuildInputs = [ cffi ]; postPatch = '' @@ -24,7 +28,6 @@ buildPythonPackage rec { ''; # FIXME: These do not work, and I have been unable to figure out why. - doCheck = false; pythonImportsCheck = [ "reflink" ]; @@ -33,4 +36,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/rubdos/pyreflink"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/regress/default.nix b/python/pkgs/regress/default.nix index a4757b381..e8d13671a 100644 --- a/python/pkgs/regress/default.nix +++ b/python/pkgs/regress/default.nix @@ -7,14 +7,14 @@ libiconv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "regress"; version = "2025.10.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3MCorwzbw9bg1HJfETM10KX/u6hq48oY0rWzUsXyyO0="; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-DOnKFVg+5cIv0T3mKzF8O9jj5+ZenQrLjTltfd+Tm9U="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/Julian/regress"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/relatorio/default.nix b/python/pkgs/relatorio/default.nix index 262180c11..2164e7784 100644 --- a/python/pkgs/relatorio/default.nix +++ b/python/pkgs/relatorio/default.nix @@ -7,13 +7,13 @@ lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "relatorio"; version = "0.11.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-e6CvclFrRfXR5fL2ZG1LZxTTsTRouLsDicCwvXtySGE="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://relatorio.tryton.org/"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/releases/default.nix b/python/pkgs/releases/default.nix index 3f25dbf19..3bbeb7260 100644 --- a/python/pkgs/releases/default.nix +++ b/python/pkgs/releases/default.nix @@ -1,28 +1,32 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lib, semantic-version, sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "releases"; version = "2.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "bitprophet"; repo = "releases"; - rev = version; + tag = finalAttrs.version; hash = "sha256-IgEKAUk97R3ZvqvexD/ptT8i0uf48K+DKkk4q3pn3G8="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py --replace "semantic_version<2.7" "semantic_version" ''; - propagatedBuildInputs = [ + dependencies = [ semantic-version sphinx ]; @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/bitprophet/releases"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/remote-pdb/default.nix b/python/pkgs/remote-pdb/default.nix index 65e2dbdd9..919f4430f 100644 --- a/python/pkgs/remote-pdb/default.nix +++ b/python/pkgs/remote-pdb/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "remote-pdb"; version = "2.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LXDG9B4Oq/AWXo8b5Y+CqnpgWq6rjyrv65ziRkMQkcE="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ionelmc/python-remote-pdb"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/rencode/default.nix b/python/pkgs/rencode/default.nix index 2b9adf6fc..e6abd8289 100644 --- a/python/pkgs/rencode/default.nix +++ b/python/pkgs/rencode/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rencode"; version = "1.0.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-g7LZtthK3DVhW3oJt0J5IRq6r1eleK8QrQEkVamadyI="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/aresch/rencode"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/reparser/default.nix b/python/pkgs/reparser/default.nix index c837827ab..cd64b0979 100644 --- a/python/pkgs/reparser/default.nix +++ b/python/pkgs/reparser/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "reparser"; version = "1.4.3"; pyproject = true; src = fetchPypi { pname = "ReParser"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-5pyvWKKdbgRyP2p6RW0wS3rPz0E5V9r82Q7knszC0Vo="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/xmikos/reparser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/repeated-test/default.nix b/python/pkgs/repeated-test/default.nix index 32d4c2b9c..c6cf80ff4 100644 --- a/python/pkgs/repeated-test/default.nix +++ b/python/pkgs/repeated-test/default.nix @@ -5,14 +5,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "repeated-test"; version = "2.3.3"; pyproject = true; src = fetchPypi { pname = "repeated_test"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-3YPU8SL9rud5s0pnwwH5TJk1MXsDhdkDnZp/Oj6sgXs="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/epsy/repeated_test"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/reportlab/default.nix b/python/pkgs/reportlab/default.nix index 468183dc6..e6a45e12d 100644 --- a/python/pkgs/reportlab/default.nix +++ b/python/pkgs/reportlab/default.nix @@ -14,7 +14,7 @@ let dontDisableStatic = true; }); in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "reportlab"; version = "5.0.1"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { disabled = isPyPy; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-69ExVL4chRXmZd5wvS0wOundw+9H5Er9URZEHKAoOiY="; }; @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://www.reportlab.com/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/repoze-lru/default.nix b/python/pkgs/repoze-lru/default.nix index 31e591249..7d97cca21 100644 --- a/python/pkgs/repoze-lru/default.nix +++ b/python/pkgs/repoze-lru/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "repoze-lru"; version = "0.7"; pyproject = true; src = fetchPypi { pname = "repoze.lru"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-BCmnXhk4Dk7VDAaU4mrIgZtOp4Ue4fx1g8hXLbgK/3c="; }; @@ -22,11 +22,9 @@ buildPythonPackage rec { pythonNamespaces = [ "repoze" ]; - doCheck = false; - meta = { homepage = "http://www.repoze.org/"; description = "Tiny LRU cache implementation and decorator"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/requests-aws4auth/default.nix b/python/pkgs/requests-aws4auth/default.nix index 743048be5..a7a9ed3c1 100644 --- a/python/pkgs/requests-aws4auth/default.nix +++ b/python/pkgs/requests-aws4auth/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-aws4auth"; version = "1.3.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tedder"; repo = "requests-aws4auth"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GIbv4/a1ZdcIOemanzDiueLcKg8pUVeIFSAfErIr0HI="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/sam-washington/requests-aws4auth"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/requests-cache/default.nix b/python/pkgs/requests-cache/default.nix index 178924b6b..868bdc60e 100644 --- a/python/pkgs/requests-cache/default.nix +++ b/python/pkgs/requests-cache/default.nix @@ -11,14 +11,14 @@ url-normalize, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-cache"; version = "1.3.3"; pyproject = true; src = fetchPypi { pname = "requests_cache"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ebctWsUUOZLRg2rXj02OZWZgYd1E4iBUjKqzcjCJgms="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/requests-cache/requests-cache"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/requests-file/default.nix b/python/pkgs/requests-file/default.nix index ad4256243..dc0dd99a3 100644 --- a/python/pkgs/requests-file/default.nix +++ b/python/pkgs/requests-file/default.nix @@ -7,7 +7,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-file"; version = "2.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dashea"; repo = "requests-file"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JtdtE44yiw2mLMZ0bJv0QiGWb7f8ywPLF7+BUufh/g4="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/dashea/requests-file"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/requests-futures/default.nix b/python/pkgs/requests-futures/default.nix index 002b7b1a2..14c0c4e31 100644 --- a/python/pkgs/requests-futures/default.nix +++ b/python/pkgs/requests-futures/default.nix @@ -6,7 +6,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-futures"; version = "1.0.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ross"; repo = "requests-futures"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eUu+M9rPyvc7OaOCCnUvGliK4gicYh6hfB0Jo19Yy1g="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/ross/requests-futures"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/requests-gssapi/default.nix b/python/pkgs/requests-gssapi/default.nix index 4ee4dc319..1d9d91099 100644 --- a/python/pkgs/requests-gssapi/default.nix +++ b/python/pkgs/requests-gssapi/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-gssapi"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "requests_gssapi"; hash = "sha256-uifrMp9IQNllvI+l02DGJ8dDSe+mFWylAa2Jr8ahNPQ="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/pythongssapi/requests-gssapi"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/requests-kerberos/default.nix b/python/pkgs/requests-kerberos/default.nix index cd506e758..f63f16fd6 100644 --- a/python/pkgs/requests-kerberos/default.nix +++ b/python/pkgs/requests-kerberos/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-kerberos"; version = "0.15.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "requests"; repo = "requests-kerberos"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-s1Q3zqKPSuTkiFExr+axai9Eta1xjw/cip8xzfDGR88="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/requests/requests-kerberos"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/requests-mock/default.nix b/python/pkgs/requests-mock/default.nix index 2741f579d..4d6223330 100644 --- a/python/pkgs/requests-mock/default.nix +++ b/python/pkgs/requests-mock/default.nix @@ -7,13 +7,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-mock"; version = "1.12.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6eEuMztSUVboKjyFLyIBa5FYIg0vR0VN6crop303FAE="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { description = "Mock out responses from the requests package"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/requests-ntlm/default.nix b/python/pkgs/requests-ntlm/default.nix index 9c9f32ff2..ffbe42767 100644 --- a/python/pkgs/requests-ntlm/default.nix +++ b/python/pkgs/requests-ntlm/default.nix @@ -8,14 +8,14 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-ntlm"; version = "1.3.0"; pyproject = true; src = fetchPypi { pname = "requests_ntlm"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-spzCRiYj3/35uIxD4YDMtzW0AHIopUIiDogsWK5Wxmg="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/requests/requests-ntlm"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/requests-oauthlib/default.nix b/python/pkgs/requests-oauthlib/default.nix index cb9252aba..807489cb8 100644 --- a/python/pkgs/requests-oauthlib/default.nix +++ b/python/pkgs/requests-oauthlib/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, oauthlib, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-oauthlib"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-s9/669iE2M13hJQ2lgOp57WNKREb9rQb3C3NhyA69Ok="; }; + build-system = [ setuptools ]; + dependencies = [ oauthlib requests @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/requests/requests-oauthlib"; license = with lib.licenses; [ isc ]; }; -} +}) diff --git a/python/pkgs/requests-pkcs12/default.nix b/python/pkgs/requests-pkcs12/default.nix index ebfde4f0a..1c937fcba 100644 --- a/python/pkgs/requests-pkcs12/default.nix +++ b/python/pkgs/requests-pkcs12/default.nix @@ -2,23 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pyopenssl, requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-pkcs12"; version = "1.27"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "m-click"; repo = "requests_pkcs12"; - rev = version; + tag = finalAttrs.version; hash = "sha256-4B7jL3OubIF8ZOYzsODltZCAHhb+PM18uJDOssuM6R4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests pyopenssl ]; @@ -32,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/m-click/requests_pkcs12"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/requests-toolbelt/default.nix b/python/pkgs/requests-toolbelt/default.nix index 835112583..d27802114 100644 --- a/python/pkgs/requests-toolbelt/default.nix +++ b/python/pkgs/requests-toolbelt/default.nix @@ -6,13 +6,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-toolbelt"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-doGgo9BHAStb3A7jfX+PB+vnarCMrsz8OSHOI8iNW8Y="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://toolbelt.readthedocs.io/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/requests-unixsocket/default.nix b/python/pkgs/requests-unixsocket/default.nix index 67d5d19ea..cca7cb2e3 100644 --- a/python/pkgs/requests-unixsocket/default.nix +++ b/python/pkgs/requests-unixsocket/default.nix @@ -8,14 +8,14 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-unixsocket"; version = "0.4.1"; pyproject = true; src = fetchPypi { pname = "requests_unixsocket"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-sllhWMNW7O5o0nukaaUiESMKxvsM3otmr7GfDtR6GZU="; }; @@ -29,8 +29,6 @@ buildPythonPackage rec { urllib3 ]; - doCheck = false; - pythonImportsCheck = [ "requests_unixsocket" ]; meta = { @@ -38,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/msabramo/requests-unixsocket"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/requests-unixsocket2/default.nix b/python/pkgs/requests-unixsocket2/default.nix index 260a08e3d..29896a9cc 100644 --- a/python/pkgs/requests-unixsocket2/default.nix +++ b/python/pkgs/requests-unixsocket2/default.nix @@ -7,7 +7,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-unixsocket2"; version = "1.0.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "thelabnyc"; repo = "requests-unixsocket2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KgPIecKQibB5ZH+itw3OM9heSE3uDuodNS1R9dRkaHE="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/thelabnyc/requests-unixsocket2"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/requests-wsgi-adapter/default.nix b/python/pkgs/requests-wsgi-adapter/default.nix index 55aee3d0f..b7672e617 100644 --- a/python/pkgs/requests-wsgi-adapter/default.nix +++ b/python/pkgs/requests-wsgi-adapter/default.nix @@ -6,13 +6,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-wsgi-adapter"; version = "0.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-WncJ6Qq/SdGB9sMqo3eUU39yXeD23UI2K8jIyQgSyHg="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/seanbrant/requests-wsgi-adapter"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/requestsexceptions/default.nix b/python/pkgs/requestsexceptions/default.nix index 179f108e5..b0c9f6dab 100644 --- a/python/pkgs/requestsexceptions/default.nix +++ b/python/pkgs/requestsexceptions/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requestsexceptions"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-sJXLx3YY8GbUWaArE3sCDDfan0bZsFdwQBnJ9326MGU="; }; @@ -23,11 +23,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "requestsexceptions" ]; - doCheck = false; - meta = { homepage = "https://pypi.org/project/requestsexceptions/"; description = "Import exceptions from potentially bundled packages in requests"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/requirements-detector/default.nix b/python/pkgs/requirements-detector/default.nix index 6deed7dee..75e0ef6c2 100644 --- a/python/pkgs/requirements-detector/default.nix +++ b/python/pkgs/requirements-detector/default.nix @@ -10,7 +10,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requirements-detector"; version = "1.3.2"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "landscapeio"; repo = "requirements-detector"; - tag = version; + tag = finalAttrs.version; hash = "sha256-IWVIYDE/5/9sFgOFftRE4nmY0IDJ0oOvvaGMODkozQg="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "detect-requirements"; }; -} +}) diff --git a/python/pkgs/requirements-parser/default.nix b/python/pkgs/requirements-parser/default.nix index 0450cea23..b8dd7ad60 100644 --- a/python/pkgs/requirements-parser/default.nix +++ b/python/pkgs/requirements-parser/default.nix @@ -6,7 +6,7 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requirements-parser"; version = "0.13.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "madpah"; repo = "requirements-parser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Hti1r/OLYHue+c7/TDDRzBgKxJazobZG+aFxK2ok70g="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/davidfischer/requirements-parser"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/reretry/default.nix b/python/pkgs/reretry/default.nix index bc38ba13c..620d610e6 100644 --- a/python/pkgs/reretry/default.nix +++ b/python/pkgs/reretry/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "reretry"; version = "0.11.8"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8nkfzr5RLqLx0VOih0d4UjqAZIYLWRzZCvwhqL7UMuM="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "reretry" ]; meta = { @@ -21,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/leshchenko1979/reretry"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/resampy/default.nix b/python/pkgs/resampy/default.nix index 6949a2475..1742e9223 100644 --- a/python/pkgs/resampy/default.nix +++ b/python/pkgs/resampy/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "resampy"; version = "0.4.3"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bmcfee"; repo = "resampy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LOWpOPAEK+ga7c3bR15QvnHmON6ARS1Qee/7U/VMlTY="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/bmcfee/resampy"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/resolvelib/default.nix b/python/pkgs/resolvelib/default.nix index 01a0611e4..39c5b1c76 100644 --- a/python/pkgs/resolvelib/default.nix +++ b/python/pkgs/resolvelib/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "resolvelib"; version = "1.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fQiiAi9uFs5AXWC2jDkPBU78/QR31Lm9AZzJQcKPrRw="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "resolvelib" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { description = "Resolve abstract dependencies into concrete ones"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/responses/default.nix b/python/pkgs/responses/default.nix index 1ef7963e0..cbdaf02a1 100644 --- a/python/pkgs/responses/default.nix +++ b/python/pkgs/responses/default.nix @@ -14,7 +14,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "responses"; version = "0.26.3"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "getsentry"; repo = "responses"; - tag = version; + tag = finalAttrs.version; hash = "sha256-80NVKgzRikxXsHQiDdiXoJ2QdB+668NK0L66JarCa3M="; }; @@ -38,11 +38,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "responses" ]; - doCheck = false; - meta = { description = "Python module for mocking out the requests Python library"; homepage = "https://github.com/getsentry/responses"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/respx/default.nix b/python/pkgs/respx/default.nix index d62de186e..17968686c 100644 --- a/python/pkgs/respx/default.nix +++ b/python/pkgs/respx/default.nix @@ -12,7 +12,7 @@ trio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "respx"; version = "0.23.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lundberg"; repo = "respx"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Fz3CS9rIm+H6axVIRErlFTTDgtAcTmGj4/wabLxDV2I="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://lundberg.github.io/respx/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/restrictedpython/default.nix b/python/pkgs/restrictedpython/default.nix index ce3621833..fc1928aa7 100644 --- a/python/pkgs/restrictedpython/default.nix +++ b/python/pkgs/restrictedpython/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "restrictedpython"; version = "8.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "RestrictedPython"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Ck5YDtjYs7rZk+MC+eKrQVCQX1EYlxC6m4kD5+QjfjE="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/RestrictedPython"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/restructuredtext-lint/default.nix b/python/pkgs/restructuredtext-lint/default.nix index 1584ec558..ea45cdaad 100644 --- a/python/pkgs/restructuredtext-lint/default.nix +++ b/python/pkgs/restructuredtext-lint/default.nix @@ -6,13 +6,13 @@ docutils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "restructuredtext_lint"; version = "2.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3SUgm54Lcmkp2DBjOfr3I3NKMTfbOCvPJylPoYprxSs="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/twolfson/restructuredtext-lint"; license = lib.licenses.unlicense; }; -} +}) diff --git a/python/pkgs/result/default.nix b/python/pkgs/result/default.nix index bed102794..a0c2c1b82 100644 --- a/python/pkgs/result/default.nix +++ b/python/pkgs/result/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "result"; version = "0.17.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rustedpy"; repo = "result"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-o+7qKxGQCeMUnsmEReggvf+XwQWFHRCYArYk3DxCa50="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/rustedpy/result"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/retry-decorator/default.nix b/python/pkgs/retry-decorator/default.nix index 322f0a6f7..8be105b90 100644 --- a/python/pkgs/retry-decorator/default.nix +++ b/python/pkgs/retry-decorator/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "retry-decorator"; version = "1.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "pnpnpn"; repo = "retry-decorator"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0dZq4YbPcH4ItyMnpF7B20YYLtzwniJClBK9gRndU1M="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "retry_decorator" ]; meta = { @@ -23,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/pnpnpn/retry-decorator"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/retry/default.nix b/python/pkgs/retry/default.nix index 11d5743f4..3d66732e5 100644 --- a/python/pkgs/retry/default.nix +++ b/python/pkgs/retry/default.nix @@ -12,13 +12,13 @@ py, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "retry"; version = "0.9.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+L+ouZtpxFBtb1vTsKq/d/mM2xfzyfw/XKggAzM2+6Q="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/invl/retry"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/retryhttp/default.nix b/python/pkgs/retryhttp/default.nix index b0a42ebcb..9530ff05e 100644 --- a/python/pkgs/retryhttp/default.nix +++ b/python/pkgs/retryhttp/default.nix @@ -13,7 +13,7 @@ types-requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "retryhttp"; version = "1.4.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "austind"; repo = "retryhttp"; - tag = "release/v${version}"; + tag = "release/v${finalAttrs.version}"; hash = "sha256-wUz5cC8O//TqlalDoF1KtUCqONnfCShFv3hU4k4fzuM="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/austind/retryhttp"; license = lib.licenses.apsl20; }; -} +}) diff --git a/python/pkgs/retrying/default.nix b/python/pkgs/retrying/default.nix index eca6ffe36..be03c31cc 100644 --- a/python/pkgs/retrying/default.nix +++ b/python/pkgs/retrying/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "retrying"; version = "1.4.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0QLnXVPY0wuIVi1FNh1sbJNNoG+rMb2BwEIKy5eoujk="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "General-purpose retrying library"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/rfc3339-validator/default.nix b/python/pkgs/rfc3339-validator/default.nix index 00142a36a..47f3c3fae 100644 --- a/python/pkgs/rfc3339-validator/default.nix +++ b/python/pkgs/rfc3339-validator/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rfc3339-validator"; version = "0.1.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "rfc3339_validator"; - inherit version; + inherit (finalAttrs) version; sha256 = "0srg0b89aikzinw72s433994k5gv5lfyarq1adhas11kz6yjm2hk"; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; pythonImportsCheck = [ "rfc3339_validator" ]; @@ -25,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/naimetti/rfc3339-validator"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rfc3339/default.nix b/python/pkgs/rfc3339/default.nix index 6db404203..7404cbd10 100644 --- a/python/pkgs/rfc3339/default.nix +++ b/python/pkgs/rfc3339/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rfc3339"; version = "6.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1Tw7Xu+u+JK3JAuiqR/vAS6G+qTQoMp4I1nEkOAK1NA="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://hg.sr.ht/~henryprecheur/rfc3339"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/rfc3986-validator/default.nix b/python/pkgs/rfc3986-validator/default.nix index c8cb5a043..9b64ffd4d 100644 --- a/python/pkgs/rfc3986-validator/default.nix +++ b/python/pkgs/rfc3986-validator/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rfc3986-validator"; version = "0.1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "rfc3986_validator"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-PUS955IbO57Drk463KNwQ47M68Z2RWRJsUXVM7JA0FU="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner'," "" @@ -25,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/naimetti/rfc3986-validator"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rfc3986/default.nix b/python/pkgs/rfc3986/default.nix index 9440f2d76..6defc48bd 100644 --- a/python/pkgs/rfc3986/default.nix +++ b/python/pkgs/rfc3986/default.nix @@ -6,13 +6,13 @@ idna, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rfc3986"; version = "2.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-l6rPnb1L/YKbqtbmMJ+mVzqvG+P2+nNcirBeRs7LJhw="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { dependencies = [ idna ]; - doCheck = false; - pythonImportsCheck = [ "rfc3986" ]; meta = { @@ -29,4 +27,4 @@ buildPythonPackage rec { homepage = "https://rfc3986.readthedocs.org"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/rfc3987-syntax/default.nix b/python/pkgs/rfc3987-syntax/default.nix index 8af5c7116..1b07fbbe2 100644 --- a/python/pkgs/rfc3987-syntax/default.nix +++ b/python/pkgs/rfc3987-syntax/default.nix @@ -6,7 +6,7 @@ lark, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rfc3987-syntax"; version = "1.1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "willynilly"; repo = "rfc3987-syntax"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6jA/x8KnwBvyW2k384/EB/NJ8BmJJTEHA8YUlQP+1Y4="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/willynilly/rfc3987-syntax"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rfc3987/default.nix b/python/pkgs/rfc3987/default.nix index e8f2737f1..005cae11a 100644 --- a/python/pkgs/rfc3987/default.nix +++ b/python/pkgs/rfc3987/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rfc3987"; version = "1.3.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-08TSV6Vg1UTpgms4vIHbZ2iQx5q516ySs5x6JT1cpzM="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "rfc3987" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/rfc3987/"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/rfc6555/default.nix b/python/pkgs/rfc6555/default.nix index a461c19b4..a9e2c3de5 100644 --- a/python/pkgs/rfc6555/default.nix +++ b/python/pkgs/rfc6555/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rfc6555"; version = "0.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "sethmlarson"; repo = "rfc6555"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "rfc6555" ]; meta = { @@ -23,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/sethmlarson/rfc6555"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/rfc8785/default.nix b/python/pkgs/rfc8785/default.nix index c67009793..5c7619e4b 100644 --- a/python/pkgs/rfc8785/default.nix +++ b/python/pkgs/rfc8785/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rfc8785"; version = "0.1.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "trailofbits"; repo = "rfc8785.py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0Gze3voFXEhf13DuTuBWDbYPmqHXs0FSRn2NprFWoB8="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/trailofbits/rfc8785.py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/rich-argparse/default.nix b/python/pkgs/rich-argparse/default.nix index 4ade6f8e1..b06a94404 100644 --- a/python/pkgs/rich-argparse/default.nix +++ b/python/pkgs/rich-argparse/default.nix @@ -6,7 +6,7 @@ rich, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rich-argparse"; version = "1.8.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hamdanal"; repo = "rich-argparse"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ze9wJn+Cxz/NhbG8xKwHZHaDqMdU142/vJjml3Y9508="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/hamdanal/rich-argparse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rich-click/default.nix b/python/pkgs/rich-click/default.nix index c8be96bbc..250c15017 100644 --- a/python/pkgs/rich-click/default.nix +++ b/python/pkgs/rich-click/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { ]; # Module has no test - doCheck = false; pythonImportsCheck = [ "rich_click" ]; diff --git a/python/pkgs/rich/default.nix b/python/pkgs/rich/default.nix index 4a2d6cfe9..8d67aa48f 100644 --- a/python/pkgs/rich/default.nix +++ b/python/pkgs/rich/default.nix @@ -7,7 +7,7 @@ pygments, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rich"; version = "15.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Textualize"; repo = "rich"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Uk3r6aYhrjYJ8GrMKfdlv3/muK/uUynd4pd1yWCwSOM="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/Textualize/rich"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rjsmin/default.nix b/python/pkgs/rjsmin/default.nix index c61691dc6..1448f1d45 100644 --- a/python/pkgs/rjsmin/default.nix +++ b/python/pkgs/rjsmin/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rjsmin"; version = "1.2.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-o/gECwJz3sdz4OgH6GpNCpU1UWwKCjWqG7bebhW7Hwk="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Module to minify Javascript"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/rlp/default.nix b/python/pkgs/rlp/default.nix index d11408f25..93ccaec65 100644 --- a/python/pkgs/rlp/default.nix +++ b/python/pkgs/rlp/default.nix @@ -7,7 +7,7 @@ eth-utils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rlp"; version = "5.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "pyrlp"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-a13KBXZyId83EukBTc3zu1GgllsqMRS0gpYfZ29+bjQ="; }; @@ -24,11 +24,11 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ eth-utils ]; + dependencies = [ eth-utils ]; pythonImportsCheck = [ "rlp" ]; meta = { description = "RLP serialization library"; homepage = "https://github.com/ethereum/pyrlp"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rnc2rng/default.nix b/python/pkgs/rnc2rng/default.nix index 4f3ae806d..fec933d08 100644 --- a/python/pkgs/rnc2rng/default.nix +++ b/python/pkgs/rnc2rng/default.nix @@ -6,13 +6,13 @@ rply, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rnc2rng"; version = "2.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3Z/7vWnQnLB+bnqM+A/ShwP9xtO5Am+HVrScvjMUZ2s="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "rnc2rng"; }; -} +}) diff --git a/python/pkgs/robot-detection/default.nix b/python/pkgs/robot-detection/default.nix index 4a33dded8..072ecaa72 100644 --- a/python/pkgs/robot-detection/default.nix +++ b/python/pkgs/robot-detection/default.nix @@ -10,13 +10,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "robot-detection"; version = "0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PY+3LKRxZLjOVeM73ak3QvYsNI3vfTzDtCsM60eVovU="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/rory/robot-detection"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/robotframework-pythonlibcore/default.nix b/python/pkgs/robotframework-pythonlibcore/default.nix index 14eac4f4b..c21411d3c 100644 --- a/python/pkgs/robotframework-pythonlibcore/default.nix +++ b/python/pkgs/robotframework-pythonlibcore/default.nix @@ -6,7 +6,7 @@ robotframework, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "robotframework-pythonlibcore"; version = "4.6.0"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robotframework"; repo = "PythonLibCore"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-H13b25M4vEymXZzhAm/EXMx7v5u/9rgkBXv7nBaxAvo="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/robotframework/PythonLibCore"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/robotframework-sshlibrary/default.nix b/python/pkgs/robotframework-sshlibrary/default.nix index 7a710af2f..c187c0dd8 100644 --- a/python/pkgs/robotframework-sshlibrary/default.nix +++ b/python/pkgs/robotframework-sshlibrary/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, robotframework, paramiko, scp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "3.8.0"; - format = "setuptools"; + pyproject = true; pname = "robotframework-sshlibrary"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "aedf8a02bcb7344404cf8575d0ada25d6c7dc2fcb65de2113c4e07c63d2446c2"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ robotframework paramiko scp @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/robotframework/SSHLibrary"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/robotframework/default.nix b/python/pkgs/robotframework/default.nix index 4e8ad1540..9a5ecf8a0 100644 --- a/python/pkgs/robotframework/default.nix +++ b/python/pkgs/robotframework/default.nix @@ -7,7 +7,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "robotframework"; version = "7.4.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robotframework"; repo = "robotframework"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SSjVrbe3uBqCMEUYjrk2lxHpxzdU6QK2xvEFszhT6lc="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://robotframework.org/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/rollbar/default.nix b/python/pkgs/rollbar/default.nix index 0c02d9935..3981fbb97 100644 --- a/python/pkgs/rollbar/default.nix +++ b/python/pkgs/rollbar/default.nix @@ -7,13 +7,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rollbar"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-mK1/kAEseR0LQOrFG2/miLHK3MSq3/dy/Aoj7+dftfw="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/rollbar/pyrollbar"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/roman/default.nix b/python/pkgs/roman/default.nix index efe0139be..dbbd5b43e 100644 --- a/python/pkgs/roman/default.nix +++ b/python/pkgs/roman/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "roman"; version = "5.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-J1/p9GKQ99D/rqHDMlG5K45GOs4jZgUIzu9SLnWHy28="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/roman/"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/rope/default.nix b/python/pkgs/rope/default.nix index f555c36af..a9ea398fb 100644 --- a/python/pkgs/rope/default.nix +++ b/python/pkgs/rope/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rope"; version = "1.14.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iAPjtmcxUET2JwsMaaEMBnn58yLtjv5iRak863ZY2mk="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-rope/rope"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/rospkg/default.nix b/python/pkgs/rospkg/default.nix index 2d01ad7a9..0a6bcf175 100644 --- a/python/pkgs/rospkg/default.nix +++ b/python/pkgs/rospkg/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rospkg"; version = "1.6.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ros-infrastructure"; repo = "rospkg"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YRBmL+aXQ/0rxivERja9ng+GqL8NQGmNYhKjMY7+6nc="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "http://wiki.ros.org/rospkg"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/routes/default.nix b/python/pkgs/routes/default.nix index ecf7e5f50..b7cd82c51 100644 --- a/python/pkgs/routes/default.nix +++ b/python/pkgs/routes/default.nix @@ -7,14 +7,14 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "routes"; version = "2.5.1"; pyproject = true; src = fetchPypi { pname = "Routes"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-tjRkWaFfDLqwGkWpDD0lyvmA1HM9YotMwZUrhlEl0FM="; }; @@ -27,11 +27,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "routes" ]; - doCheck = false; - meta = { homepage = "https://github.com/bbangert/routes"; description = "Re-implementation of the Rails routes system for mapping URLs to application actions"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rpcq/default.nix b/python/pkgs/rpcq/default.nix index bd7888cc7..f5846c41e 100644 --- a/python/pkgs/rpcq/default.nix +++ b/python/pkgs/rpcq/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rpcq"; version = "3.10.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rigetti"; repo = "rpcq"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-J7jtGXJIF3jp0a0IQZmSR4TWf9D02Luau+Bupmi/d68="; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ msgpack python-rapidjson pyzmq @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/rigetti/rpcq"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/rpds-py/default.nix b/python/pkgs/rpds-py/default.nix index a7dcb915f..f1c4d1e6c 100644 --- a/python/pkgs/rpds-py/default.nix +++ b/python/pkgs/rpds-py/default.nix @@ -9,19 +9,19 @@ libiconv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rpds-py"; version = "0.30.0"; pyproject = true; src = fetchPypi { pname = "rpds_py"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-3Y/3z5ABSvDA94fuo0eU6/ZBUkLuHW+pHqunJcxEHoQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-2m2DW1rknZR+UztgUcRaQk4gY19eXmT089U2YlV16d8="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/crate-py/rpds"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rpi-gpio/default.nix b/python/pkgs/rpi-gpio/default.nix index 0cdd13249..2fae3c734 100644 --- a/python/pkgs/rpi-gpio/default.nix +++ b/python/pkgs/rpi-gpio/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rpi-gpio"; version = "0.7.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "RPi.GPIO"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-zWHEsDw3tiu6SlrP6phidJwzxhjgKV5+kKpHE/s3O3A="; }; + build-system = [ setuptools ]; + # Raspberry Pi meta = { @@ -23,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/rply/default.nix b/python/pkgs/rply/default.nix index 791d123e7..b8fda0c49 100644 --- a/python/pkgs/rply/default.nix +++ b/python/pkgs/rply/default.nix @@ -6,13 +6,13 @@ appdirs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rply"; version = "0.7.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-KoCKwlpFgKmZH8ME1kQ04pmo/HV2BXRJLyQsu1uzAck="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/alex/rply"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/rpmfile/default.nix b/python/pkgs/rpmfile/default.nix index 6fa7aa01f..8ec969f7f 100644 --- a/python/pkgs/rpmfile/default.nix +++ b/python/pkgs/rpmfile/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rpmfile"; version = "2.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CsK7qJJ3xxhcuGHJxtfQyaJovlFpUW28amjxVWqeP5k="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/srossross/rpmfile"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rpmfluff/default.nix b/python/pkgs/rpmfluff/default.nix index c09407c92..c8a8b7d88 100644 --- a/python/pkgs/rpmfluff/default.nix +++ b/python/pkgs/rpmfluff/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchurl, + # build-system + setuptools, glibcLocales, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rpmfluff"; version = "0.5.7.1"; - format = "setuptools"; + pyproject = true; src = fetchurl { - url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; + url = "https://releases.pagure.org/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; sha256 = "19vnlzma8b0aghdiixk0q3wc10y6306hsnic0qvswaaiki94fss1"; }; + build-system = [ setuptools ]; + env.LC_ALL = "en_US.utf-8"; buildInputs = [ glibcLocales ]; @@ -23,4 +27,4 @@ buildPythonPackage rec { homepage = "https://pagure.io/rpmfluff"; license = lib.licenses.gpl2; }; -} +}) diff --git a/python/pkgs/rpy2-rinterface/default.nix b/python/pkgs/rpy2-rinterface/default.nix index 986239789..07d91ec46 100644 --- a/python/pkgs/rpy2-rinterface/default.nix +++ b/python/pkgs/rpy2-rinterface/default.nix @@ -14,16 +14,16 @@ cffi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "3.6.6"; pyproject = true; pname = "rpy2-rinterface"; disabled = isPyPy; src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${ - builtins.replaceStrings [ "-" ] [ "_" ] pname - }-${version}.tar.gz"; + url = "mirror://pypi/${builtins.substring 0 1 finalAttrs.pname}/${finalAttrs.pname}/${ + builtins.replaceStrings [ "-" ] [ "_" ] finalAttrs.pname + }-${finalAttrs.version}.tar.gz"; hash = "sha256-qcwTQc5ctN8dxnxA3Dss4Mr6znIVvUJi/g7QEZWKM2k="; }; @@ -68,4 +68,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/rpy2-robjects/default.nix b/python/pkgs/rpy2-robjects/default.nix index 4c40dd25a..c94bdc5d5 100644 --- a/python/pkgs/rpy2-robjects/default.nix +++ b/python/pkgs/rpy2-robjects/default.nix @@ -14,16 +14,16 @@ tzlocal, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "3.6.5"; pyproject = true; pname = "rpy2-robjects"; disabled = isPyPy; src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${ - builtins.replaceStrings [ "-" ] [ "_" ] pname - }-${version}.tar.gz"; + url = "mirror://pypi/${builtins.substring 0 1 finalAttrs.pname}/${finalAttrs.pname}/${ + builtins.replaceStrings [ "-" ] [ "_" ] finalAttrs.pname + }-${finalAttrs.version}.tar.gz"; hash = "sha256-A9CZ9DagGotR+4+L9gJCCpnHzdqMP84OOg9TLja0r+Q="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/rpy2/default.nix b/python/pkgs/rpy2/default.nix index f4396f9c4..25f7fbd6d 100644 --- a/python/pkgs/rpy2/default.nix +++ b/python/pkgs/rpy2/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "3.6.7"; pyproject = true; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { - inherit version pname; + inherit (finalAttrs) version pname; hash = "sha256-8ftGSc59FOk1EzCI3sl82ifrN858xxA4X4HcpVb+jJ8="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/rpyc/default.nix b/python/pkgs/rpyc/default.nix index 93d377399..034277af3 100644 --- a/python/pkgs/rpyc/default.nix +++ b/python/pkgs/rpyc/default.nix @@ -7,7 +7,7 @@ plumbum, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rpyc"; version = "6.0.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tomerfiliba"; repo = "rpyc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KLAOt0FStHV0senU/I4chxgn3PPM59CGhjTr/5U0sa8="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://rpyc.readthedocs.org"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rq/default.nix b/python/pkgs/rq/default.nix index 9ba99f1cd..7f07ea2fa 100644 --- a/python/pkgs/rq/default.nix +++ b/python/pkgs/rq/default.nix @@ -16,7 +16,6 @@ buildPythonPackage (finalAttrs: { pname = "rq"; version = "2.12"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "rq"; diff --git a/python/pkgs/rsa/default.nix b/python/pkgs/rsa/default.nix index efe746716..6e2ed00e4 100644 --- a/python/pkgs/rsa/default.nix +++ b/python/pkgs/rsa/default.nix @@ -6,7 +6,7 @@ pyasn1, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rsa"; version = "4.9"; pyproject = true; @@ -14,17 +14,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sybrenstuvel"; repo = "python-rsa"; - rev = "version-${version}"; + tag = "version-${finalAttrs.version}"; hash = "sha256-PwaRe+ICy0UoguXSMSh3PFl5R+YAhJwNdNN9isadlJY="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ pyasn1 ]; + dependencies = [ pyasn1 ]; meta = { homepage = "https://stuvel.eu/rsa"; license = lib.licenses.asl20; description = "Pure-Python RSA implementation"; }; -} +}) diff --git a/python/pkgs/rst2pdf/default.nix b/python/pkgs/rst2pdf/default.nix index b9e7bfb02..1fbffbd33 100644 --- a/python/pkgs/rst2pdf/default.nix +++ b/python/pkgs/rst2pdf/default.nix @@ -17,13 +17,13 @@ pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rst2pdf"; version = "0.105"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hX6HQQFOxQFfegCq+13Mu1Y3jvTB2lWoKNRLz1/zrNs="; }; @@ -44,7 +44,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ + dependencies = [ docutils importlib-metadata jinja2 @@ -58,7 +58,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "rst2pdf" ]; # Test suite fails: https://github.com/rst2pdf/rst2pdf/issues/1067 - doCheck = false; postInstall = '' ${lib.getExe' docutils "rst2man"} doc/rst2pdf.rst rst2pdf.1 @@ -71,4 +70,4 @@ buildPythonPackage rec { homepage = "https://rst2pdf.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rstr/default.nix b/python/pkgs/rstr/default.nix index 6079a6327..09767ace7 100644 --- a/python/pkgs/rstr/default.nix +++ b/python/pkgs/rstr/default.nix @@ -8,13 +8,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rstr"; version = "3.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xKVk1N+0Ry2THRRcQ9HPGteMJFkhQud1W4hmF57qwBI="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/leapfrogonline/rstr"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/rtf-tokenize/default.nix b/python/pkgs/rtf-tokenize/default.nix index f6b8a948c..ec831d31d 100644 --- a/python/pkgs/rtf-tokenize/default.nix +++ b/python/pkgs/rtf-tokenize/default.nix @@ -9,7 +9,6 @@ }: buildPythonPackage (finalAttrs: { - __structuredAttrs = true; pname = "rtf-tokenize"; version = "1.0.1"; @@ -29,7 +28,7 @@ buildPythonPackage (finalAttrs: { which ]; - versionCheckProgramArg = "${placeholder "out"}/${python.sitePackages}"; + versionCheckProgramArg = "$(out)/${python.sitePackages}"; preInstallCheck = '' versionCheckProgram="$(which ls)" diff --git a/python/pkgs/rtree/default.nix b/python/pkgs/rtree/default.nix index 11cfee473..92681b2c7 100644 --- a/python/pkgs/rtree/default.nix +++ b/python/pkgs/rtree/default.nix @@ -8,7 +8,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rtree"; version = "1.4.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Toblerity"; repo = "rtree"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ilhHBAYa4GaKUt8CmmJRS569D9INHZmWS6lK/+AIiqY="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/Toblerity/rtree"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rtslib-fb/default.nix b/python/pkgs/rtslib-fb/default.nix index 4132e54a2..f33b6fedb 100644 --- a/python/pkgs/rtslib-fb/default.nix +++ b/python/pkgs/rtslib-fb/default.nix @@ -9,7 +9,7 @@ pyudev, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rtslib-fb"; version = "2.2.4"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "open-iscsi"; repo = "rtslib-fb"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iDnirxx+gY2vg63IevI7qmfi4l79QXaKQc/TckjG7xE="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { platforms = lib.platforms.linux; mainProgram = "targetctl"; }; -} +}) diff --git a/python/pkgs/ruamel-base/default.nix b/python/pkgs/ruamel-base/default.nix index b6c8efc34..e3cb30bf0 100644 --- a/python/pkgs/ruamel-base/default.nix +++ b/python/pkgs/ruamel-base/default.nix @@ -2,20 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ruamel-base"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "ruamel.base"; - inherit version; + inherit (finalAttrs) version; sha256 = "1wswxrn4givsm917mfl39rafgadimf1sldpbjdjws00g1wx36hf0"; }; - doCheck = false; + build-system = [ setuptools ]; pythonImportsCheck = [ "ruamel.base" ]; @@ -26,4 +28,4 @@ buildPythonPackage rec { homepage = "https://sourceforge.net/projects/ruamel-base/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ruamel-yaml-clib/default.nix b/python/pkgs/ruamel-yaml-clib/default.nix index fedfb2986..78c100444 100644 --- a/python/pkgs/ruamel-yaml-clib/default.nix +++ b/python/pkgs/ruamel-yaml-clib/default.nix @@ -6,21 +6,20 @@ cython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ruamel-yaml-clib"; version = "0.2.15"; pyproject = true; src = fetchhg { url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code"; - rev = version; + rev = finalAttrs.version; hash = "sha256-SnMELcG2L2ei3UjImljjG1sSCHHROhXYcLe5kAR6h8E="; }; build-system = [ setuptools ]; # no tests - doCheck = false; # circular dependency with ruamel-yaml # pythonImportsCheck = [ "_ruamel_yaml" ]; @@ -33,4 +32,4 @@ buildPythonPackage rec { homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ruamel-yaml/default.nix b/python/pkgs/ruamel-yaml/default.nix index a2108b979..6312a95f3 100644 --- a/python/pkgs/ruamel-yaml/default.nix +++ b/python/pkgs/ruamel-yaml/default.nix @@ -8,23 +8,22 @@ isPyPy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ruamel-yaml"; version = "0.19.1"; pyproject = true; src = fetchPypi { pname = "ruamel_yaml"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-U+tmzSeEnv+Wjr+PC/YfRs2sLaHR81dt1MzumyXDGZM="; }; nativeBuildInputs = [ setuptools ]; # Tests use relative paths - doCheck = false; - propagatedBuildInputs = [ + dependencies = [ ruamel-base ] ++ lib.optional (!isPyPy) ruamel-yaml-clib; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://sourceforge.net/projects/ruamel-yaml/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rubymarshal/default.nix b/python/pkgs/rubymarshal/default.nix index 4a42172e0..37fdce291 100644 --- a/python/pkgs/rubymarshal/default.nix +++ b/python/pkgs/rubymarshal/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rubymarshal"; version = "1.2.10"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iZtG5khSANCHhY/1YpWIF2T/Umj2/fAbfsxOTgPT7Xw="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/d9pouces/RubyMarshal/"; license = lib.licenses.wtfpl; }; -} +}) diff --git a/python/pkgs/runs/default.nix b/python/pkgs/runs/default.nix index 302daf0f0..86ffcafc9 100644 --- a/python/pkgs/runs/default.nix +++ b/python/pkgs/runs/default.nix @@ -6,13 +6,13 @@ xmod, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "runs"; version = "1.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zKMEtjHb7+xZjHv7z7UNb+rObTqWhzS2f9QtPHKPWgU="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/rec/runs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ruyaml/default.nix b/python/pkgs/ruyaml/default.nix index 969bc2278..2394cde2e 100644 --- a/python/pkgs/ruyaml/default.nix +++ b/python/pkgs/ruyaml/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ruyaml"; version = "0.91.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pycontribs"; repo = "ruyaml"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-A37L/voBrn2aZ7xT8+bWdZJxbWRjnxbstQtSyUeN1sA="; }; @@ -27,11 +27,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ distro ]; + dependencies = [ distro ]; pythonImportsCheck = [ "ruyaml" ]; meta = { description = "YAML 1.2 loader/dumper package for Python"; homepage = "https://ruyaml.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/rx/default.nix b/python/pkgs/rx/default.nix index 9c9541b29..4585c5900 100644 --- a/python/pkgs/rx/default.nix +++ b/python/pkgs/rx/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "Rx"; version = "3.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tlfKK0WqSF2i99z9CfrC5VT3rFH/PC+PL/li7Nlj2Rw="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ReactiveX/RxPY"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/s3fs/default.nix b/python/pkgs/s3fs/default.nix index fbffd901d..16143f038 100644 --- a/python/pkgs/s3fs/default.nix +++ b/python/pkgs/s3fs/default.nix @@ -12,7 +12,7 @@ fsspec, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "s3fs"; version = "2026.3.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fsspec"; repo = "s3fs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7Z8vOtWaY1goPPNb1poybI6zWweexv+sHHTj+YWRVk8="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/fsspec/s3fs"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/s3transfer/default.nix b/python/pkgs/s3transfer/default.nix index 703135c22..7800a75a6 100644 --- a/python/pkgs/s3transfer/default.nix +++ b/python/pkgs/s3transfer/default.nix @@ -6,7 +6,7 @@ botocore, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "s3transfer"; version = "0.16.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "boto"; repo = "s3transfer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dpDlsZtLjd6r4kLkIDPG6ZPFFs6/4elYiHk2HDpa9+4="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/boto/s3transfer"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/safehttpx/default.nix b/python/pkgs/safehttpx/default.nix index 2908ed0a1..cc5179db1 100644 --- a/python/pkgs/safehttpx/default.nix +++ b/python/pkgs/safehttpx/default.nix @@ -10,13 +10,13 @@ httpx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "safehttpx"; version = "0.1.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2yAcCXjEHt24u0gPPu5Z3WcwT92RZGA16dmnIASanSM="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/gradio-app/safehttpx"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/safetensors/default.nix b/python/pkgs/safetensors/default.nix index 988ac2623..94fa1c575 100644 --- a/python/pkgs/safetensors/default.nix +++ b/python/pkgs/safetensors/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "safetensors"; version = "0.8.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "huggingface"; diff --git a/python/pkgs/safety-schemas/default.nix b/python/pkgs/safety-schemas/default.nix index 03cf4dfd7..85fc2173d 100644 --- a/python/pkgs/safety-schemas/default.nix +++ b/python/pkgs/safety-schemas/default.nix @@ -10,14 +10,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "safety-schemas"; version = "0.0.20"; pyproject = true; src = fetchPypi { pname = "safety_schemas"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-D9FHrnxlyLucCGEo9VHuhPrzEUALYQmmTkyiQSCw5WM="; }; @@ -43,11 +43,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "safety_schemas" ]; # upstream has no tests - doCheck = false; meta = { description = "Schemas for Safety CLI"; homepage = "https://pypi.org/project/safety-schemas/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sagemaker-mlflow/default.nix b/python/pkgs/sagemaker-mlflow/default.nix index 7eab3a5d6..f69cd4a5c 100644 --- a/python/pkgs/sagemaker-mlflow/default.nix +++ b/python/pkgs/sagemaker-mlflow/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { pname = "sagemaker-mlflow"; version = "0.5.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "aws"; diff --git a/python/pkgs/saneyaml/default.nix b/python/pkgs/saneyaml/default.nix index 83d3d3bec..a43c17679 100644 --- a/python/pkgs/saneyaml/default.nix +++ b/python/pkgs/saneyaml/default.nix @@ -6,13 +6,13 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "saneyaml"; version = "0.6.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Gc+9i/lNcwmYFix5D+XOyau1MAzFiQ/jfcbbyqj7Frs="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/nexB/saneyaml"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/sanic-ext/default.nix b/python/pkgs/sanic-ext/default.nix index c88ab221e..df2aeb41f 100644 --- a/python/pkgs/sanic-ext/default.nix +++ b/python/pkgs/sanic-ext/default.nix @@ -22,7 +22,7 @@ jinja2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sanic-ext"; version = "25.12.0"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-ext"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-h1yN5VYFPFUZoeZeJ6+CfGE3m/5zz+/G3BbetDKtZAo="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/sanic-org/sanic-ext/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sanic-routing/default.nix b/python/pkgs/sanic-routing/default.nix index ea52db8a9..d0dea2071 100644 --- a/python/pkgs/sanic-routing/default.nix +++ b/python/pkgs/sanic-routing/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pytest-asyncio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sanic-routing"; version = "23.12.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-routing"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-IUubPd6mqtCfY4ruI/8wkFcAcS0xXHWbe9RzDac5kRc="; }; + + build-system = [ setuptools ]; pythonImportsCheck = [ "sanic_routing" ]; meta = { @@ -23,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/sanic-org/sanic-routing"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sanic-testing/default.nix b/python/pkgs/sanic-testing/default.nix index aedd2c28b..c73a5e89e 100644 --- a/python/pkgs/sanic-testing/default.nix +++ b/python/pkgs/sanic-testing/default.nix @@ -10,7 +10,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sanic-testing"; version = "24.6.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-testing"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-biUgxa0sINHAYzyKimVD8+/mPUq2dlnCl2BN+UeUaEo="; }; @@ -31,7 +31,6 @@ buildPythonPackage rec { ]; # Tests require circular dependency with sanic - doCheck = false; pythonImportsCheck = [ "sanic_testing" ]; @@ -40,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/sanic-org/sanic-testing"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sanic/default.nix b/python/pkgs/sanic/default.nix index 77af17988..204dbc796 100644 --- a/python/pkgs/sanic/default.nix +++ b/python/pkgs/sanic/default.nix @@ -23,7 +23,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sanic"; version = "25.12.1"; pyproject = true; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0P5UyLi9W5maoR1EpRxfhysckDWpjgmqndgxsVHm47c="; }; @@ -67,4 +67,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "sanic"; }; -} +}) diff --git a/python/pkgs/sarge/default.nix b/python/pkgs/sarge/default.nix index 19a322817..79a374a51 100644 --- a/python/pkgs/sarge/default.nix +++ b/python/pkgs/sarge/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sarge"; version = "0.1.8"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vsajip"; repo = "sarge"; - rev = version; + tag = finalAttrs.version; hash = "sha256-//iAmcocP0VESkWgWR2k0D9/E7lgp5QKZ3CdzE54qmM="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://sarge.readthedocs.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sarif-om/default.nix b/python/pkgs/sarif-om/default.nix index 4d5b8d5b5..7cf9c0485 100644 --- a/python/pkgs/sarif-om/default.nix +++ b/python/pkgs/sarif-om/default.nix @@ -7,14 +7,14 @@ attrs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sarif-om"; version = "1.0.4"; pyproject = true; src = fetchPypi { pname = "sarif_om"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-zV9BazCD4A1AKpLkSaf/Z69G8RJBBz7qBGGAKjta75g="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/microsoft/sarif-python-om"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/scales/default.nix b/python/pkgs/scales/default.nix index 1684386ce..55275249a 100644 --- a/python/pkgs/scales/default.nix +++ b/python/pkgs/scales/default.nix @@ -7,13 +7,13 @@ setuptools_80, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scales"; version = "1.0.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-i2kw99S/EVGSKQtEx1evXiVOP8/Ldf+aUfXJakBOJ1M="; }; @@ -28,11 +28,9 @@ buildPythonPackage rec { dependencies = [ six ]; - doCheck = false; - meta = { description = "Stats for Python processes"; homepage = "https://www.github.com/Cue/scales"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/scantree/default.nix b/python/pkgs/scantree/default.nix index 6dc6adf53..9c0020f50 100644 --- a/python/pkgs/scantree/default.nix +++ b/python/pkgs/scantree/default.nix @@ -8,13 +8,13 @@ pathspec, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scantree"; version = "0.0.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Fb1cskSDsE2yxwZTYE6Oo1IumAh9t+OKuEgvBTmEwKw="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/andhus/scantree"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/scapy/default.nix b/python/pkgs/scapy/default.nix index d680307f0..07497c4fa 100644 --- a/python/pkgs/scapy/default.nix +++ b/python/pkgs/scapy/default.nix @@ -3,6 +3,8 @@ stdenv, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, isPyPy, cryptography, ipython, @@ -11,24 +13,26 @@ libpcap, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scapy"; version = "2.7.0"; - format = "setuptools"; + pyproject = true; disabled = isPyPy; src = fetchFromGitHub { owner = "secdev"; repo = "scapy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Pp7pPfaWyzJGf+soENfOPynN8logc5FM848hyVCcdKk="; }; + build-system = [ setuptools ]; + patches = lib.optional (!stdenv.hostPlatform.isStatic) ./find-library.patch; postPatch = '' - printf "${version}" > scapy/VERSION + printf "${finalAttrs.version}" > scapy/VERSION '' + lib.optionalString (!stdenv.hostPlatform.isStatic) '' libpcap_file="${lib.getLib libpcap}/lib/libpcap${stdenv.hostPlatform.extensions.sharedLibrary}" @@ -59,4 +63,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/schedula/default.nix b/python/pkgs/schedula/default.nix index e06822bfb..602b560fb 100644 --- a/python/pkgs/schedula/default.nix +++ b/python/pkgs/schedula/default.nix @@ -23,7 +23,7 @@ schedula, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "schedula"; version = "1.5.78"; pyproject = true; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vinci1it2000"; repo = "schedula"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fhcG2N524KlwaG+inOyQJaXKoMhmR6Yddff8CDi8lhk="; }; @@ -68,4 +68,4 @@ buildPythonPackage rec { # at least some tests fail on Darwin platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/schedule/default.nix b/python/pkgs/schedule/default.nix index 7a46f6510..f89113aee 100644 --- a/python/pkgs/schedule/default.nix +++ b/python/pkgs/schedule/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "schedule"; version = "1.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ff6cdf5f2blifz8ZzA7xQgUI+fmkb0XNB2nvde3l8Lc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/dbader/schedule"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/schema/default.nix b/python/pkgs/schema/default.nix index fddf19eb9..8160bc9e4 100644 --- a/python/pkgs/schema/default.nix +++ b/python/pkgs/schema/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "schema"; version = "0.7.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6GzAjt1v5uJSJkj05H46MZIKdugszok3U1Qi4xCGKrU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Library for validating Python data structures"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/schwifty/default.nix b/python/pkgs/schwifty/default.nix index 9f714e92e..69006ad9f 100644 --- a/python/pkgs/schwifty/default.nix +++ b/python/pkgs/schwifty/default.nix @@ -12,13 +12,13 @@ pydantic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "schwifty"; version = "2026.7.3"; pyproject = true; src = fetchPypi { - inherit pname; + inherit (finalAttrs) pname; # The version is different missing leading zeros in the CalVer month. # This is due to PyPI's normalization of integers version = "2026.7.1"; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/mdomke/schwifty"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/scikit-build/default.nix b/python/pkgs/scikit-build/default.nix index 5281b8452..0debd874a 100644 --- a/python/pkgs/scikit-build/default.nix +++ b/python/pkgs/scikit-build/default.nix @@ -19,14 +19,14 @@ virtualenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scikit-build"; version = "0.19.1"; pyproject = true; src = fetchPypi { pname = "scikit_build"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-uajQf8otXRDZMiC8V6aFFh1yrx/HYoXVXFZN2qhi5YQ="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { bsd2 ]; # BSD due to reuses of PyNE code }; -} +}) diff --git a/python/pkgs/scikit-fuzzy/default.nix b/python/pkgs/scikit-fuzzy/default.nix index 296941e86..fe5261fc6 100644 --- a/python/pkgs/scikit-fuzzy/default.nix +++ b/python/pkgs/scikit-fuzzy/default.nix @@ -8,7 +8,7 @@ scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scikit-fuzzy"; version = "0.5.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-fuzzy"; repo = "scikit-fuzzy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-02aIYBdbQXQD9S1R/gZZeKTn5LxloE0GGGRttxJnR/o="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { description = "Fuzzy logic toolkit for scientific Python"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/scikit-image/default.nix b/python/pkgs/scikit-image/default.nix index 9e878ae31..e5058010d 100644 --- a/python/pkgs/scikit-image/default.nix +++ b/python/pkgs/scikit-image/default.nix @@ -23,7 +23,7 @@ tifffile, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scikit-image"; version = "0.26.0"; pyproject = true; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-image"; repo = "scikit-image"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VpvlG2ECbq+FWLZ4RfdbbR3V6Fbw0RIvnVp+w0Rp+8o="; }; @@ -39,7 +39,7 @@ buildPythonPackage rec { patchShebangs src/skimage/_build_utils/{version,cythoner}.py substituteInPlace src/skimage/_build_utils/version.py \ - --replace-fail "version = version_from_init()" "version = \"${version}\"" + --replace-fail "version = version_from_init()" "version = \"${finalAttrs.version}\"" ''; build-system = [ @@ -60,8 +60,6 @@ buildPythonPackage rec { tifffile ]; - doCheck = false; - pythonImportsCheck = [ "skimage" "skimage._shared" @@ -83,4 +81,4 @@ buildPythonPackage rec { homepage = "https://scikit-image.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/scikit-learn/default.nix b/python/pkgs/scikit-learn/default.nix index 8e9477ac0..1759dca31 100644 --- a/python/pkgs/scikit-learn/default.nix +++ b/python/pkgs/scikit-learn/default.nix @@ -20,8 +20,7 @@ threadpoolctl, }: -buildPythonPackage rec { - __structuredAttrs = true; +buildPythonPackage (finalAttrs: { pname = "scikit-learn"; version = "1.9.0"; @@ -29,14 +28,14 @@ buildPythonPackage rec { src = fetchPypi { pname = "scikit_learn"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-iDMmaYnTpREBeKn64weDZ1Rgck0OHvsTsUkB0sZgxVc="; }; postPatch = '' substituteInPlace meson.build --replace-fail \ "run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \ - "'${version}'," + "'${finalAttrs.version}'," substituteInPlace pyproject.toml \ --replace-fail "meson-python>=0.17.1,<0.20.0" meson-python \ --replace-fail "numpy>=2,<2.5.0" numpy \ @@ -77,8 +76,6 @@ buildPythonPackage rec { env.LC_ALL = "en_US.UTF-8"; - doCheck = false; - pythonImportsCheck = [ "sklearn" ]; meta = { @@ -86,4 +83,4 @@ buildPythonPackage rec { homepage = "https://scikit-learn.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/scikit-misc/default.nix b/python/pkgs/scikit-misc/default.nix index 260dec5f5..64a06ee42 100644 --- a/python/pkgs/scikit-misc/default.nix +++ b/python/pkgs/scikit-misc/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scikit-misc"; version = "0.5.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "has2k1"; repo = "scikit-misc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-G0zK13upo0tPd8x87X8cTBKWK63E5JPmAr1IVEijtaw="; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { # provide a version to use when git fails to get the tag [[ -f skmisc/_version.py ]] || \ - echo '__version__ = "${version}"' > skmisc/_version.py + echo '__version__ = "${finalAttrs.version}"' > skmisc/_version.py ''; nativeBuildInputs = [ @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://github.com/has2k1/scikit-misc"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/scikit-rf/default.nix b/python/pkgs/scikit-rf/default.nix index dac6954db..6c2d947b0 100644 --- a/python/pkgs/scikit-rf/default.nix +++ b/python/pkgs/scikit-rf/default.nix @@ -22,7 +22,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scikit-rf"; version = "2.1.0"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-rf"; repo = "scikit-rf"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-S+vp+Pkt2tExS0UNrOAxM3thc32OjPivXmwoe+UhrEg="; }; @@ -72,4 +72,4 @@ buildPythonPackage rec { homepage = "https://scikit-rf.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/scipy-stubs/default.nix b/python/pkgs/scipy-stubs/default.nix index 9f6559358..fbba86f88 100644 --- a/python/pkgs/scipy-stubs/default.nix +++ b/python/pkgs/scipy-stubs/default.nix @@ -7,7 +7,7 @@ scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scipy-stubs"; version = "1.17.0.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scipy"; repo = "scipy-stubs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wzXRnTaSYOePt3XvZ/OeBOQCKObuCL1rWrVDo73yM1I="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/scipy/scipy-stubs"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/scooby/default.nix b/python/pkgs/scooby/default.nix index 0e6fdf252..81fc85ca2 100644 --- a/python/pkgs/scooby/default.nix +++ b/python/pkgs/scooby/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scooby"; version = "0.11.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "banesullivan"; repo = "scooby"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PP54hFyoM+QdKik9Gj0H6JhF8Ypqnh9yO/Z42O6NO4A="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/banesullivan/scooby"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/scour/default.nix b/python/pkgs/scour/default.nix index c91d972ed..daf062460 100644 --- a/python/pkgs/scour/default.nix +++ b/python/pkgs/scour/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scour"; version = "0.38.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aIHsJmYMEwxezZlqxvawOTndV0GY9Qdz8lCLgaaODa8="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/scour-project/scour"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/scp/default.nix b/python/pkgs/scp/default.nix index 3b331e627..10bf6b5e1 100644 --- a/python/pkgs/scp/default.nix +++ b/python/pkgs/scp/default.nix @@ -6,13 +6,13 @@ paramiko, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scp"; version = "0.16.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PysmC/m9TCtoV/aXodfo7cJvpWkoK3cCfoSd/h5IWAo="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "SCP module for paramiko"; license = lib.licenses.lgpl21Only; }; -} +}) diff --git a/python/pkgs/scramp/default.nix b/python/pkgs/scramp/default.nix index fb9030a2a..adb0163fc 100644 --- a/python/pkgs/scramp/default.nix +++ b/python/pkgs/scramp/default.nix @@ -7,13 +7,13 @@ versioningit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scramp"; version = "1.4.17"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-KJcPKevDPfR/mXXIBeXlo2Dv/lsxBF5gfWSztgNw26E="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://codeberg.org/tlocke/scramp"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/scrapy/default.nix b/python/pkgs/scrapy/default.nix index a77182109..76264c2ff 100644 --- a/python/pkgs/scrapy/default.nix +++ b/python/pkgs/scrapy/default.nix @@ -40,7 +40,7 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scrapy"; version = "2.18.0"; pyproject = true; @@ -48,7 +48,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scrapy"; repo = "scrapy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-c6rQ1ktpdHfwcA5zOGg/g9j614IWs0mlguZY1r3haLc="; }; @@ -106,4 +106,4 @@ buildPythonPackage rec { homepage = "https://scrapy.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/screed/default.nix b/python/pkgs/screed/default.nix index 0753cbb85..dc86b452d 100644 --- a/python/pkgs/screed/default.nix +++ b/python/pkgs/screed/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "screed"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Dk5q4fPDy0CXa7vCvn4ZGCFhZmbl94QGxAziy/0jqtc="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/screed/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/screeninfo/default.nix b/python/pkgs/screeninfo/default.nix index 611f851b8..714da1c74 100644 --- a/python/pkgs/screeninfo/default.nix +++ b/python/pkgs/screeninfo/default.nix @@ -9,7 +9,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "screeninfo"; version = "0.8.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rr-"; repo = "screeninfo"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TEy4wff0eRRkX98yK9054d33Tm6G6qWrd9Iv+ITcFmA="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/rr-/screeninfo"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/scripttest/default.nix b/python/pkgs/scripttest/default.nix index af4b3b994..926b257ad 100644 --- a/python/pkgs/scripttest/default.nix +++ b/python/pkgs/scripttest/default.nix @@ -7,13 +7,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scripttest"; version = "3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1A6IWdcbHUkY4dkYxme84FkoKG8svQnPt6bMHz8witA="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/scripttest/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/scrypt/default.nix b/python/pkgs/scrypt/default.nix index ba8222ef8..f50354f4c 100644 --- a/python/pkgs/scrypt/default.nix +++ b/python/pkgs/scrypt/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scrypt"; version = "0.9.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "holgern"; repo = "py-scrypt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4jVXaPD57RMe4ef1PVgZwPGAhEHL3RGlu2DSC6lGuR4="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/holgern/py-scrypt"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/scverse-misc/default.nix b/python/pkgs/scverse-misc/default.nix index 7af3ba92b..a24118186 100644 --- a/python/pkgs/scverse-misc/default.nix +++ b/python/pkgs/scverse-misc/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { pname = "scverse-misc"; version = "0.1.3"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "scverse"; diff --git a/python/pkgs/sdjson/default.nix b/python/pkgs/sdjson/default.nix index 1aace05ef..6749bc8ac 100644 --- a/python/pkgs/sdjson/default.nix +++ b/python/pkgs/sdjson/default.nix @@ -7,7 +7,7 @@ whey, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sdjson"; version = "0.5.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "domdfcoding"; repo = "singledispatch-json"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7qwmPhij2X2GLtjeaoMCoOyT0qzYt9oFccWrQOq6LXw="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/domdfcoding/singledispatch-json"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sdnotify/default.nix b/python/pkgs/sdnotify/default.nix index 3b31180b8..56d7ddd56 100644 --- a/python/pkgs/sdnotify/default.nix +++ b/python/pkgs/sdnotify/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sdnotify"; version = "0.3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-c5d/x0azbMQRhN1Dw/6BMj57iwbCuwgmxPWaIMVrufE="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "sdnotify" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/bb4242/sdnotify"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/seaborn/default.nix b/python/pkgs/seaborn/default.nix index 730c32625..4e2d647eb 100644 --- a/python/pkgs/seaborn/default.nix +++ b/python/pkgs/seaborn/default.nix @@ -10,7 +10,7 @@ scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "seaborn"; version = "0.13.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mwaskom"; repo = "seaborn"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aGIVcdG/XN999nYBHh3lJqGa3QVt0j8kmzaxdkULznY="; }; @@ -42,7 +42,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ matplotlib numpy pandas @@ -63,4 +63,4 @@ buildPythonPackage rec { homepage = "https://seaborn.pydata.org/"; license = with lib.licenses; [ bsd3 ]; }; -} +}) diff --git a/python/pkgs/secp256k1/default.nix b/python/pkgs/secp256k1/default.nix index d7a2a12e3..e9d1bffd4 100644 --- a/python/pkgs/secp256k1/default.nix +++ b/python/pkgs/secp256k1/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pkg-config, cffi, pkgs, @@ -11,16 +13,18 @@ let libsecp256k1 = pkgs.secp256k1; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "secp256k1"; version = "0.14.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "82c06712d69ef945220c8b53c1a0d424c2ff6a1f64aee609030df79ad8383397"; }; + build-system = [ setuptools ]; + postPatch = '' # don't do hacky tarball download + setuptools check sed -i '38,54d' setup.py @@ -29,7 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ + dependencies = [ cffi libsecp256k1 ]; @@ -47,4 +51,4 @@ buildPythonPackage rec { description = "Python FFI bindings for secp256k1"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/secretstorage/default.nix b/python/pkgs/secretstorage/default.nix index 1d28dbd0f..cc7219a24 100644 --- a/python/pkgs/secretstorage/default.nix +++ b/python/pkgs/secretstorage/default.nix @@ -27,7 +27,6 @@ buildPythonPackage (finalAttrs: { ]; # Needs a D-Bus session - doCheck = false; pythonImportsCheck = [ "secretstorage" ]; diff --git a/python/pkgs/secure/default.nix b/python/pkgs/secure/default.nix index 21d46a986..651297c01 100644 --- a/python/pkgs/secure/default.nix +++ b/python/pkgs/secure/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "secure"; version = "2.0.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "typeerror"; repo = "secure.py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZUipbCDyKd3hxLh6nE0f7DrPVLfUoRFCKPrw5KcqVHM="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/TypeError/secure.py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/securetar/default.nix b/python/pkgs/securetar/default.nix index c75d5bd74..c9f124f10 100644 --- a/python/pkgs/securetar/default.nix +++ b/python/pkgs/securetar/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "securetar"; version = "2026.4.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "securetar"; - tag = version; + tag = finalAttrs.version; hash = "sha256-y2Ow272094Qrn52LGYkuRcjaR6d0C6bF12g7W6AwSMI="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-libs/securetar"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/seedir/default.nix b/python/pkgs/seedir/default.nix index fddfa2e93..762d95d28 100644 --- a/python/pkgs/seedir/default.nix +++ b/python/pkgs/seedir/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "seedir"; version = "0.5.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "earnestt1234"; repo = "seedir"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-o2CUK00WdoYyLqbDlh+wa30Q23ZkWZC+RvGDCSiCwH4="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "seedir"; }; -} +}) diff --git a/python/pkgs/seekpath/default.nix b/python/pkgs/seekpath/default.nix index a46fc61b0..097a6b13a 100644 --- a/python/pkgs/seekpath/default.nix +++ b/python/pkgs/seekpath/default.nix @@ -9,7 +9,7 @@ glibcLocales, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "seekpath"; version = "2.2.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "materialscloud-org"; repo = "seekpath"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yz9IX68AmFP8P8uzZMKa4d/pdzbOm0IcQsZMvC7MuSU="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/materialscloud-org/seekpath"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/segno/default.nix b/python/pkgs/segno/default.nix index 76fe7a508..7acf3c6f8 100644 --- a/python/pkgs/segno/default.nix +++ b/python/pkgs/segno/default.nix @@ -11,7 +11,7 @@ pyzbar ? null, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "segno"; version = "1.6.6"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "heuer"; repo = "segno"; - tag = version; + tag = finalAttrs.version; hash = "sha256-A6lESmVogypit0SDeG4g9axn3+welSqTt1A17BNLmvU="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/heuer/segno/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/selenium/default.nix b/python/pkgs/selenium/default.nix index 2c827d54b..4aaff2295 100644 --- a/python/pkgs/selenium/default.nix +++ b/python/pkgs/selenium/default.nix @@ -13,7 +13,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "selenium"; version = "4.40.0"; pyproject = true; @@ -21,7 +21,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; - tag = "selenium-${version}" + lib.optionalString (lib.versions.patch version != "0") "-python"; + tag = + "selenium-${finalAttrs.version}" + + lib.optionalString (lib.versions.patch finalAttrs.version != "0") "-python"; hash = "sha256-Yfm2kpAmmEUP+m48PQf09UvFPeGBxd0ukqTtVah5h+E="; }; @@ -74,4 +76,4 @@ buildPythonPackage rec { homepage = "https://selenium.dev/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/semantic-version/default.nix b/python/pkgs/semantic-version/default.nix index b0d88fb57..50c268eaa 100644 --- a/python/pkgs/semantic-version/default.nix +++ b/python/pkgs/semantic-version/default.nix @@ -1,19 +1,23 @@ { lib, fetchPypi, + # build-system + setuptools, buildPythonPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "semantic-version"; version = "2.10.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "semantic_version"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-vau20zaZjLs3jUuds6S1ah4yNXAdwF6iaQ2amX7VBBw="; }; + + build-system = [ setuptools ]; pythonImportsCheck = [ "semantic_version" ]; meta = { @@ -21,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/rbarrois/python-semanticversion/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/semchunk/default.nix b/python/pkgs/semchunk/default.nix index c11bb3657..b744d694e 100644 --- a/python/pkgs/semchunk/default.nix +++ b/python/pkgs/semchunk/default.nix @@ -6,7 +6,7 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "semchunk"; version = "4.1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "isaacus-dev"; repo = "semchunk"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jQQNb5E/EarsN9OwlF6l8huX06kM2EChfUYW+MM5uxA="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/isaacus-dev/semchunk"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/semver/default.nix b/python/pkgs/semver/default.nix index b3f2b2c74..dbe2c03a0 100644 --- a/python/pkgs/semver/default.nix +++ b/python/pkgs/semver/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "semver"; version = "3.0.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-semver"; repo = "python-semver"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ry6r2cY/DRTiPxT+ZiumgFbQyHNzL8i1QcQbLWjnDVE="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "pysemver"; }; -} +}) diff --git a/python/pkgs/send2trash/default.nix b/python/pkgs/send2trash/default.nix index a1b70776f..52ac3e417 100644 --- a/python/pkgs/send2trash/default.nix +++ b/python/pkgs/send2trash/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "send2trash"; version = "2.1.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hsoft"; repo = "send2trash"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dBILb1tz3/X3/MnhSKujVX9pMFrTAyntQ+GQsscklQU="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/hsoft/send2trash"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sendgrid/default.nix b/python/pkgs/sendgrid/default.nix index 5c0aeb7a1..f6d91fec7 100644 --- a/python/pkgs/sendgrid/default.nix +++ b/python/pkgs/sendgrid/default.nix @@ -12,15 +12,15 @@ werkzeug, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sendgrid"; version = "6.12.5"; pyproject = true; src = fetchFromGitHub { - owner = pname; + owner = finalAttrs.pname; repo = "sendgrid-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7r1FHcGmHRQK9mfpV3qcuZlIe7G6CIyarnpWLjduw4E="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/sendgrid/sendgrid-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/senf/default.nix b/python/pkgs/senf/default.nix index ac8127ef5..b1b8c4f36 100644 --- a/python/pkgs/senf/default.nix +++ b/python/pkgs/senf/default.nix @@ -1,6 +1,8 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lib, unstableGitUpdater, }: @@ -8,7 +10,7 @@ buildPythonPackage { pname = "senf"; version = "1.5.1-unstable-2026-03-20"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "quodlibet"; @@ -17,6 +19,8 @@ buildPythonPackage { hash = "sha256-j4vhr9cWG2O0oOYbarJbNpEpcz5yqGJA56/e0NTgmjI="; }; + build-system = [ setuptools ]; + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; diff --git a/python/pkgs/sentencepiece/default.nix b/python/pkgs/sentencepiece/default.nix index 463a568d5..d6b4c11c8 100644 --- a/python/pkgs/sentencepiece/default.nix +++ b/python/pkgs/sentencepiece/default.nix @@ -2,23 +2,27 @@ buildPythonPackage, pkgs, pkg-config, + # build-system + setuptools, }: let sentencepiece-cpp = pkgs.sentencepiece; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sentencepiece"; - format = "setuptools"; + pyproject = true; inherit (sentencepiece-cpp) version src; + build-system = [ setuptools ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sentencepiece-cpp.dev ]; - sourceRoot = "${src.name}/python"; + sourceRoot = "${finalAttrs.src.name}/python"; pythonImportsCheck = [ "sentencepiece" ]; # sentencepiece installs 'bin' output. meta = removeAttrs sentencepiece-cpp.meta [ "outputsToInstall" ]; -} +}) diff --git a/python/pkgs/sentinels/default.nix b/python/pkgs/sentinels/default.nix index 96cf20ad2..2483212a0 100644 --- a/python/pkgs/sentinels/default.nix +++ b/python/pkgs/sentinels/default.nix @@ -6,13 +6,13 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sentinels"; version = "1.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PC9k91QYfBngoaApsUi3TPWN0S7Ce04ZwOXW4itamoY="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/vmalloc/sentinels/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/serializable/default.nix b/python/pkgs/serializable/default.nix index fec26de7a..c6e0164fb 100644 --- a/python/pkgs/serializable/default.nix +++ b/python/pkgs/serializable/default.nix @@ -1,6 +1,8 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lib, simplejson, six, @@ -10,7 +12,7 @@ buildPythonPackage { pname = "serializable"; version = "unstable-2023-07-13"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "iskandr"; @@ -21,7 +23,9 @@ buildPythonPackage { hash = "sha256-AXlgIc1B7bkR+joXn6ZSxk/t848CWlgVZp8WIsSZFKQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ simplejson six typechecks diff --git a/python/pkgs/serpent/default.nix b/python/pkgs/serpent/default.nix index d00c846ea..dd28d050d 100644 --- a/python/pkgs/serpent/default.nix +++ b/python/pkgs/serpent/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "serpent"; version = "1.43"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-YtwkL9TqKlAzn09aqvbsxVYF7nR3DX6yAx52DZCg0RQ="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "serpent" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/irmen/Serpent"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/serverfiles/default.nix b/python/pkgs/serverfiles/default.nix index d3b96809d..feb6cc4f5 100644 --- a/python/pkgs/serverfiles/default.nix +++ b/python/pkgs/serverfiles/default.nix @@ -6,13 +6,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "serverfiles"; version = "0.3.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XhD8MudYeR43NbwIvOLtRwKoOx5Fq5bF1ZzIruz76+E="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/biolab/serverfiles"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/service-identity/default.nix b/python/pkgs/service-identity/default.nix index da766f152..4a60aaf90 100644 --- a/python/pkgs/service-identity/default.nix +++ b/python/pkgs/service-identity/default.nix @@ -15,7 +15,7 @@ pyasn1-modules, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "service-identity"; version = "26.1.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyca"; repo = "service-identity"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ujH0RdsdvbNbQVhlRfLnKSj3LbLE4RVwlaEsMNZmuLA="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://service-identity.readthedocs.io"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/session-info2/default.nix b/python/pkgs/session-info2/default.nix index 80517b052..5f3f211aa 100644 --- a/python/pkgs/session-info2/default.nix +++ b/python/pkgs/session-info2/default.nix @@ -7,7 +7,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "session-info2"; version = "0.4.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scverse"; repo = "session-info2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uq+UTbI1hwwaF7FEjWCNKuVvnEvqvXKb/XygIlo3oHg="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://session-info2.readthedocs.io"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/setproctitle/default.nix b/python/pkgs/setproctitle/default.nix index cb7940b73..0d17b8ef6 100644 --- a/python/pkgs/setproctitle/default.nix +++ b/python/pkgs/setproctitle/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "setproctitle"; version = "1.3.7"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dvarrazzo"; repo = "py-setproctitle"; - tag = "version-${version}"; + tag = "version-${finalAttrs.version}"; hash = "sha256-dfOdtfOXRAoCQLW307+YMsFIWRv4CupbKUxckev1oUw="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/dvarrazzo/py-setproctitle"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/setuptools-declarative-requirements/default.nix b/python/pkgs/setuptools-declarative-requirements/default.nix index 2980211ac..a349ec37b 100644 --- a/python/pkgs/setuptools-declarative-requirements/default.nix +++ b/python/pkgs/setuptools-declarative-requirements/default.nix @@ -8,14 +8,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "setuptools-declarative-requirements"; version = "1.3.0"; pyproject = true; src = fetchPypi { pname = "setuptools-declarative-requirements"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-V6W5u5rTUMJ46Kpr5M3rvNklubpx1qcSoXimGM+4mPc="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/s0undt3ch/setuptools-declarative-requirements"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/setuptools-gettext/default.nix b/python/pkgs/setuptools-gettext/default.nix index bdd04c338..e71164692 100644 --- a/python/pkgs/setuptools-gettext/default.nix +++ b/python/pkgs/setuptools-gettext/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "setuptools-gettext"; version = "0.1.18"; pyproject = true; src = fetchPypi { pname = "setuptools_gettext"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ySsK5Ibe9QJobNlE8WVZgZ5C+NwLnWg89i50FTl/KzU="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/breezy-team/setuptools-gettext"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/setuptools-git-versioning/default.nix b/python/pkgs/setuptools-git-versioning/default.nix index c2ef4da3d..64f8995cc 100644 --- a/python/pkgs/setuptools-git-versioning/default.nix +++ b/python/pkgs/setuptools-git-versioning/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "setuptools-git-versioning"; version = "3.1.0"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dolfinus"; repo = "setuptools-git-versioning"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-d6d8taSSAjvirivf1WaEICq0XbrYQzC2LB//LpGpHhI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/dolfinus/setuptools-git-versioning"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/setuptools-git/default.nix b/python/pkgs/setuptools-git/default.nix index 1e62a7257..42e2c3799 100644 --- a/python/pkgs/setuptools-git/default.nix +++ b/python/pkgs/setuptools-git/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "setuptools-git"; version = "1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/2QTbaAaq7p2roiwUOcZeRjYshOcy/YUThTUcrnEBEU="; }; @@ -19,11 +19,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "setuptools_git" ]; - doCheck = false; - meta = { homepage = "https://github.com/msabramo/setuptools-git"; description = "Setuptools revision control system plugin for Git"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/setuptools-rust/default.nix b/python/pkgs/setuptools-rust/default.nix index 8bfcdb802..acbd9c98e 100644 --- a/python/pkgs/setuptools-rust/default.nix +++ b/python/pkgs/setuptools-rust/default.nix @@ -11,14 +11,14 @@ targetPackages, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "setuptools-rust"; version = "1.13.0"; pyproject = true; src = fetchPypi { pname = "setuptools_rust"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-8q/PS67uaJkQzknPqKrU4IzOcvQXRJvMMokbhmT9xyY="; }; @@ -34,8 +34,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "setuptools_rust" ]; - doCheck = false; - setupHook = let pythonOnTarget = python.pythonOnTargetForTarget or { }; @@ -55,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/PyO3/setuptools-rust"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/setuptools-scm/default.nix b/python/pkgs/setuptools-scm/default.nix index b201d17df..f0e2beb32 100644 --- a/python/pkgs/setuptools-scm/default.nix +++ b/python/pkgs/setuptools-scm/default.nix @@ -13,14 +13,14 @@ rich, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "setuptools-scm"; version = "10.0.5"; pyproject = true; src = fetchPypi { pname = "setuptools_scm"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-u7qP51RRbN79AX9EVnIXdebvlmK9eIf7Uq4mgT1IOMM="; }; @@ -39,8 +39,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "setuptools_scm" ]; - doCheck = false; - setupHook = ./setup-hook.sh; meta = { @@ -48,4 +46,4 @@ buildPythonPackage rec { description = "Handles managing your python package versions in scm metadata"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/setuptools-scm9/default.nix b/python/pkgs/setuptools-scm9/default.nix index 67e42d744..2b0049a9a 100644 --- a/python/pkgs/setuptools-scm9/default.nix +++ b/python/pkgs/setuptools-scm9/default.nix @@ -6,14 +6,14 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "setuptools-scm"; version = "9.2.2"; pyproject = true; src = fetchPypi { pname = "setuptools_scm"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-HGdKtGZWhqCIfX4kwDqyXyQgHCE+guponS8+Fp7371c="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/setuptools_scm"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/setuptools-trial/default.nix b/python/pkgs/setuptools-trial/default.nix index c6be62ad5..2d0d1e1d5 100644 --- a/python/pkgs/setuptools-trial/default.nix +++ b/python/pkgs/setuptools-trial/default.nix @@ -6,20 +6,20 @@ twisted, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "setuptools-trial"; version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "setuptools_trial"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-FCIPj3YcSLoeJSbwhxlQd89U+tcJizgs4iBCLw/1mxI="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ twisted ]; + dependencies = [ twisted ]; # Couldn't get tests working @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/rutsky/setuptools-trial"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/setuptools/80.nix b/python/pkgs/setuptools/80.nix index c18335d86..919f75c3e 100644 --- a/python/pkgs/setuptools/80.nix +++ b/python/pkgs/setuptools/80.nix @@ -37,7 +37,6 @@ buildPythonPackage (finalAttrs: { ''; # Requires pytest, causing infinite recursion. - doCheck = false; passthru.tests = { inherit distutils_80; diff --git a/python/pkgs/setuptools/default.nix b/python/pkgs/setuptools/default.nix index 25f668e55..57f1b233e 100644 --- a/python/pkgs/setuptools/default.nix +++ b/python/pkgs/setuptools/default.nix @@ -36,7 +36,6 @@ buildPythonPackage (finalAttrs: { ''; # Requires pytest, causing infinite recursion. - doCheck = false; meta = { description = "Utilities to facilitate the installation of Python packages"; homepage = "https://github.com/pypa/setuptools"; diff --git a/python/pkgs/setuptools_80/default.nix b/python/pkgs/setuptools_80/default.nix index 46ee23b34..6067323b5 100644 --- a/python/pkgs/setuptools_80/default.nix +++ b/python/pkgs/setuptools_80/default.nix @@ -36,7 +36,6 @@ buildPythonPackage (finalAttrs: { ''; # Requires pytest, causing infinite recursion. - doCheck = false; meta = { description = "Utilities to facilitate the installation of Python packages"; diff --git a/python/pkgs/sexpdata/default.nix b/python/pkgs/sexpdata/default.nix index 562d8df9e..ba9ebd8d9 100644 --- a/python/pkgs/sexpdata/default.nix +++ b/python/pkgs/sexpdata/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sexpdata"; version = "1.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-krZ7A2H2dm+PnkS5UZzz+8+vp1Xbhbv4k8Phz03awQk="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "sexpdata" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/jd-boyd/sexpdata"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sgmllib3k/default.nix b/python/pkgs/sgmllib3k/default.nix index fb6eabe24..1f2d705b8 100644 --- a/python/pkgs/sgmllib3k/default.nix +++ b/python/pkgs/sgmllib3k/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sgmllib3k"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eGj7HIv6dkwaxWPTzzacOB0TJdNhJJM6cm8p/NqoEuk="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/sgmllib3k/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sgp4/default.nix b/python/pkgs/sgp4/default.nix index 768a6a328..30fa7cf54 100644 --- a/python/pkgs/sgp4/default.nix +++ b/python/pkgs/sgp4/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sgp4"; version = "2.27"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BtNyR8aYVzm3B7izm2uD4G6K94OyUx4xllUBupg5hfk="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/brandon-rhodes/python-sgp4"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sh/default.nix b/python/pkgs/sh/default.nix index 393f644a7..db27e232f 100644 --- a/python/pkgs/sh/default.nix +++ b/python/pkgs/sh/default.nix @@ -5,20 +5,18 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sh"; version = "2.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-olCu9oUJ7ZNBnJodkLBkfNXL4mEHupTTcX71ttWV/9k="; }; build-system = [ hatchling ]; - doCheck = false; - pythonImportsCheck = [ "sh" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/sh/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/shamir-mnemonic/default.nix b/python/pkgs/shamir-mnemonic/default.nix index 9bfc64250..ee47288aa 100644 --- a/python/pkgs/shamir-mnemonic/default.nix +++ b/python/pkgs/shamir-mnemonic/default.nix @@ -7,21 +7,21 @@ colorama, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "shamir-mnemonic"; version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "trezor"; - repo = "python-${pname}"; - tag = "v${version}"; + repo = "python-${finalAttrs.pname}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KjZbxA92h25ghbItdmPvkSPvDZUSRWkl4vnJDBMN71s="; }; build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ click colorama ]; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/trezor/python-shamir-mnemonic"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/shap/default.nix b/python/pkgs/shap/default.nix index 1309310fd..42f781570 100644 --- a/python/pkgs/shap/default.nix +++ b/python/pkgs/shap/default.nix @@ -18,7 +18,7 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "shap"; version = "0.50.0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "slundberg"; repo = "shap"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sf9EYa15/5xEOtHSesuq97dFP4frtteoGSpHE8kGP9Q="; }; @@ -74,4 +74,4 @@ buildPythonPackage rec { homepage = "https://github.com/slundberg/shap"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/shapely/default.nix b/python/pkgs/shapely/default.nix index be06e85a5..2e106efe6 100644 --- a/python/pkgs/shapely/default.nix +++ b/python/pkgs/shapely/default.nix @@ -12,7 +12,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "shapely"; version = "2.1.2"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "shapely"; repo = "shapely"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tnnOJsAI3v52ngFOIUIkeDuRIu2JlZGuHreVv4W8LeE="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { homepage = "https://github.com/shapely/shapely"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/shellescape/default.nix b/python/pkgs/shellescape/default.nix index 24045a109..638b3b7ef 100644 --- a/python/pkgs/shellescape/default.nix +++ b/python/pkgs/shellescape/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "shellescape"; version = "3.8.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QLMQswR5vncb86sovY1AdTd4SIvUbqCWm6CzUDjD7CY="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { psfl ]; }; -} +}) diff --git a/python/pkgs/shippinglabel/default.nix b/python/pkgs/shippinglabel/default.nix index c9536dbc0..028d5823d 100644 --- a/python/pkgs/shippinglabel/default.nix +++ b/python/pkgs/shippinglabel/default.nix @@ -10,13 +10,13 @@ packaging, typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "shippinglabel"; version = "2.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JcDDGUwBHANV3/j1bMCzFoj2k7IJ9YSdRJkdii7JHy8="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/domdfcoding/shippinglabel"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/shodan/default.nix b/python/pkgs/shodan/default.nix index 889530dbe..ded407919 100644 --- a/python/pkgs/shodan/default.nix +++ b/python/pkgs/shodan/default.nix @@ -10,13 +10,13 @@ xlsxwriter, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "shodan"; version = "1.31.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xzJ1OG6gI5DhlsNcZgcGoo3U1TfFoh6zh6tiNvrCUfY="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/achillean/shodan-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/shortuuid/default.nix b/python/pkgs/shortuuid/default.nix index 5ac19055e..111ade90c 100644 --- a/python/pkgs/shortuuid/default.nix +++ b/python/pkgs/shortuuid/default.nix @@ -5,13 +5,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "shortuuid"; version = "1.0.13"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-O7nPB/YGJgWEsd9GOZwLh92Edz57JZErfjkeMHl8XnI="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/stochastic-technologies/shortuuid/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/should-dsl/default.nix b/python/pkgs/should-dsl/default.nix index 087077d79..bdaeba760 100644 --- a/python/pkgs/should-dsl/default.nix +++ b/python/pkgs/should-dsl/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "should-dsl"; version = "2.1.2"; pyproject = true; src = fetchPypi { pname = "should_dsl"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-NvdT2Q+9+E7yt6ngeBPj76xyU3b+t6eTVJ8//3oDIyo="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/nsi-iff/should-dsl"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/show-in-file-manager/default.nix b/python/pkgs/show-in-file-manager/default.nix index 9769311c8..dcfb8262a 100644 --- a/python/pkgs/show-in-file-manager/default.nix +++ b/python/pkgs/show-in-file-manager/default.nix @@ -13,13 +13,13 @@ pyxdg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "show-in-file-manager"; version = "1.1.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7ROhgKHUj9iP3UxYv7yzhgJoZBo4gFGSyBTUE4cZLYQ="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "showinfilemanager"; }; -} +}) diff --git a/python/pkgs/shtab/default.nix b/python/pkgs/shtab/default.nix index 013ac4606..a70cca40c 100644 --- a/python/pkgs/shtab/default.nix +++ b/python/pkgs/shtab/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "shtab"; version = "1.12.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BjczhyOo/AjtHC/YJthDIimSRknCbjJHu0jFPWDKO/k="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://docs.iterative.ai/shtab/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/sievelib/default.nix b/python/pkgs/sievelib/default.nix index 8743f3fe4..81f382239 100644 --- a/python/pkgs/sievelib/default.nix +++ b/python/pkgs/sievelib/default.nix @@ -10,13 +10,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sievelib"; version = "1.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Kvuq8lA6/pEt4IgeTFdzg+b5D4dikx+00y8rVBI85FA="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/tonioo/sievelib"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/signedjson/default.nix b/python/pkgs/signedjson/default.nix index 4828cb447..217afc8ca 100644 --- a/python/pkgs/signedjson/default.nix +++ b/python/pkgs/signedjson/default.nix @@ -8,13 +8,13 @@ pynacl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "signedjson"; version = "1.1.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zZHFavU/Fp7wMsYunEoyktwViGaTMxjQWS40Yts9ZJI="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/matrix-org/python-signedjson"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/sigstore-protobuf-specs/default.nix b/python/pkgs/sigstore-protobuf-specs/default.nix index e65537dbb..877f22749 100644 --- a/python/pkgs/sigstore-protobuf-specs/default.nix +++ b/python/pkgs/sigstore-protobuf-specs/default.nix @@ -7,26 +7,25 @@ pydantic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sigstore-protobuf-specs"; version = "0.5.2"; pyproject = true; src = fetchPypi { pname = "sigstore_protobuf_specs"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-oJYdfjYe38YdCp+ylVcG0T2p3rkoWCpZ2q40sIR3XJM="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ betterproto pydantic ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "sigstore_protobuf_specs" ]; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/sigstore/protobuf-specs/tree/main/gen/pb-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/simber/default.nix b/python/pkgs/simber/default.nix index f034e8454..6e7c4d28c 100644 --- a/python/pkgs/simber/default.nix +++ b/python/pkgs/simber/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.2.6"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "deepjyoti30"; repo = "simber"; diff --git a/python/pkgs/simple-rlp/default.nix b/python/pkgs/simple-rlp/default.nix index 71994f1e5..f00aa3eb8 100644 --- a/python/pkgs/simple-rlp/default.nix +++ b/python/pkgs/simple-rlp/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "simple-rlp"; version = "0.1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LfHSt2nwoBd9JiMauL4W5l41RrF7sKmkkO/TUXwIKHY="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/SamuelHaidu/simple-rlp"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/simple-salesforce/default.nix b/python/pkgs/simple-salesforce/default.nix index 39bcef87c..92bd6e951 100644 --- a/python/pkgs/simple-salesforce/default.nix +++ b/python/pkgs/simple-salesforce/default.nix @@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cryptography more-itertools pendulum diff --git a/python/pkgs/simple-term-menu/default.nix b/python/pkgs/simple-term-menu/default.nix index 2fdd3ca7f..41c4ecdf7 100644 --- a/python/pkgs/simple-term-menu/default.nix +++ b/python/pkgs/simple-term-menu/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "simple-term-menu"; version = "1.6.6"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "IngoMeyer441"; repo = "simple-term-menu"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nfMqtyUalt/d/wTyRUlu5x4Q349ARY8hDMi8Ui4cTI4="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "simple_term_menu" ]; # no unit tests in the upstream - doCheck = false; meta = { description = "Python package which creates simple interactive menus on the command line"; @@ -30,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/IngoMeyer441/simple-term-menu"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/simple-websocket/default.nix b/python/pkgs/simple-websocket/default.nix index 0fb2de031..db0ede646 100644 --- a/python/pkgs/simple-websocket/default.nix +++ b/python/pkgs/simple-websocket/default.nix @@ -6,14 +6,14 @@ wsproto, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "simple-websocket"; version = "1.1.0"; pyproject = true; src = fetchPypi { pname = "simple_websocket"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-eTkjTnqgZ8U0q9qzqe2TPsnORpGwcTx4rLGVVgqlKuQ="; }; @@ -21,8 +21,6 @@ buildPythonPackage rec { dependencies = [ wsproto ]; - doCheck = false; - pythonImportsCheck = [ "simple_websocket" ]; meta = { @@ -30,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/miguelgrinberg/simple-websocket"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/simpleaudio/default.nix b/python/pkgs/simpleaudio/default.nix index d8c091668..7e542ab18 100644 --- a/python/pkgs/simpleaudio/default.nix +++ b/python/pkgs/simpleaudio/default.nix @@ -2,21 +2,25 @@ alsa-lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "simpleaudio"; version = "1.0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "hamiltron"; repo = "py-simple-audio"; - rev = version; + tag = finalAttrs.version; sha256 = "12nypzb1m14yip4zrbzin5jc5awyp1d5md5y40g5anj4phb4hx1i"; }; + build-system = [ setuptools ]; + patches = [ ./python312-fix.patch ]; buildInputs = [ alsa-lib ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { description = "Simple audio playback Python extension - cross-platform, asynchronous, dependency-free"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/simplebayes/default.nix b/python/pkgs/simplebayes/default.nix index 3256b15ba..f3b193cb6 100644 --- a/python/pkgs/simplebayes/default.nix +++ b/python/pkgs/simplebayes/default.nix @@ -2,23 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, isPy3k, }: buildPythonPackage { pname = "simplebayes"; version = "1.5.8"; - format = "setuptools"; + pyproject = true; # Use GitHub instead of pypi, because it contains tests. src = fetchFromGitHub { repo = "simplebayes"; owner = "hickeroar"; # NOTE: This is actually 1.5.8 but the tag is wrong! - rev = "1.5.7"; + tag = "1.5.7"; sha256 = "0mp7rvfdmpfxnka4czw3lv5kkh6gdxh6dm4r6hcln1zzfg9lxp4h"; }; + build-system = [ setuptools ]; + postPatch = lib.optionalString isPy3k '' sed -i -e 's/open *(\([^)]*\))/open(\1, encoding="utf-8")/' setup.py ''; diff --git a/python/pkgs/simpleeval/default.nix b/python/pkgs/simpleeval/default.nix index b7d6df0d7..6fa7d9dbe 100644 --- a/python/pkgs/simpleeval/default.nix +++ b/python/pkgs/simpleeval/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "simpleeval"; version = "1.0.7"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danthedeckie"; repo = "simpleeval"; - tag = version; + tag = finalAttrs.version; hash = "sha256-w3Ukb1W5DV9LVcV4IyraBsaFjOgoOoxzQ62N3BBxk1M="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/danthedeckie/simpleeval"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/simplegeneric/default.nix b/python/pkgs/simplegeneric/default.nix index 10e288a01..056b46978 100644 --- a/python/pkgs/simplegeneric/default.nix +++ b/python/pkgs/simplegeneric/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "simplegeneric"; version = "0.8.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3JcuBglLmvW4VbPfSmRjleQ9HJ0NOe00W3OTVg0LkXM="; extension = "zip"; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "http://cheeseshop.python.org/pypi/simplegeneric"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/simplejson/default.nix b/python/pkgs/simplejson/default.nix index 237c8d8fd..1797400cb 100644 --- a/python/pkgs/simplejson/default.nix +++ b/python/pkgs/simplejson/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "simplejson"; version = "4.1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "simplejson"; repo = "simplejson"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fiuz78r0z2ZM2vVIPxhMwnJGiZGURwr1yGSe/uLgeCs="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "simplejson" ]; meta = { @@ -32,4 +36,4 @@ buildPythonPackage rec { afl21 ]; }; -} +}) diff --git a/python/pkgs/simplekml/default.nix b/python/pkgs/simplekml/default.nix index 98e19da42..b3e5dca88 100644 --- a/python/pkgs/simplekml/default.nix +++ b/python/pkgs/simplekml/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "simplekml"; version = "1.3.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zaaHvidUOV/KtmTpCOv1ifrNQehDbSM9K+N6ae+xxTY="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://simplekml.readthedocs.io/"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/simplekv/default.nix b/python/pkgs/simplekv/default.nix index 21746c195..c011432f0 100644 --- a/python/pkgs/simplekv/default.nix +++ b/python/pkgs/simplekv/default.nix @@ -12,7 +12,7 @@ redis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "simplekv"; version = "0.14.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mbr"; repo = "simplekv"; - tag = version; + tag = finalAttrs.version; hash = "sha256-seUGDj2q84+AjDFM1pxMLlHbe9uBgEhmqA96UHjnCmo="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/mbr/simplekv"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/simplesat/default.nix b/python/pkgs/simplesat/default.nix index ddd5fc17e..050670454 100644 --- a/python/pkgs/simplesat/default.nix +++ b/python/pkgs/simplesat/default.nix @@ -8,7 +8,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "simplesat"; version = "0.9.2"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "enthought"; repo = "sat-solver"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-C3AQN999iuckaY9I0RTI8Uj6hrV4UB1XYvua5VG8hHw="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace-fail "version = file: VERSION" "version = ${version}" + --replace-fail "version = file: VERSION" "version = ${finalAttrs.version}" ''; build-system = [ setuptools ]; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/enthought/sat-solver"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/simpy/default.nix b/python/pkgs/simpy/default.nix index 3aedb52a6..f695da6b2 100644 --- a/python/pkgs/simpy/default.nix +++ b/python/pkgs/simpy/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "simpy"; version = "4.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-du82tx4ENrqU5V/rwAHHiHnkk6Mj8EW7z7sLIW6bH7w="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://simpy.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/simsimd/default.nix b/python/pkgs/simsimd/default.nix index 9a548be36..189d2a9ca 100644 --- a/python/pkgs/simsimd/default.nix +++ b/python/pkgs/simsimd/default.nix @@ -8,7 +8,7 @@ tabulate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "simsimd"; version = "7.8.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ashvardanian"; repo = "SimSIMD"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Wn1qpPKdbWUJ5Gy4hnX9XcEneFvgrijGuI+v1F9+9EE="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { bsd3 ]; }; -} +}) diff --git a/python/pkgs/single-version/default.nix b/python/pkgs/single-version/default.nix index 6f6c77a4a..37e4370c0 100644 --- a/python/pkgs/single-version/default.nix +++ b/python/pkgs/single-version/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "single-version"; version = "1.6.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hongquan"; repo = "single-version"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dUmJhNCPuq/7WGzFQXLjb8JrQgQn7qyBqzPWaKzD9hc="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/hongquan/single-version"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/siosocks/default.nix b/python/pkgs/siosocks/default.nix index 46b6eef74..b18f9b45f 100644 --- a/python/pkgs/siosocks/default.nix +++ b/python/pkgs/siosocks/default.nix @@ -6,13 +6,13 @@ trio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "siosocks"; version = "0.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uja79vWhPYOhhTUBIh+XpS4GnrYJy0/XpDXXQjnyHWM="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/pohmelie/siosocks"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sip/4.x.nix b/python/pkgs/sip/4.x.nix index 21810f4c2..064067036 100644 --- a/python/pkgs/sip/4.x.nix +++ b/python/pkgs/sip/4.x.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = sip-module; version = "4.19.25"; pyproject = false; @@ -19,7 +19,7 @@ buildPythonPackage rec { disabled = isPyPy; src = fetchurl { - url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; + url = "https://www.riverbankcomputing.com/static/Downloads/sip/${finalAttrs.version}/sip-${finalAttrs.version}.tar.gz"; sha256 = "04a23cgsnx150xq86w1z44b6vr2zyazysy9mqax0fy346zlr77dk"; }; @@ -35,7 +35,7 @@ buildPythonPackage rec { substituteInPlace configure.py --replace-fail "from distutils" "from setuptools._distutils" ''; - propagatedBuildInputs = lib.optional (pythonAtLeast "3.12") setuptools; + dependencies = lib.optional (pythonAtLeast "3.12") setuptools; configurePhase = '' ${python.executable} ./configure.py \ @@ -64,4 +64,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/sip/default.nix b/python/pkgs/sip/default.nix index 3b1208d76..47156394f 100644 --- a/python/pkgs/sip/default.nix +++ b/python/pkgs/sip/default.nix @@ -7,13 +7,13 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sip"; version = "6.16.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CnOcnNKSneTgiERW2Mrzz7IsEFNHV8d5e9jca9ntabw="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://riverbankcomputing.com/"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/six/default.nix b/python/pkgs/six/default.nix index 9f3e0a46d..99192aeb9 100644 --- a/python/pkgs/six/default.nix +++ b/python/pkgs/six/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "six"; version = "1.17.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "benjaminp"; repo = "six"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tz99C+dz5xJhunoC45bl0NdSdV9NXWya9ti48Z/KaHY="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/benjaminp/six"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sklearn-compat/default.nix b/python/pkgs/sklearn-compat/default.nix index e42fa99df..22453e0d6 100644 --- a/python/pkgs/sklearn-compat/default.nix +++ b/python/pkgs/sklearn-compat/default.nix @@ -6,7 +6,7 @@ scikit-learn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sklearn-compat"; version = "0.1.6"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sklearn-compat"; repo = "sklearn-compat"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bziweext3Mqq0Wa9KlX1gp5NpVYX8IpcvS1gTjxQa70="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/sklearn-compat/sklearn-compat"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/skops/default.nix b/python/pkgs/skops/default.nix index 7795986b0..1f4c63626 100644 --- a/python/pkgs/skops/default.nix +++ b/python/pkgs/skops/default.nix @@ -22,7 +22,6 @@ buildPythonPackage (finalAttrs: { pname = "skops"; version = "0.14"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "skops-dev"; diff --git a/python/pkgs/skyfield/default.nix b/python/pkgs/skyfield/default.nix index 546a7be82..7a348c443 100644 --- a/python/pkgs/skyfield/default.nix +++ b/python/pkgs/skyfield/default.nix @@ -9,7 +9,7 @@ jplephem, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "skyfield"; version = "1.54"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "skyfielders"; repo = "python-skyfield"; - rev = version; + tag = finalAttrs.version; hash = "sha256-oZEmc8BVqs3eSaqrjyR/wQu1WTLv4A0a/dpEZduCXqk="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { description = "Elegant astronomy for Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/slicer/default.nix b/python/pkgs/slicer/default.nix index 1e394a19f..5c0a7bdb0 100644 --- a/python/pkgs/slicer/default.nix +++ b/python/pkgs/slicer/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "slicer"; version = "0.0.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LnVTr3PwwMLTVfSvzD7Pl8byFW/PRZOVXD9Wz2xNbrc="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/slicerator/default.nix b/python/pkgs/slicerator/default.nix index a5a8c3e1a..785f8d78d 100644 --- a/python/pkgs/slicerator/default.nix +++ b/python/pkgs/slicerator/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "slicerator"; version = "1.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RAEKf1zYdoDAchO1yr6B0ftxJSlilD5Tc+59FGBdYEY="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/soft-matter/slicerator"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/slip10/default.nix b/python/pkgs/slip10/default.nix index 5df82adb8..ee12a43b1 100644 --- a/python/pkgs/slip10/default.nix +++ b/python/pkgs/slip10/default.nix @@ -7,13 +7,13 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "slip10"; version = "1.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0kjT3ybxI/CEdDOcRfDyZCVPdK6aVlcjSh1euR8MTVQ="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/trezor/python-slip10"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sly/default.nix b/python/pkgs/sly/default.nix index e837156d5..b77b6871b 100644 --- a/python/pkgs/sly/default.nix +++ b/python/pkgs/sly/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sly"; version = "0.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JR1CAV6FBxWK7CFk8GA130qCsDFM5kUPRX1xJedkkCQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/dabeaz/sly"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/smart-open/default.nix b/python/pkgs/smart-open/default.nix index 8dab14f81..ece7cb5f7 100644 --- a/python/pkgs/smart-open/default.nix +++ b/python/pkgs/smart-open/default.nix @@ -14,7 +14,7 @@ wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "smart-open"; version = "8.0.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "smart_open"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Qr2GzmRDCCvR6Q/msSC8F2i8EDYmCIuQP8f593aIisI="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/piskvorky/smart_open"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/smartypants/default.nix b/python/pkgs/smartypants/default.nix index c3843746c..44f8b2882 100644 --- a/python/pkgs/smartypants/default.nix +++ b/python/pkgs/smartypants/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "smartypants"; version = "2.0.2"; pyproject = true; @@ -15,10 +15,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "leohemsted"; repo = "smartypants.py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jSGiT36Rr0P6eEWZIHtMj4go3KGDRaF2spLxLNruDec="; }; build-system = [ setuptools ]; -} +}) diff --git a/python/pkgs/smdebug-rulesconfig/default.nix b/python/pkgs/smdebug-rulesconfig/default.nix index 31656697d..021c54751 100644 --- a/python/pkgs/smdebug-rulesconfig/default.nix +++ b/python/pkgs/smdebug-rulesconfig/default.nix @@ -2,20 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "smdebug-rulesconfig"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "smdebug_rulesconfig"; sha256 = "1mpwjfvpmryqqwlbyf500584jclgm3vnxa740yyfzkvb5vmyc6bs"; }; - doCheck = false; + build-system = [ setuptools ]; pythonImportsCheck = [ "smdebug_rulesconfig" ]; @@ -24,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/awslabs/sagemaker-debugger-rulesconfig"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/smmap/default.nix b/python/pkgs/smmap/default.nix index 736c664d0..a48957fe3 100644 --- a/python/pkgs/smmap/default.nix +++ b/python/pkgs/smmap/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "smmap"; version = "6.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jXkCjqbMEx2l6rCZpdlamY1DxneZVv/+O0VQQJEQdto="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/gitpython-developers/smmap"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/smpplib/default.nix b/python/pkgs/smpplib/default.nix index c16f74e04..b3a49220b 100644 --- a/python/pkgs/smpplib/default.nix +++ b/python/pkgs/smpplib/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "smpplib"; version = "2.2.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bzsDb8smQ8G3oyibtaxMmnIK8b9z5XLicp22tdgAwnM="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-smpplib/python-smpplib"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/snakeviz/default.nix b/python/pkgs/snakeviz/default.nix index b71d480a7..40f0b3c2b 100644 --- a/python/pkgs/snakeviz/default.nix +++ b/python/pkgs/snakeviz/default.nix @@ -8,7 +8,7 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "snakeviz"; version = "2.2.2"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jiffyclub"; repo = "snakeviz"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-s/OATRnkooucRkLer5A66X9xDEA7aKNo+c10m1N7Guw="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ tornado ]; + dependencies = [ tornado ]; pythonImportsCheck = [ "snakeviz" ]; meta = { description = "Browser based viewer for profiling data"; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://jiffyclub.github.io/snakeviz"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/snapcast/default.nix b/python/pkgs/snapcast/default.nix index eba7f7535..740b7ee0b 100644 --- a/python/pkgs/snapcast/default.nix +++ b/python/pkgs/snapcast/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "snapcast"; version = "2.3.8"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "happyleavesaoc"; repo = "python-snapcast"; - tag = version; + tag = finalAttrs.version; hash = "sha256-AWGpKtkki5I7VkKSSOBKUss2ULzOKVuKP/8mrU3VmqI="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ construct packaging ]; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/happyleavesaoc/python-snapcast/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/snapshot-restore-py/default.nix b/python/pkgs/snapshot-restore-py/default.nix index 172c0ed2d..eb2fc14be 100644 --- a/python/pkgs/snapshot-restore-py/default.nix +++ b/python/pkgs/snapshot-restore-py/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "snapshot-restore-py"; version = "1.0.0"; pyproject = true; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws"; repo = "snapshot-restore-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sixVSQcEqLTUrKxYAM13gzqttWnbXPMII0V/gtXM1IE="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/snaptime/default.nix b/python/pkgs/snaptime/default.nix index d8dced959..475d8e510 100644 --- a/python/pkgs/snaptime/default.nix +++ b/python/pkgs/snaptime/default.nix @@ -7,13 +7,13 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "snaptime"; version = "0.2.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4/HriQQ9WNMHIauYy2UCPxpMJ0DjsZdwQpixY8ktUIs="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/zartstrom/snaptime"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sniffio/default.nix b/python/pkgs/sniffio/default.nix index d517bee32..832f6c8a1 100644 --- a/python/pkgs/sniffio/default.nix +++ b/python/pkgs/sniffio/default.nix @@ -8,7 +8,7 @@ isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sniffio"; version = "1.3.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = !isPy3k; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-9DJO3GcKD0l1CoG4lfNcOtuEPMpG8FMPefwbq7I3idw="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; description = "Sniff out which async library your code is running under"; }; -} +}) diff --git a/python/pkgs/snitun/default.nix b/python/pkgs/snitun/default.nix index 2a5df1c9b..f71a9164e 100644 --- a/python/pkgs/snitun/default.nix +++ b/python/pkgs/snitun/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "snitun"; version = "0.47.0"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NabuCasa"; repo = "snitun"; - tag = version; + tag = finalAttrs.version; hash = "sha256-l7iXTXY6Dq1LV4ju6/WlipTSeybne33tiFYiwgy+DuM="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -39,4 +39,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/snowballstemmer/default.nix b/python/pkgs/snowballstemmer/default.nix index 2717cbeaa..c3f73103e 100644 --- a/python/pkgs/snowballstemmer/default.nix +++ b/python/pkgs/snowballstemmer/default.nix @@ -3,22 +3,25 @@ buildPythonPackage, pystemmer, fetchPypi, + # build-system + setuptools, }: buildPythonPackage (finalAttrs: { pname = "snowballstemmer"; version = "3.1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; sha256 = "sha256-4Hu8VKDXmP5gEKEjmEIuYqi/u6lcOU/QlW71jLTT4mA="; }; + build-system = [ setuptools ]; + # No tests included - doCheck = false; - propagatedBuildInputs = [ pystemmer ]; + dependencies = [ pystemmer ]; meta = { description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms"; diff --git a/python/pkgs/snowflake-connector-python/default.nix b/python/pkgs/snowflake-connector-python/default.nix index 4fb469047..8384a369f 100644 --- a/python/pkgs/snowflake-connector-python/default.nix +++ b/python/pkgs/snowflake-connector-python/default.nix @@ -32,7 +32,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "snowflake-connector-python"; version = "4.7.3"; pyproject = true; @@ -40,7 +40,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "snowflakedb"; repo = "snowflake-connector-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Th2fMBia+367o1QM0odt9rC/j9ta56b58VO+VNP9MEc="; }; @@ -94,4 +94,4 @@ buildPythonPackage rec { homepage = "https://github.com/snowflakedb/snowflake-connector-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/snowflake-core/default.nix b/python/pkgs/snowflake-core/default.nix index 027bbae19..cde86979d 100644 --- a/python/pkgs/snowflake-core/default.nix +++ b/python/pkgs/snowflake-core/default.nix @@ -11,14 +11,14 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "snowflake-core"; version = "1.13.1"; pyproject = true; src = fetchPypi { pname = "snowflake_core"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-nweqQPd/HjAvGIEkh6+v1J9/0rSTkuoD8RW8WrbLABU="; }; @@ -38,7 +38,6 @@ buildPythonPackage rec { ]; # Tests require access to Snowflake - doCheck = false; pythonImportsCheck = [ "snowflake.core" @@ -49,4 +48,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/snowflake.core"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/snowflake-sqlalchemy/default.nix b/python/pkgs/snowflake-sqlalchemy/default.nix index 68b6280d7..87b560a52 100644 --- a/python/pkgs/snowflake-sqlalchemy/default.nix +++ b/python/pkgs/snowflake-sqlalchemy/default.nix @@ -7,7 +7,7 @@ sqlalchemy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "snowflake-sqlalchemy"; version = "1.11.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "snowflakedb"; repo = "snowflake-sqlalchemy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TleMhXTtUAcgZ0oE4wrfcJUE2c3/x10tqm3T8SwS5x0="; }; @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; # Tests require a database - doCheck = false; pythonImportsCheck = [ "snowflake.sqlalchemy" ]; @@ -36,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/snowflakedb/snowflake-sqlalchemy"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/social-auth-app-django/default.nix b/python/pkgs/social-auth-app-django/default.nix index 91c942964..4f549f74d 100644 --- a/python/pkgs/social-auth-app-django/default.nix +++ b/python/pkgs/social-auth-app-django/default.nix @@ -8,7 +8,7 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "social-auth-app-django"; version = "6.0.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-social-auth"; repo = "social-app-django"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5aZQcGPX93XITzJCgL+s5Jxep+qqVbYGvzMXDRpZXdY="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-social-auth/social-app-django"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/social-auth-core/default.nix b/python/pkgs/social-auth-core/default.nix index 4a2006fcc..cd5587320 100644 --- a/python/pkgs/social-auth-core/default.nix +++ b/python/pkgs/social-auth-core/default.nix @@ -20,7 +20,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "social-auth-core"; version = "5.1.0"; pyproject = true; @@ -28,13 +28,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-social-auth"; repo = "social-core"; - tag = version; + tag = finalAttrs.version; hash = "sha256-1cpVyKi/MLaABzWZiCW5yNEq49Md0NCZ+0zWUvbjlss="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cryptography defusedxml oauthlib @@ -59,4 +59,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-social-auth/social-core"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/socketio-client/default.nix b/python/pkgs/socketio-client/default.nix index 9ab110a4e..3c1f62ea4 100644 --- a/python/pkgs/socketio-client/default.nix +++ b/python/pkgs/socketio-client/default.nix @@ -5,21 +5,25 @@ six, websocket-client, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "socketio-client"; version = "0.7.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "invisibleroads"; repo = "socketio-client"; - rev = version; + tag = finalAttrs.version; hash = "sha256-71sjiGJDDYElPGUNCH1HaVdvgMt8KeD/kXVDpF615ho="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ six websocket-client requests @@ -34,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/invisibleroads/socketIO-client"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sockjs-tornado/default.nix b/python/pkgs/sockjs-tornado/default.nix index c321c6f05..4d4db1ba4 100644 --- a/python/pkgs/sockjs-tornado/default.nix +++ b/python/pkgs/sockjs-tornado/default.nix @@ -6,13 +6,13 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sockjs-tornado"; version = "1.0.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Av8lRms6RrGn2+R3NAsEJ3CsB43n6kdaYoWiinXrH6s="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/mrjoes/sockjs-tornado/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/socksipy-branch/default.nix b/python/pkgs/socksipy-branch/default.nix index ef8de9e4f..dfed9f6c3 100644 --- a/python/pkgs/socksipy-branch/default.nix +++ b/python/pkgs/socksipy-branch/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "socksipy-branch"; version = "1.01"; pyproject = true; src = fetchPypi { pname = "SocksiPy-branch"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-F6lQYOKMO5A4qbjBhlxU+MHFvvFdVhv3d8m788gOhAY="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "http://code.google.com/p/socksipy-branch/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/soco/default.nix b/python/pkgs/soco/default.nix index cb2bef1c1..2b31b9ddf 100644 --- a/python/pkgs/soco/default.nix +++ b/python/pkgs/soco/default.nix @@ -10,7 +10,7 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "soco"; version = "0.31.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TCnKzAOrpQxh8JaBkoPs2e81xUS/iQ8D/Qtt3WU9J1k="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "http://python-soco.com/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/softlayer/default.nix b/python/pkgs/softlayer/default.nix index d444af6a9..e4b060596 100644 --- a/python/pkgs/softlayer/default.nix +++ b/python/pkgs/softlayer/default.nix @@ -14,7 +14,7 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "softlayer"; version = "6.2.9"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "softlayer"; repo = "softlayer-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kGgCW9N2NZi8PHcfpN+8L2bg7v1edP8ZXYaoSt9545M="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/softlayer/softlayer-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sopel/default.nix b/python/pkgs/sopel/default.nix index 4dcffe46e..b027c7024 100644 --- a/python/pkgs/sopel/default.nix +++ b/python/pkgs/sopel/default.nix @@ -16,7 +16,7 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sopel"; version = "8.0.4"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { disabled = isPyPy; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-16QDzsZCquAPH3FPyBjxeXGcvSdjYLZFTXN0ASneROU="; }; @@ -63,4 +63,4 @@ buildPythonPackage rec { license = lib.licenses.efl20; mainProgram = "sopel"; }; -} +}) diff --git a/python/pkgs/sorl-thumbnail/default.nix b/python/pkgs/sorl-thumbnail/default.nix index f57e94062..d54b4002d 100644 --- a/python/pkgs/sorl-thumbnail/default.nix +++ b/python/pkgs/sorl-thumbnail/default.nix @@ -7,14 +7,14 @@ django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sorl-thumbnail"; version = "13.1.0"; pyproject = true; src = fetchPypi { pname = "sorl_thumbnail"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-S/LT5cIR+dPXVCc68GfHZk3zYb/MRyL3eKzvBUNS7vo="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { description = "Thumbnails for Django"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sortedcollections/default.nix b/python/pkgs/sortedcollections/default.nix index 13a42fb27..da95ad00d 100644 --- a/python/pkgs/sortedcollections/default.nix +++ b/python/pkgs/sortedcollections/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, sortedcontainers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sortedcollections"; version = "2.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "grantjenks"; repo = "python-sortedcollections"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GkZO8afUAgDpDjIa3dhO6nxykqrljeKldunKMODSXfg="; }; - propagatedBuildInputs = [ sortedcontainers ]; + build-system = [ setuptools ]; + + dependencies = [ sortedcontainers ]; pythonImportsCheck = [ "sortedcollections" ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "http://www.grantjenks.com/docs/sortedcollections/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/sortedcontainers/default.nix b/python/pkgs/sortedcontainers/default.nix index d2e00ecf9..bcd6bff22 100644 --- a/python/pkgs/sortedcontainers/default.nix +++ b/python/pkgs/sortedcontainers/default.nix @@ -2,28 +2,31 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: let - sortedcontainers = buildPythonPackage rec { + sortedcontainers = buildPythonPackage (finalAttrs: { pname = "sortedcontainers"; version = "2.4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "grantjenks"; repo = "python-sortedcontainers"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YRbSM2isWi7AzfquFvuZBlpEMNUnBJTBLBn0/XYVHKQ="; }; - doCheck = false; + build-system = [ setuptools ]; + pythonImportsCheck = [ "sortedcontainers" ]; meta = { description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet"; homepage = "https://grantjenks.com/docs/sortedcontainers/"; license = lib.licenses.asl20; }; - }; + }); in sortedcontainers diff --git a/python/pkgs/sounddevice/default.nix b/python/pkgs/sounddevice/default.nix index 264a8b7c5..f001e1df2 100644 --- a/python/pkgs/sounddevice/default.nix +++ b/python/pkgs/sounddevice/default.nix @@ -11,13 +11,13 @@ replaceVars, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sounddevice"; version = "0.5.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ikh7ZRmMtb8iCHVRBbUk94rRc+Wra0Rb2rHJifZpjfM="; }; @@ -35,7 +35,6 @@ buildPythonPackage rec { nativeBuildInputs = [ cffi ]; # No tests included nor upstream available. - doCheck = false; pythonImportsCheck = [ "sounddevice" ]; @@ -50,4 +49,4 @@ buildPythonPackage rec { homepage = "https://python-sounddevice.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/soundfile/default.nix b/python/pkgs/soundfile/default.nix index 8227b85eb..32076deab 100644 --- a/python/pkgs/soundfile/default.nix +++ b/python/pkgs/soundfile/default.nix @@ -11,14 +11,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "soundfile"; version = "0.14.0"; pyproject = true; disabled = isPyPy; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uhwaLWGLylxAZkfIO4nwfMiBD6UGpQYippk7oTDB3hE="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { # https://github.com/bastibe/python-soundfile/issues/157 broken = stdenv.hostPlatform.isi686; }; -} +}) diff --git a/python/pkgs/soupsieve/default.nix b/python/pkgs/soupsieve/default.nix index 8ec5bf48a..cab5361b2 100644 --- a/python/pkgs/soupsieve/default.nix +++ b/python/pkgs/soupsieve/default.nix @@ -5,20 +5,19 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "soupsieve"; version = "2.9.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SlXYzxWKnC5Yf6SSLxu7kdaKyCni1vJUA6hXR8cdr3Q="; }; nativeBuildInputs = [ hatchling ]; # Circular dependency on beautifulsoup4 - doCheck = false; # Circular dependency on beautifulsoup4 # pythonImportsCheck = [ "soupsieve" ]; @@ -28,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.mit; homepage = "https://github.com/facelessuser/soupsieve"; }; -} +}) diff --git a/python/pkgs/soxr/default.nix b/python/pkgs/soxr/default.nix index 42ea01993..6ca8cbb8a 100644 --- a/python/pkgs/soxr/default.nix +++ b/python/pkgs/soxr/default.nix @@ -18,7 +18,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "soxr"; version = "1.1.0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dofuuz"; repo = "python-soxr"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XdSInR0ogbcku6yvMkGEEIxu2nlqa0mffBtd+ifvzoU="; }; @@ -61,4 +61,4 @@ buildPythonPackage rec { homepage = "https://github.com/dofuuz/python-soxr/tree/main"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/spacy-legacy/default.nix b/python/pkgs/spacy-legacy/default.nix index 6b278ddc4..0b372755a 100644 --- a/python/pkgs/spacy-legacy/default.nix +++ b/python/pkgs/spacy-legacy/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spacy-legacy"; version = "3.0.12"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-s31uDJtuHXyhz1vHFSq2SkxGcfWcha2vej/LhwNXp3Q="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/spacy-legacy"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/spake2/default.nix b/python/pkgs/spake2/default.nix index 6ce96610b..cc4b82af2 100644 --- a/python/pkgs/spake2/default.nix +++ b/python/pkgs/spake2/default.nix @@ -6,13 +6,13 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spake2"; version = "0.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Qh/EqNWsOVr3rwIG/9nmzfGIwQXLG4g9nWgzErtakzQ="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "SPAKE2 password-authenticated key exchange library"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/spark-parser/default.nix b/python/pkgs/spark-parser/default.nix index c78d15996..90a60f4d6 100644 --- a/python/pkgs/spark-parser/default.nix +++ b/python/pkgs/spark-parser/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spark-parser"; version = "1.9.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "spark_parser"; - inherit version; + inherit (finalAttrs) version; sha256 = "sha256-3GbUjEJlxBM9tBqcX+nBxQKzsgFn3xWKDyNM0xcSz2Q="; }; - propagatedBuildInputs = [ click ]; + build-system = [ setuptools ]; + + dependencies = [ click ]; unittestFlagsArray = [ "-s" @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/rocky/python-spark"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sparklines/default.nix b/python/pkgs/sparklines/default.nix index 9c90ec576..203fe894b 100644 --- a/python/pkgs/sparklines/default.nix +++ b/python/pkgs/sparklines/default.nix @@ -6,7 +6,7 @@ termcolor, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sparklines"; version = "1.0.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "deeplook"; repo = "sparklines"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-HXOt3xqXfd9GwHQZifHcveE1v48nKRaCKGAJI8xeLdM="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/deeplook/sparklines"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sparqlwrapper/default.nix b/python/pkgs/sparqlwrapper/default.nix index 76b1c502d..f763d0ab1 100644 --- a/python/pkgs/sparqlwrapper/default.nix +++ b/python/pkgs/sparqlwrapper/default.nix @@ -2,29 +2,32 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, keepalive, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sparqlwrapper"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "SPARQLWrapper"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-P+0+vMd2F6SnTSZEuG/Yjg8y5/cAOseyszTAJiAXMfE="; }; + build-system = [ setuptools ]; + # break circular dependency loop patchPhase = '' sed -i '/rdflib/d' setup.cfg ''; # Doesn't actually run tests - doCheck = false; - propagatedBuildInputs = [ keepalive ]; + dependencies = [ keepalive ]; meta = { description = "This is a wrapper around a SPARQL service. It helps in creating the query URI and, possibly, convert the result into a more manageable format"; @@ -32,4 +35,4 @@ buildPythonPackage rec { homepage = "http://rdflib.github.io/sparqlwrapper"; license = lib.licenses.w3c; }; -} +}) diff --git a/python/pkgs/sparsediffpy/default.nix b/python/pkgs/sparsediffpy/default.nix index aab723d8e..8d8c96d0f 100644 --- a/python/pkgs/sparsediffpy/default.nix +++ b/python/pkgs/sparsediffpy/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "sparsediffpy"; version = "0.6.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "SparseDifferentiation"; @@ -48,7 +47,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "sparsediffpy" ]; # No tests - doCheck = false; meta = { description = "Python bindings for SparseDiffEngine, a C library for computing sparse Jacobians and Hessians"; diff --git a/python/pkgs/spdx/default.nix b/python/pkgs/spdx/default.nix index b1a84a603..37bb14437 100644 --- a/python/pkgs/spdx/default.nix +++ b/python/pkgs/spdx/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spdx"; version = "2.5"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bbqsrc"; repo = "spdx-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lfTgAX4Wl01xrvLA12ZUqjah7ZiLafMAU+yNNdVkRk0="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/bbqsrc/spdx-python"; license = lib.licenses.cc0; }; -} +}) diff --git a/python/pkgs/speaklater/default.nix b/python/pkgs/speaklater/default.nix index 8fc64fcd9..e46857b1f 100644 --- a/python/pkgs/speaklater/default.nix +++ b/python/pkgs/speaklater/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "speaklater"; version = "1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Wf6jNtDu04wfC/MYHuEiLQ70Xzqd006+Zea//91qZak="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/mitsuhiko/speaklater"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/spectra/default.nix b/python/pkgs/spectra/default.nix index 3dc1eefad..7dbf52cfe 100644 --- a/python/pkgs/spectra/default.nix +++ b/python/pkgs/spectra/default.nix @@ -6,7 +6,7 @@ colormath2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spectra"; version = "0.1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jsvine"; repo = "spectra"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PS5p9IR3v6+Up5Fcq8mhkprVgXigD6PZUF4/6hbv7NI="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/jsvine/spectra"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/speg/default.nix b/python/pkgs/speg/default.nix index 5936033ea..598676856 100644 --- a/python/pkgs/speg/default.nix +++ b/python/pkgs/speg/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "speg"; version = "0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-EMvvR+Fo38YvFNtXXPHEKAN6K4gc7mw8/O2gQ5wkPnE="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { description = "PEG-based parser interpreter with memoization (in time)"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/spglib/default.nix b/python/pkgs/spglib/default.nix index 63cf6bcb9..3cf8ebf38 100644 --- a/python/pkgs/spglib/default.nix +++ b/python/pkgs/spglib/default.nix @@ -14,7 +14,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spglib"; version = "2.7.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spglib"; repo = "spglib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RFvd/j/14YRIcQTpnYPx5edeF3zbHbi90jb32i3ZU/c="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://spglib.github.io/spglib/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sphinx-argparse/default.nix b/python/pkgs/sphinx-argparse/default.nix index 99a2b9324..824a2b75c 100644 --- a/python/pkgs/sphinx-argparse/default.nix +++ b/python/pkgs/sphinx-argparse/default.nix @@ -7,14 +7,14 @@ lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-argparse"; version = "0.6.1"; pyproject = true; src = fetchPypi { pname = "sphinx_argparse"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-+L4Weu31ZwvXyBLvUVlo/0cXxjz8nLTfXzS1T9VknDc="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/ashb/sphinx-argparse"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-autoapi/default.nix b/python/pkgs/sphinx-autoapi/default.nix index 9754f7245..891db92a4 100644 --- a/python/pkgs/sphinx-autoapi/default.nix +++ b/python/pkgs/sphinx-autoapi/default.nix @@ -16,7 +16,7 @@ beautifulsoup4, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-autoapi"; version = "3.8.1"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "readthedocs"; repo = "sphinx-autoapi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WvatLBJGTqQJbRV9wnac7oBRX+Az3mEHLkbCqNFQIYk="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { ''; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-autobuild/default.nix b/python/pkgs/sphinx-autobuild/default.nix index 440e1b4fe..2ea3e815b 100644 --- a/python/pkgs/sphinx-autobuild/default.nix +++ b/python/pkgs/sphinx-autobuild/default.nix @@ -18,7 +18,7 @@ # tests }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-autobuild"; version = "2025.08.25"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-doc"; repo = "sphinx-autobuild"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JfhLC1924bU1USvoYwluFGdxxahS+AfRSHnGlLfE0NY="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-doc/sphinx-autobuild"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-autodoc-typehints/default.nix b/python/pkgs/sphinx-autodoc-typehints/default.nix index 4b38d4547..f1e3bb2b4 100644 --- a/python/pkgs/sphinx-autodoc-typehints/default.nix +++ b/python/pkgs/sphinx-autodoc-typehints/default.nix @@ -26,7 +26,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ sphinx ]; # requires spobjinv, nbtyping - doCheck = false; pythonImportsCheck = [ "sphinx_autodoc_typehints" ]; diff --git a/python/pkgs/sphinx-automodapi/default.nix b/python/pkgs/sphinx-automodapi/default.nix index 4dfd8cde5..8b02ae9bb 100644 --- a/python/pkgs/sphinx-automodapi/default.nix +++ b/python/pkgs/sphinx-automodapi/default.nix @@ -8,7 +8,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-automodapi"; version = "0.22.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astropy"; repo = "sphinx-automodapi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-F5QAHjnLjvcdZOtpY2UIaZliRIv5rciDHWi6DQ9tUmc="; leaveDotGit = true; }; @@ -36,7 +36,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace sphinx_automodapi/tests/{helpers,test_cases}.py \ - --replace ", None)" ", (None, '${testInventory}'))" + --replace ", None)" ", (None, '${finalAttrs.testInventory}'))" ''; pythonImportsCheck = [ "sphinx_automodapi" ]; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/astropy/sphinx-automodapi"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sphinx-basic-ng/default.nix b/python/pkgs/sphinx-basic-ng/default.nix index 3d5596341..16fd6da00 100644 --- a/python/pkgs/sphinx-basic-ng/default.nix +++ b/python/pkgs/sphinx-basic-ng/default.nix @@ -6,14 +6,14 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-basic-ng"; version = "1.0.0b2"; pyproject = true; src = fetchPypi { pname = "sphinx_basic_ng"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-nsVaR8kMjAArWWDFdJLsMCH1GTyybOvC3E6iJoSGUck="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://sphinx-basic-ng.readthedocs.io/en/latest/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-book-theme/default.nix b/python/pkgs/sphinx-book-theme/default.nix index 8e0753f09..c9ac5b35e 100644 --- a/python/pkgs/sphinx-book-theme/default.nix +++ b/python/pkgs/sphinx-book-theme/default.nix @@ -6,14 +6,14 @@ pydata-sphinx-theme, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-book-theme"; version = "1.4.0"; format = "wheel"; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; format = "wheel"; dist = "py3"; python = "py3"; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-book-theme"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sphinx-click/default.nix b/python/pkgs/sphinx-click/default.nix index 3d96f9edc..300be936e 100644 --- a/python/pkgs/sphinx-click/default.nix +++ b/python/pkgs/sphinx-click/default.nix @@ -14,7 +14,7 @@ defusedxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-click"; version = "6.2.0"; pyproject = true; @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "sphinx_click"; hash = "sha256-/Hi0FUpOUVlGLjbeVbhkN0fabNqGs7Uqi7YiieYDd2w="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/click-contrib/sphinx-click"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-copybutton/default.nix b/python/pkgs/sphinx-copybutton/default.nix index 932786355..404d5837f 100644 --- a/python/pkgs/sphinx-copybutton/default.nix +++ b/python/pkgs/sphinx-copybutton/default.nix @@ -6,13 +6,13 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-copybutton"; version = "0.5.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-TPF8gvuWRtG8nKkqwoCBOjtgXYxCEiX9mRMVQQPuH70="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "Small sphinx extension to add a \"copy\" button to code blocks"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-favicon/default.nix b/python/pkgs/sphinx-favicon/default.nix index efc7c2a69..208cf2eb5 100644 --- a/python/pkgs/sphinx-favicon/default.nix +++ b/python/pkgs/sphinx-favicon/default.nix @@ -6,7 +6,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-favicon"; version = "1.1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tcmetzger"; repo = "sphinx-favicon"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8zKG145BttlE8HYJ0H8O762TYC9KeIO8L9UfgNDs+i8="; }; @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Sphinx extension to add custom favicons"; homepage = "https://github.com/tcmetzger/sphinx-favicon"; - changelog = "https://github.com/tcmetzger/sphinx-favicon/blob/v${version}/CHANGELOG"; + changelog = "https://github.com/tcmetzger/sphinx-favicon/blob/v${finalAttrs.version}/CHANGELOG"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-inline-tabs/default.nix b/python/pkgs/sphinx-inline-tabs/default.nix index 30232d674..096304d80 100644 --- a/python/pkgs/sphinx-inline-tabs/default.nix +++ b/python/pkgs/sphinx-inline-tabs/default.nix @@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ sphinx ]; + dependencies = [ sphinx ]; # no tests, see https://github.com/pradyunsg/sphinx-inline-tabs/issues/6 diff --git a/python/pkgs/sphinx-intl/default.nix b/python/pkgs/sphinx-intl/default.nix index f5b68e700..839941874 100644 --- a/python/pkgs/sphinx-intl/default.nix +++ b/python/pkgs/sphinx-intl/default.nix @@ -9,7 +9,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-intl"; version = "2.4.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-doc"; repo = "sphinx-intl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Q8k/XOT2s7u7IuQ85XrcARLPwMUC9Z6yeRshrIGbJdA="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-doc/sphinx-intl"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinx-issues/default.nix b/python/pkgs/sphinx-issues/default.nix index 88b7b8df4..19c188179 100644 --- a/python/pkgs/sphinx-issues/default.nix +++ b/python/pkgs/sphinx-issues/default.nix @@ -5,7 +5,7 @@ flit-core, sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-issues"; version = "6.0.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sloria"; repo = "sphinx-issues"; - tag = version; + tag = finalAttrs.version; hash = "sha256-havy1wP300yAKRi68fAVfQS7t5S9NueuGqE2RqdkVP0="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { description = "Sphinx extension for linking to your project's issue tracker"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-jinja/default.nix b/python/pkgs/sphinx-jinja/default.nix index b38dd6928..4a3064231 100644 --- a/python/pkgs/sphinx-jinja/default.nix +++ b/python/pkgs/sphinx-jinja/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-jinja"; version = "2.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xiMrWaiUE5dwvh3G0LAKN55CiM54FXkE4fhHPeo+Bxg="; }; - propagatedBuildInputs = [ sphinx ]; + build-system = [ setuptools ]; + + dependencies = [ sphinx ]; # upstream source is not updated to 2.0.X and pypi does not contain tests - doCheck = false; pythonImportsCheck = [ "sphinx_jinja" ]; @@ -27,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/tardyp/sphinx-jinja"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-jinja2-compat/default.nix b/python/pkgs/sphinx-jinja2-compat/default.nix index 31cfa2bdb..e79f12d28 100644 --- a/python/pkgs/sphinx-jinja2-compat/default.nix +++ b/python/pkgs/sphinx-jinja2-compat/default.nix @@ -8,13 +8,13 @@ standard-imghdr, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-jinja2-compat"; version = "0.4.1"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "sphinx_jinja2_compat"; hash = "sha256-AYjwgC1Cw9pymXUztVoAgVZZp40/gdS0dHsfsVpXKOY="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-toolbox/sphinx-jinja2-compat"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-last-updated-by-git/default.nix b/python/pkgs/sphinx-last-updated-by-git/default.nix index 97b141a8c..453df0695 100644 --- a/python/pkgs/sphinx-last-updated-by-git/default.nix +++ b/python/pkgs/sphinx-last-updated-by-git/default.nix @@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: { --replace-fail "'git', 'rev-parse'" "'${lib.getExe gitMinimal}', 'rev-parse'" ''; - propagatedBuildInputs = [ gitMinimal ]; + nativeBuildInputs = [ gitMinimal ]; meta = { description = "Get the last updated time for each Sphinx page from Git"; diff --git a/python/pkgs/sphinx-lv2-theme/default.nix b/python/pkgs/sphinx-lv2-theme/default.nix index f96885448..e6e3d62ec 100644 --- a/python/pkgs/sphinx-lv2-theme/default.nix +++ b/python/pkgs/sphinx-lv2-theme/default.nix @@ -6,7 +6,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-lv2-theme"; version = "1.4.6"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "LV2"; repo = "sphinx_lv2_theme"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WOunukFWa4AMrLpeKjuvmFT+3GhCzV3k/hl4mQXN0GQ="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/lv2/sphinx_lv2_theme"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/sphinx-markdown-builder/default.nix b/python/pkgs/sphinx-markdown-builder/default.nix index b41f1258b..25ec4887e 100644 --- a/python/pkgs/sphinx-markdown-builder/default.nix +++ b/python/pkgs/sphinx-markdown-builder/default.nix @@ -11,7 +11,7 @@ tabulate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-markdown-builder"; version = "0.6.10"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "liran-funaro"; repo = "sphinx-markdown-builder"; - tag = version; + tag = finalAttrs.version; hash = "sha256-97mlVD1MCtSw8AYyGc38auOrHU/vKH2aQJa4YIRQcBk="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/liran-funaro/sphinx-markdown-builder"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-markdown-tables/default.nix b/python/pkgs/sphinx-markdown-tables/default.nix index 90c52eaba..3d09888c3 100644 --- a/python/pkgs/sphinx-markdown-tables/default.nix +++ b/python/pkgs/sphinx-markdown-tables/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, sphinx, markdown, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-markdown-tables"; version = "0.0.17"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-a8bT1ADqzP7r0ohEa8CN2DCDNnxYuF1A/mwS1371kvE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ sphinx markdown ]; @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/ryanfox/sphinx-markdown-tables"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/sphinx-mdinclude/default.nix b/python/pkgs/sphinx-mdinclude/default.nix index e9d9d677b..8eb416e81 100644 --- a/python/pkgs/sphinx-mdinclude/default.nix +++ b/python/pkgs/sphinx-mdinclude/default.nix @@ -11,20 +11,20 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-mdinclude"; version = "0.6.2"; pyproject = true; src = fetchPypi { pname = "sphinx_mdinclude"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-RHRi6Cy4vmFASiIEIn+SB2nrkj0vV2COMyXzu4goa0w="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ docutils mistune pygments @@ -36,4 +36,4 @@ buildPythonPackage rec { description = "Sphinx extension for including or writing pages in Markdown format"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-multiversion/default.nix b/python/pkgs/sphinx-multiversion/default.nix index fa0b7858a..200545e23 100644 --- a/python/pkgs/sphinx-multiversion/default.nix +++ b/python/pkgs/sphinx-multiversion/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-multiversion"; version = "0.2.4"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "sphinx-multiversion"; hash = "sha256-XNHKnste7WPLjWzl6cQ4yhOvT6mOfrbzdr5UHdSZC8s="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://sphinx-contrib.github.io/multiversion"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinx-notfound-page/default.nix b/python/pkgs/sphinx-notfound-page/default.nix index 792ede332..60f9ca17d 100644 --- a/python/pkgs/sphinx-notfound-page/default.nix +++ b/python/pkgs/sphinx-notfound-page/default.nix @@ -15,7 +15,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-notfound-page"; version = "1.1.0"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "readthedocs"; repo = "sphinx-notfound-page"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KkdbK8diuQtZQk6FC9xDK/U7mfRBwwUmXp4YYuKueLQ="; }; @@ -44,7 +44,7 @@ buildPythonPackage rec { buildInputs = [ sphinx ]; - propagatedBuildInputs = [ setuptools ]; + dependencies = [ setuptools ]; pythonImportsCheck = [ "notfound" ]; @@ -53,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/readthedocs/sphinx-notfound-page"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-prompt/default.nix b/python/pkgs/sphinx-prompt/default.nix index bc9675fc2..e2de3a31a 100644 --- a/python/pkgs/sphinx-prompt/default.nix +++ b/python/pkgs/sphinx-prompt/default.nix @@ -11,7 +11,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-prompt"; version = "1.10.2"; pyproject = true; @@ -19,12 +19,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sbrunner"; repo = "sphinx-prompt"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ut1g4Clq8mVUYwCe0XMt4GIXUJ4Hy7k8DjWbR7GJ8Bg="; }; postPatch = '' - substituteInPlace pyproject.toml --replace-fail 'version = "0.0.0"' 'version = "${version}"' + substituteInPlace pyproject.toml --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' # create the old sphinx-prompt directory for compatibility # https://github.com/sbrunner/sphinx-prompt/issues/612 cp -r sphinx{_,-}prompt @@ -54,4 +54,4 @@ buildPythonPackage rec { homepage = "https://github.com/sbrunner/sphinx-prompt"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sphinx-pytest/default.nix b/python/pkgs/sphinx-pytest/default.nix index 2972536b8..3098e0166 100644 --- a/python/pkgs/sphinx-pytest/default.nix +++ b/python/pkgs/sphinx-pytest/default.nix @@ -8,7 +8,7 @@ defusedxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-pytest"; version = "0.3.0"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chrisjsewell"; repo = "sphinx-pytest"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-z71IrUr3e2oAPeZMjUBwMwy2SkoAA3oxtK4+iR9vLEc="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ sphinx ]; + dependencies = [ sphinx ]; buildInputs = [ pytest ]; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/chrisjsewell/sphinx-pytest"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-reredirects/default.nix b/python/pkgs/sphinx-reredirects/default.nix index f8d6f8259..fc961c8be 100644 --- a/python/pkgs/sphinx-reredirects/default.nix +++ b/python/pkgs/sphinx-reredirects/default.nix @@ -6,14 +6,14 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-reredirects"; version = "1.1.0"; pyproject = true; src = fetchPypi { pname = "sphinx_reredirects"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-+5sZUzWrFLQ/gnMofQx+62N7psVsZlgcEbRyAvZxiyk="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/sphinx-rtd-dark-mode/default.nix b/python/pkgs/sphinx-rtd-dark-mode/default.nix index 8634b4018..60f3bf3c1 100644 --- a/python/pkgs/sphinx-rtd-dark-mode/default.nix +++ b/python/pkgs/sphinx-rtd-dark-mode/default.nix @@ -7,7 +7,7 @@ sphinx-rtd-theme, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-rtd-dark-mode"; version = "1.3.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MrDogeBro"; repo = "sphinx_rtd_dark_mode"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-N5KG2Wqn9wfGNY3VH4FnBce1aZUbnvVmwD10Loe0Qn4="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/MrDogeBro/sphinx_rtd_dark_mode"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-rtd-theme/default.nix b/python/pkgs/sphinx-rtd-theme/default.nix index 25e2436bb..179dbcb59 100644 --- a/python/pkgs/sphinx-rtd-theme/default.nix +++ b/python/pkgs/sphinx-rtd-theme/default.nix @@ -8,14 +8,14 @@ sphinxcontrib-jquery, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-rtd-theme"; version = "3.1.0"; pyproject = true; src = fetchPypi { pname = "sphinx_rtd_theme"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-tEJ28sJ26Qkjmk9slVqmZ6qv63hZeSOxxgurx223jkw="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/readthedocs/sphinx_rtd_theme"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-sitemap/default.nix b/python/pkgs/sphinx-sitemap/default.nix index de1da75e7..4be9e4fa6 100644 --- a/python/pkgs/sphinx-sitemap/default.nix +++ b/python/pkgs/sphinx-sitemap/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-sitemap"; version = "2.9.0"; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { inherit pname version; pyproject = true; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/jdillard/sphinx-sitemap"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx-tabs/default.nix b/python/pkgs/sphinx-tabs/default.nix index cfa9bcfcf..59d7a4881 100644 --- a/python/pkgs/sphinx-tabs/default.nix +++ b/python/pkgs/sphinx-tabs/default.nix @@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: { sphinxHook ]; - propagatedBuildInputs = [ + dependencies = [ sphinx pygments docutils diff --git a/python/pkgs/sphinx-testing/default.nix b/python/pkgs/sphinx-testing/default.nix index 051c82b46..9e35b2518 100644 --- a/python/pkgs/sphinx-testing/default.nix +++ b/python/pkgs/sphinx-testing/default.nix @@ -7,13 +7,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-testing"; version = "1.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-72YXdbVyLXsA9n/CKRBDF9NWN6T7RDS/LABa/fHaTQk="; }; @@ -25,11 +25,10 @@ buildPythonPackage rec { ]; # Test failures https://github.com/sphinx-doc/sphinx-testing/issues/5 - doCheck = false; meta = { description = "Testing utility classes and functions for Sphinx extensions"; homepage = "https://github.com/sphinx-doc/sphinx-testing"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinx-togglebutton/default.nix b/python/pkgs/sphinx-togglebutton/default.nix index c3c5fab47..4bd84ecd9 100644 --- a/python/pkgs/sphinx-togglebutton/default.nix +++ b/python/pkgs/sphinx-togglebutton/default.nix @@ -8,13 +8,13 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-togglebutton"; version = "0.4.5"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "sphinx_togglebutton"; hash = "sha256-yHDfvTvG4Rm1D/mjemT4mRkCJp6FZyiTHH2Jh36NSz0="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ + dependencies = [ docutils sphinx ]; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-togglebutton"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinx/default.nix b/python/pkgs/sphinx/default.nix index 50e756585..2fe016b04 100644 --- a/python/pkgs/sphinx/default.nix +++ b/python/pkgs/sphinx/default.nix @@ -29,7 +29,7 @@ sphinxcontrib-websupport, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx"; version = "9.1.0"; pyproject = true; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-doc"; repo = "sphinx"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; postFetch = '' # Change ä to æ in file names, since ä can be encoded multiple ways on different # filesystems, leading to different hashes on different platforms. @@ -117,4 +117,4 @@ buildPythonPackage rec { homepage = "https://www.sphinx-doc.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-apidoc/default.nix b/python/pkgs/sphinxcontrib-apidoc/default.nix index 29b37a995..6add82e3a 100644 --- a/python/pkgs/sphinxcontrib-apidoc/default.nix +++ b/python/pkgs/sphinxcontrib-apidoc/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-apidoc"; version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "sphinxcontrib_apidoc"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-MpuYENZpiPSOEnpr0YzI77vRzSC43rRpGjVzivSa2I0="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-contrib/apidoc"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-applehelp/default.nix b/python/pkgs/sphinxcontrib-applehelp/default.nix index 6320b08e9..955e3cd79 100644 --- a/python/pkgs/sphinxcontrib-applehelp/default.nix +++ b/python/pkgs/sphinxcontrib-applehelp/default.nix @@ -5,14 +5,14 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-applehelp"; version = "2.0.0"; pyproject = true; src = fetchPypi { pname = "sphinxcontrib_applehelp"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-LynvMxc1zpWO+kc0hz8ISUGXCJTGCQQIsHnGGy4cBtE="; }; @@ -20,7 +20,6 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx dontCheckRuntimeDeps = true; - doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-doc/sphinxcontrib-applehelp"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-asyncio/default.nix b/python/pkgs/sphinxcontrib-asyncio/default.nix index 2d555ef6f..d85a252d4 100644 --- a/python/pkgs/sphinxcontrib-asyncio/default.nix +++ b/python/pkgs/sphinxcontrib-asyncio/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-asyncio"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-mf0m4P5+34ckSnGpnDFv0Mm1CFbCUZrMqSfr50EAci4="; }; - propagatedBuildInputs = [ sphinx ]; + build-system = [ setuptools ]; + + dependencies = [ sphinx ]; pythonImportsCheck = [ "sphinxcontrib.asyncio" ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/sphinxcontrib-asyncio"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-bibtex/default.nix b/python/pkgs/sphinxcontrib-bibtex/default.nix index 57bb2db05..6b01c332a 100644 --- a/python/pkgs/sphinxcontrib-bibtex/default.nix +++ b/python/pkgs/sphinxcontrib-bibtex/default.nix @@ -11,7 +11,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-bibtex"; version = "2.6.5"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mcmtroffaes"; repo = "sphinxcontrib-bibtex"; - tag = version; + tag = finalAttrs.version; hash = "sha256-sT23DkIfJcb3cFBFdL31RRzlDoJRcCUYIdpUVuYjGuo="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-devhelp/default.nix b/python/pkgs/sphinxcontrib-devhelp/default.nix index a159fe85e..da2ba791b 100644 --- a/python/pkgs/sphinxcontrib-devhelp/default.nix +++ b/python/pkgs/sphinxcontrib-devhelp/default.nix @@ -5,14 +5,14 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-devhelp"; version = "2.0.0"; pyproject = true; src = fetchPypi { pname = "sphinxcontrib_devhelp"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-QR9dltRF0dc7tdUhMzd7QkjsedtceTzn2+WeB0tN0a0="; }; @@ -20,7 +20,6 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx dontCheckRuntimeDeps = true; - doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-doc/sphinxcontrib-devhelp"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-fulltoc/default.nix b/python/pkgs/sphinxcontrib-fulltoc/default.nix index d7520070f..0e54ea43e 100644 --- a/python/pkgs/sphinxcontrib-fulltoc/default.nix +++ b/python/pkgs/sphinxcontrib-fulltoc/default.nix @@ -6,7 +6,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-fulltoc"; version = "1.3"; pyproject = true; @@ -14,11 +14,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "fulltoc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rpzKiZgsuAqhLDEYURv77SDJny3eqfj0VtJ1tqT29IQ="; }; - env.PBR_VERSION = version; + env.PBR_VERSION = finalAttrs.version; build-system = [ pbr ]; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://sphinxcontrib-fulltoc.readthedocs.org/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-htmlhelp/default.nix b/python/pkgs/sphinxcontrib-htmlhelp/default.nix index 04ca0154d..e79b71639 100644 --- a/python/pkgs/sphinxcontrib-htmlhelp/default.nix +++ b/python/pkgs/sphinxcontrib-htmlhelp/default.nix @@ -5,14 +5,14 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-htmlhelp"; version = "2.1.0"; pyproject = true; src = fetchPypi { pname = "sphinxcontrib_htmlhelp"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-yeKRas6KrWTME6DSM+4iMX8rkCW5zzKVJJ+phcxwguk="; }; @@ -20,7 +20,6 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx dontCheckRuntimeDeps = true; - doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-httpdomain/default.nix b/python/pkgs/sphinxcontrib-httpdomain/default.nix index 6aedbb6ab..fa1b3a282 100644 --- a/python/pkgs/sphinxcontrib-httpdomain/default.nix +++ b/python/pkgs/sphinxcontrib-httpdomain/default.nix @@ -2,24 +2,27 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-httpdomain"; version = "1.8.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bC3+bKKC119m3zM4absM5zMcAbR122gJ/50Qe3zf4Es="; }; - propagatedBuildInputs = [ sphinx ]; + build-system = [ setuptools ]; + + dependencies = [ sphinx ]; # Check is disabled due to this issue: # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype - doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; @@ -28,4 +31,4 @@ buildPythonPackage rec { homepage = "https://bitbucket.org/birkenfeld/sphinx-contrib"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-jquery/default.nix b/python/pkgs/sphinxcontrib-jquery/default.nix index 2f208a16d..5438b298b 100644 --- a/python/pkgs/sphinxcontrib-jquery/default.nix +++ b/python/pkgs/sphinxcontrib-jquery/default.nix @@ -7,7 +7,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-jquery"; version = "4.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "jquery"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZQGQcVmhWREFa2KyaOKdTz5W2AS2ur7pFp8qZ2IkxSE="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-contrib/jquery"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-jsmath/default.nix b/python/pkgs/sphinxcontrib-jsmath/default.nix index 591091073..31dc3143e 100644 --- a/python/pkgs/sphinxcontrib-jsmath/default.nix +++ b/python/pkgs/sphinxcontrib-jsmath/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-jsmath"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; sha256 = "a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"; }; + build-system = [ setuptools ]; + # Check is disabled due to circular dependency of sphinx - doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; diff --git a/python/pkgs/sphinxcontrib-katex/default.nix b/python/pkgs/sphinxcontrib-katex/default.nix index 67343e03f..a96f43740 100644 --- a/python/pkgs/sphinxcontrib-katex/default.nix +++ b/python/pkgs/sphinxcontrib-katex/default.nix @@ -6,14 +6,14 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-katex"; version = "0.9.11"; pyproject = true; src = fetchPypi { pname = "sphinxcontrib_katex"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-LTKyENILvuRRpR0ZZF9v719VaLmlTigTr/uW76ZhI4o="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/hagenw/sphinxcontrib-katex"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-log-cabinet/default.nix b/python/pkgs/sphinxcontrib-log-cabinet/default.nix index ca6dc9d63..f15c7d2fa 100644 --- a/python/pkgs/sphinxcontrib-log-cabinet/default.nix +++ b/python/pkgs/sphinxcontrib-log-cabinet/default.nix @@ -2,13 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, sphinx, }: buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-log-cabinet"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "davidism"; @@ -17,7 +19,9 @@ buildPythonPackage (finalAttrs: { sha256 = "03cxspgqsap9q74sqkdx6r6b4gs4hq6dpvx4j58hm50yfhs06wn1"; }; - propagatedBuildInputs = [ sphinx ]; + build-system = [ setuptools ]; + + dependencies = [ sphinx ]; pythonImportsCheck = [ "sphinxcontrib.log_cabinet" ]; diff --git a/python/pkgs/sphinxcontrib-mermaid/default.nix b/python/pkgs/sphinxcontrib-mermaid/default.nix index 67bf8381c..0ff51100b 100644 --- a/python/pkgs/sphinxcontrib-mermaid/default.nix +++ b/python/pkgs/sphinxcontrib-mermaid/default.nix @@ -7,13 +7,13 @@ rst2pdf, lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-mermaid"; version = "2.1.1"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "sphinxcontrib_mermaid"; hash = "sha256-+NfxsvCtabfr3Vy/Uy+07hB4k7U3O8LQ6WNAicCyz+4="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/mgaitan/sphinxcontrib-mermaid"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-moderncmakedomain/default.nix b/python/pkgs/sphinxcontrib-moderncmakedomain/default.nix index 15f50be19..d8ec29853 100644 --- a/python/pkgs/sphinxcontrib-moderncmakedomain/default.nix +++ b/python/pkgs/sphinxcontrib-moderncmakedomain/default.nix @@ -6,13 +6,13 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-moderncmakedomain"; version = "3.29.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "sphinxcontrib_moderncmakedomain"; hash = "sha256-NYfe8kH/JXfQu+8RgQoILp3sG3ij1LSgZiQLXz3BtbI="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/scikit-build/moderncmakedomain"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-openapi/default.nix b/python/pkgs/sphinxcontrib-openapi/default.nix index 1c10801fb..defed76b9 100644 --- a/python/pkgs/sphinxcontrib-openapi/default.nix +++ b/python/pkgs/sphinxcontrib-openapi/default.nix @@ -3,6 +3,8 @@ buildPythonPackage, deepmerge, fetchPypi, + # build-system + setuptools, setuptools-scm, jsonschema, picobox, @@ -11,18 +13,20 @@ sphinxcontrib-httpdomain, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-openapi"; version = "0.8.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-34g4CKW15LQROtaXGFxDo/Qt89znBFOveLpwdpB+miA="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ deepmerge jsonschema picobox @@ -38,4 +42,4 @@ buildPythonPackage rec { description = "OpenAPI (fka Swagger) spec renderer for Sphinx"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-plantuml/default.nix b/python/pkgs/sphinxcontrib-plantuml/default.nix index 06e4aeadf..f61341fa4 100644 --- a/python/pkgs/sphinxcontrib-plantuml/default.nix +++ b/python/pkgs/sphinxcontrib-plantuml/default.nix @@ -7,22 +7,23 @@ plantuml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-plantuml"; version = "0.31"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "sphinxcontrib_plantuml"; hash = "sha256-/XR1L46gcOZBw/ikAvzPodSkBW4JZ7VgM9KnYoLZ+VY="; }; build-system = [ setuptools ]; - dependencies = [ sphinx ]; - - propagatedBuildInputs = [ plantuml ]; + dependencies = [ + plantuml + sphinx + ]; pythonImportsCheck = [ "sphinxcontrib.plantuml" ]; @@ -34,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-contrib/plantuml/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-programoutput/default.nix b/python/pkgs/sphinxcontrib-programoutput/default.nix index 3cfb5bbbc..1a3b2fa1e 100644 --- a/python/pkgs/sphinxcontrib-programoutput/default.nix +++ b/python/pkgs/sphinxcontrib-programoutput/default.nix @@ -6,7 +6,7 @@ sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-programoutput"; version = "0.18"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NextThought"; repo = "sphinxcontrib-programoutput"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WI4R96G4cYYTxTwW4dKAayUNQyhVSrjhdWJyy8nZBUk="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/NextThought/sphinxcontrib-programoutput"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-qthelp/default.nix b/python/pkgs/sphinxcontrib-qthelp/default.nix index ee074c81c..29178652d 100644 --- a/python/pkgs/sphinxcontrib-qthelp/default.nix +++ b/python/pkgs/sphinxcontrib-qthelp/default.nix @@ -5,14 +5,14 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-qthelp"; version = "2.0.0"; pyproject = true; src = fetchPypi { pname = "sphinxcontrib_qthelp"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-T+fQrI/BcQRb5iOro+Ko9hP4aCcx+RU7suQOzha5u6s="; }; @@ -20,7 +20,6 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx dontCheckRuntimeDeps = true; - doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-doc/sphinxcontrib-qthelp"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-serializinghtml/default.nix b/python/pkgs/sphinxcontrib-serializinghtml/default.nix index ba432f3e4..593c87140 100644 --- a/python/pkgs/sphinxcontrib-serializinghtml/default.nix +++ b/python/pkgs/sphinxcontrib-serializinghtml/default.nix @@ -5,14 +5,14 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-serializinghtml"; version = "2.0.0"; pyproject = true; src = fetchPypi { pname = "sphinxcontrib_serializinghtml"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-6dkSgn+HLAKQF6U/DvIYCzJ8P3/SPIcin3qOi3ADHU0="; }; @@ -20,7 +20,6 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx dontCheckRuntimeDeps = true; - doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; @@ -29,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-spelling/default.nix b/python/pkgs/sphinxcontrib-spelling/default.nix index 46c5ca9dd..d166069ea 100644 --- a/python/pkgs/sphinxcontrib-spelling/default.nix +++ b/python/pkgs/sphinxcontrib-spelling/default.nix @@ -9,7 +9,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-spelling"; version = "8.0.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "spelling"; - tag = version; + tag = finalAttrs.version; hash = "sha256-f9n3hp+d3UvfVt2KmhxYm80XsEnIx3EVkdrQJxWDxks="; }; @@ -27,7 +27,7 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ + dependencies = [ sphinx pyenchant ]; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-contrib/spelling"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-websupport/default.nix b/python/pkgs/sphinxcontrib-websupport/default.nix index 751c3b69a..ad0c8b5e6 100644 --- a/python/pkgs/sphinxcontrib-websupport/default.nix +++ b/python/pkgs/sphinxcontrib-websupport/default.nix @@ -7,20 +7,20 @@ sphinxcontrib-serializinghtml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-websupport"; version = "2.0.0"; pyproject = true; src = fetchPypi { pname = "sphinxcontrib_websupport"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-C3Nn07rGRUsfl+QqqMTU1KG3VtUl/HJuu+VXHgM+ec0="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ jinja2 sphinxcontrib-serializinghtml ]; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "http://sphinx-doc.org/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sphinxcontrib-youtube/default.nix b/python/pkgs/sphinxcontrib-youtube/default.nix index 717494c94..e9097eee2 100644 --- a/python/pkgs/sphinxcontrib-youtube/default.nix +++ b/python/pkgs/sphinxcontrib-youtube/default.nix @@ -7,7 +7,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-youtube"; version = "1.5.0"; pyproject = true; @@ -17,11 +17,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "youtube"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vzF1SC4fUIeR0OYesOq60eWjlX+N+YYA/h7mNfxWEtk="; }; - propagatedBuildInputs = [ + dependencies = [ sphinx requests ]; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-contrib/youtube"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sphinxemoji/default.nix b/python/pkgs/sphinxemoji/default.nix index df9f537c7..9dc58f1fc 100644 --- a/python/pkgs/sphinxemoji/default.nix +++ b/python/pkgs/sphinxemoji/default.nix @@ -7,7 +7,7 @@ sphinxHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxemoji"; version = "0.3.2"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "emojicodes"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2/2fOIxjF4vs90uqZyzfidrh+P/MHa+LTf1RsQYmgZ0="; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { sphinxHook ]; - propagatedBuildInputs = [ + dependencies = [ sphinx # sphinxemoji.py imports pkg_resources directly setuptools @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-contrib/emojicodes"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinxext-opengraph/default.nix b/python/pkgs/sphinxext-opengraph/default.nix index 96b9dbb38..f31938db0 100644 --- a/python/pkgs/sphinxext-opengraph/default.nix +++ b/python/pkgs/sphinxext-opengraph/default.nix @@ -7,7 +7,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxext-opengraph"; version = "0.13.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rdV6XWHfNj+TFgIfqFPWYxn6bGG5w/frUHl9+qMALi4="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { social_cards_generation = [ matplotlib ]; }; - propagatedBuildInputs = [ sphinx ]; + dependencies = [ sphinx ]; pythonImportsCheck = [ "sphinxext.opengraph" ]; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/wpilibsuite/sphinxext-opengraph"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sphinxext-rediraffe/default.nix b/python/pkgs/sphinxext-rediraffe/default.nix index 864bbccf4..d5d88fb4e 100644 --- a/python/pkgs/sphinxext-rediraffe/default.nix +++ b/python/pkgs/sphinxext-rediraffe/default.nix @@ -6,7 +6,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinxext-rediraffe"; version = "0.3.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-rediraffe"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OW+MNQbPfJa8+jcpWZxTKD+EAv1gyo5tmcYAGba4u3c="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/wpilibsuite/sphinxext-rediraffe"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/spidev/default.nix b/python/pkgs/spidev/default.nix index 5b8d47faa..fb13d761d 100644 --- a/python/pkgs/spidev/default.nix +++ b/python/pkgs/spidev/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spidev"; version = "3.8"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "doceme"; repo = "py-spidev"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ysOLZWsMiHjPxQ7fMWsywp44vkNGFGH8n6X7zk7XQck="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/spinners/default.nix b/python/pkgs/spinners/default.nix index e749f9efd..635b411bc 100644 --- a/python/pkgs/spinners/default.nix +++ b/python/pkgs/spinners/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spinners"; version = "0.0.24"; pyproject = true; src = fetchPypi { pname = "spinners"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-HrautHgdcqtC7YoB3PIPMAK/UHQNcVTRL7jJdpv54n8="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/manrajgrover/py-spinners"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/splinter/default.nix b/python/pkgs/splinter/default.nix index 6b00f99a9..ba59010ef 100644 --- a/python/pkgs/splinter/default.nix +++ b/python/pkgs/splinter/default.nix @@ -12,7 +12,7 @@ zope-testbrowser, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "splinter"; version = "0.21.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cobrateam"; repo = "splinter"; - tag = version; + tag = finalAttrs.version; hash = "sha256-PGGql8yI1YosoUBAyDoI/8k7s4sVYnXEV7eow3GHH88="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://github.com/cobrateam/splinter"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/spotipy/default.nix b/python/pkgs/spotipy/default.nix index 31b874f62..b845489a9 100644 --- a/python/pkgs/spotipy/default.nix +++ b/python/pkgs/spotipy/default.nix @@ -12,13 +12,13 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spotipy"; version = "2.26.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-32ol2CCQcu+ozqFlYI7mRIhOOAT4dittjgbKGlx/imM="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://spotipy.readthedocs.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/spur/default.nix b/python/pkgs/spur/default.nix index b0183036b..ee6455aa5 100644 --- a/python/pkgs/spur/default.nix +++ b/python/pkgs/spur/default.nix @@ -2,25 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, paramiko, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spur"; version = "0.3.23"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mwilliamson"; repo = "spur.py"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LTkZ1p2P9fsD+gZEQZaCS68Q6nGc4qFGMNtH75gQmXQ="; }; - propagatedBuildInputs = [ paramiko ]; + build-system = [ setuptools ]; + + dependencies = [ paramiko ]; # Tests require a running SSH server - doCheck = false; pythonImportsCheck = [ "spur" ]; @@ -29,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/mwilliamson/spur.py"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/sqlalchemy-bigquery/default.nix b/python/pkgs/sqlalchemy-bigquery/default.nix index 68ad3c719..4ef62ef45 100644 --- a/python/pkgs/sqlalchemy-bigquery/default.nix +++ b/python/pkgs/sqlalchemy-bigquery/default.nix @@ -12,14 +12,14 @@ pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sqlalchemy-bigquery"; version = "1.17.2"; pyproject = true; src = fetchPypi { pname = "sqlalchemy_bigquery"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-MveJPBZUbVzF3JOft8909RUFdmoWQi8h3S5+eOqOyEk="; }; @@ -49,11 +49,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "sqlalchemy_bigquery" ]; # Tests require a BigQuery project - doCheck = false; meta = { description = "SQLAlchemy dialect for BigQuery"; homepage = "https://github.com/googleapis/python-bigquery-sqlalchemy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sqlalchemy-jsonfield/default.nix b/python/pkgs/sqlalchemy-jsonfield/default.nix index 23a994e61..b49b6b523 100644 --- a/python/pkgs/sqlalchemy-jsonfield/default.nix +++ b/python/pkgs/sqlalchemy-jsonfield/default.nix @@ -10,7 +10,7 @@ psycopg2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sqlalchemy-jsonfield"; version = "1.0.3"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "penguinolog"; repo = "sqlalchemy_jsonfield"; - tag = version; + tag = finalAttrs.version; hash = "sha256-htzWMItAQ1MdOcWHe9le5UofXi5plNpBqOAkgbPxCYI="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/penguinolog/sqlalchemy_jsonfield"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/sqlalchemy-utils/default.nix b/python/pkgs/sqlalchemy-utils/default.nix index 00f3891a9..186ade7fe 100644 --- a/python/pkgs/sqlalchemy-utils/default.nix +++ b/python/pkgs/sqlalchemy-utils/default.nix @@ -10,14 +10,14 @@ sqlalchemy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sqlalchemy-utils"; version = "0.41.2"; pyproject = true; src = fetchPypi { pname = "SQLAlchemy-Utils"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-vFmcjDszGeU85sXDxHESC9Ml0AcftvOKEOkk49B7mZA="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/kvesteri/sqlalchemy-utils"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sqlglot/default.nix b/python/pkgs/sqlglot/default.nix index c3d659dbc..6a87c78ba 100644 --- a/python/pkgs/sqlglot/default.nix +++ b/python/pkgs/sqlglot/default.nix @@ -7,7 +7,7 @@ python-dateutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sqlglot"; version = "28.9.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "sqlglot"; owner = "tobymao"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2AmHKGAoDF8w9k8VN9d25Js3UiSh8YNqdGRHN7VqRpw="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/tobymao/sqlglot"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sqlite-anyio/default.nix b/python/pkgs/sqlite-anyio/default.nix index 660fe6171..2aefd735f 100644 --- a/python/pkgs/sqlite-anyio/default.nix +++ b/python/pkgs/sqlite-anyio/default.nix @@ -6,7 +6,7 @@ anyio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sqlite-anyio"; version = "0.2.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "davidbrochart"; repo = "sqlite-anyio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1riZiLBccg7Vqq+a8xT5Lr4vxjkeMbf1wqXnTTgY8iY="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/davidbrochart/sqlite-anyio"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sqlite-fts4/default.nix b/python/pkgs/sqlite-fts4/default.nix index 7d306b00d..d5269026a 100644 --- a/python/pkgs/sqlite-fts4/default.nix +++ b/python/pkgs/sqlite-fts4/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sqlite-fts4"; version = "1.0.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = "sqlite-fts4"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Ibiows3DSnzjIUv7U9tYNVnDaecBBxjXzDqxbIlNhhU="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/simonw/sqlite-fts4"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/sqlite-migrate/default.nix b/python/pkgs/sqlite-migrate/default.nix index 91d5530d7..f9d6069d6 100644 --- a/python/pkgs/sqlite-migrate/default.nix +++ b/python/pkgs/sqlite-migrate/default.nix @@ -11,7 +11,6 @@ buildPythonPackage (finalAttrs: { pname = "sqlite-migrate"; version = "0.2"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "simonw"; @@ -25,7 +24,7 @@ buildPythonPackage (finalAttrs: { uv-build ]; - propagatedBuildInputs = [ sqlite-utils ]; + dependencies = [ sqlite-utils ]; pythonImportsCheck = [ "sqlite_migrate" ]; diff --git a/python/pkgs/sqlite-utils/default.nix b/python/pkgs/sqlite-utils/default.nix index 47bec0a4e..9becf1622 100644 --- a/python/pkgs/sqlite-utils/default.nix +++ b/python/pkgs/sqlite-utils/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "sqlite-utils"; version = "4.2.1"; pyproject = true; - __structuredAttrs = true; build-system = [ setuptools ]; diff --git a/python/pkgs/sqlite-vec/default.nix b/python/pkgs/sqlite-vec/default.nix index f4431c875..5c0d5b621 100644 --- a/python/pkgs/sqlite-vec/default.nix +++ b/python/pkgs/sqlite-vec/default.nix @@ -15,13 +15,13 @@ let sqlite-vec-c = pkgs.sqlite-vec; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { inherit (sqlite-vec-c) pname version src; pyproject = true; # The actual source root is bindings/python but the patches # apply to the bindings directory. - sourceRoot = "${src.name}/bindings"; + sourceRoot = "${finalAttrs.src.name}/bindings"; patches = [ (fetchpatch { @@ -46,7 +46,7 @@ buildPythonPackage rec { substituteInPlace sqlite_vec/__init__.py \ --replace-fail "@libpath@" "${lib.getLib sqlite-vec-c}/lib/" substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ @@ -69,4 +69,4 @@ buildPythonPackage rec { meta = sqlite-vec-c.meta // { description = "Python bindings for sqlite-vec"; }; -} +}) diff --git a/python/pkgs/sqlitedict/default.nix b/python/pkgs/sqlitedict/default.nix index 05686649d..d8f0d9e07 100644 --- a/python/pkgs/sqlitedict/default.nix +++ b/python/pkgs/sqlitedict/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sqlitedict"; version = "2.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "sqlitedict"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GfvvkQ6a75UBPn70IFOvjvL1MedSc4siiIjA3IsQnic="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/RaRe-Technologies/sqlitedict"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/sqlobject/default.nix b/python/pkgs/sqlobject/default.nix index 7243993e9..1940b2699 100644 --- a/python/pkgs/sqlobject/default.nix +++ b/python/pkgs/sqlobject/default.nix @@ -7,7 +7,7 @@ pydispatcher, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sqlobject"; version = "3.13.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sqlobject"; repo = "sqlobject"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Qbb48z4DrD/M8e26+5NjPcA0b3gxHeAxj1X/jSrTwx0="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://www.sqlobject.org/"; license = lib.licenses.lgpl21Only; }; -} +}) diff --git a/python/pkgs/sqlparams/default.nix b/python/pkgs/sqlparams/default.nix index e39d2ef38..cd697254a 100644 --- a/python/pkgs/sqlparams/default.nix +++ b/python/pkgs/sqlparams/default.nix @@ -9,7 +9,6 @@ buildPythonPackage (finalAttrs: { pname = "sqlparams"; version = "6.2.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "cpburnz"; diff --git a/python/pkgs/sqlparse/default.nix b/python/pkgs/sqlparse/default.nix index 34115b282..0e1951b5f 100644 --- a/python/pkgs/sqlparse/default.nix +++ b/python/pkgs/sqlparse/default.nix @@ -6,13 +6,13 @@ installShellFiles, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sqlparse"; version = "0.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ETw1x1Nlq5zJxyMdaMZCj7EcCF/I6esa1lm33b9s0rk="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; mainProgram = "sqlformat"; }; -} +}) diff --git a/python/pkgs/sqltrie/default.nix b/python/pkgs/sqltrie/default.nix index c0d12f2bb..6a3fb8725 100644 --- a/python/pkgs/sqltrie/default.nix +++ b/python/pkgs/sqltrie/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sqltrie"; version = "0.11.3"; pyproject = true; @@ -16,20 +16,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = "sqltrie"; - tag = version; + tag = finalAttrs.version; hash = "sha256-sBu82SDOBqlQLONYgQ4eCw6MVFsLIs5/LfevP4cUDTo="; }; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ attrs orjson pygtrie ]; # nox is not available at the moment - doCheck = false; pythonImportsCheck = [ "sqltrie" ]; @@ -38,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/iterative/sqltrie"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/sre-yield/default.nix b/python/pkgs/sre-yield/default.nix index e8a269e2a..0dc82e93d 100644 --- a/python/pkgs/sre-yield/default.nix +++ b/python/pkgs/sre-yield/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sre_yield"; version = "1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6U8aKjy6//4dzRXB1U5AGhUX4FKqZMfTFk+I3HYde4o="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/sre-yield/sre-yield"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/srt/default.nix b/python/pkgs/srt/default.nix index dd75d03c7..9a88fcc53 100644 --- a/python/pkgs/srt/default.nix +++ b/python/pkgs/srt/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "srt"; version = "3.5.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SIQxUEOk8HQP0fh47WyqN2rAbXDhNfMGptxEYy7tDMA="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/cdown/srt"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sse-starlette/default.nix b/python/pkgs/sse-starlette/default.nix index 1898bd90a..291989e89 100644 --- a/python/pkgs/sse-starlette/default.nix +++ b/python/pkgs/sse-starlette/default.nix @@ -11,7 +11,7 @@ uvicorn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sse-starlette"; version = "3.4.11"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sysid"; repo = "sse-starlette"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fdI/SxJgUDEyB1UJd9PLS6/TxvXZLlTAQFnr1UIBQRU="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/sysid/sse-starlette"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sseclient-py/default.nix b/python/pkgs/sseclient-py/default.nix index ec2c837b0..101b34bdb 100644 --- a/python/pkgs/sseclient-py/default.nix +++ b/python/pkgs/sseclient-py/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sseclient-py"; version = "1.9.0"; format = "wheel"; src = fetchurl { - url = "https://files.pythonhosted.org/packages/4d/2e/59920f7d66b7f9932a3d83dd0ec53fab001be1e058bf582606fe414a5198/sseclient_py-${version}-py3-none-any.whl"; + url = "https://files.pythonhosted.org/packages/4d/2e/59920f7d66b7f9932a3d83dd0ec53fab001be1e058bf582606fe414a5198/sseclient_py-${finalAttrs.version}-py3-none-any.whl"; hash = "sha256-NABisVh/wogIkoEeKrWxdtmO8+7pizZy/zo7oejtD28="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/mpetazzoni/sseclient"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/sseclient/default.nix b/python/pkgs/sseclient/default.nix index cbe0f3833..aee9e358f 100644 --- a/python/pkgs/sseclient/default.nix +++ b/python/pkgs/sseclient/default.nix @@ -7,13 +7,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sseclient"; version = "0.0.27"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-sv5TTcszsdP6rRPWDFp8cY4o+FmH8qA07PXsJ5kYwRw="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/btubbs/sseclient"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/sshfs/default.nix b/python/pkgs/sshfs/default.nix index cd98a9bc3..52877451e 100644 --- a/python/pkgs/sshfs/default.nix +++ b/python/pkgs/sshfs/default.nix @@ -13,7 +13,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sshfs"; version = "2026.8.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fsspec"; repo = "sshfs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Gw9fAVAxQxVge7APxrdGXpmhYZlyqmcB2QU9+2ze9dw="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://github.com/fsspec/sshfs/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/sshpubkeys/default.nix b/python/pkgs/sshpubkeys/default.nix index e0c4a005c..2e490639b 100644 --- a/python/pkgs/sshpubkeys/default.nix +++ b/python/pkgs/sshpubkeys/default.nix @@ -6,7 +6,7 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "3.3.1"; pname = "sshpubkeys"; pyproject = true; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/ojarva/python-sshpubkeys"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/sshtunnel/default.nix b/python/pkgs/sshtunnel/default.nix index 1ab11ce84..276298bd1 100644 --- a/python/pkgs/sshtunnel/default.nix +++ b/python/pkgs/sshtunnel/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sshtunnel"; version = "0.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-58sOp3Tbgb+RhE2yLecqQKro97D5u5ug9mbUdO9r+fw="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/pahaz/sshtunnel"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/stack-data/default.nix b/python/pkgs/stack-data/default.nix index fbd7a875b..9a333bbed 100644 --- a/python/pkgs/stack-data/default.nix +++ b/python/pkgs/stack-data/default.nix @@ -10,7 +10,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stack-data"; version = "0.6.3"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alexmojaki"; repo = "stack_data"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dmBhfCg60KX3gWp3k1CGRxW14z3BLlair0PjLW9HFYo="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "stack-data"; }; -} +}) diff --git a/python/pkgs/stamina/default.nix b/python/pkgs/stamina/default.nix index d6a34c756..6c23d4d7a 100644 --- a/python/pkgs/stamina/default.nix +++ b/python/pkgs/stamina/default.nix @@ -11,7 +11,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stamina"; version = "26.1.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hynek"; repo = "stamina"; - tag = version; + tag = finalAttrs.version; hash = "sha256-3cCaYAoWPriynITcMnWn1WndXP2gLro/0ba/87hrnIk="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/hynek/stamina"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/standard-aifc/default.nix b/python/pkgs/standard-aifc/default.nix index e87fbb34e..49fe0652c 100644 --- a/python/pkgs/standard-aifc/default.nix +++ b/python/pkgs/standard-aifc/default.nix @@ -7,7 +7,7 @@ standard-chunk, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "standard-aifc"; version = "3.13.0"; pyproject = true; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "youknowone"; repo = "python-deadlib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg="; }; - sourceRoot = "${src.name}/aifc"; + sourceRoot = "${finalAttrs.src.name}/aifc"; build-system = [ setuptools @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/youknowone/python-deadlib/tree/main/aifc"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/standard-chunk/default.nix b/python/pkgs/standard-chunk/default.nix index 8209e91a4..96f89bcb3 100644 --- a/python/pkgs/standard-chunk/default.nix +++ b/python/pkgs/standard-chunk/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "standard-chunk"; version = "3.13.0"; pyproject = true; @@ -13,19 +13,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "youknowone"; repo = "python-deadlib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg="; }; - sourceRoot = "${src.name}/chunk"; + sourceRoot = "${finalAttrs.src.name}/chunk"; build-system = [ setuptools ]; - doCheck = false; # no tests - meta = { description = "Python dead batteries. See PEP 594"; homepage = "https://github.com/youknowone/python-deadlib"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/standard-imghdr/default.nix b/python/pkgs/standard-imghdr/default.nix index 96b9f6537..f3b54e31c 100644 --- a/python/pkgs/standard-imghdr/default.nix +++ b/python/pkgs/standard-imghdr/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "standard-imghdr"; version = "3.13.0"; pyproject = true; @@ -13,11 +13,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "youknowone"; repo = "python-deadlib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg="; }; - sourceRoot = "${src.name}/imghdr"; + sourceRoot = "${finalAttrs.src.name}/imghdr"; build-system = [ setuptools ]; pythonImportsCheck = [ "imghdr" ]; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/youknowone/python-deadlib"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/standard-nntplib/default.nix b/python/pkgs/standard-nntplib/default.nix index e3d0fb395..d00ef572f 100644 --- a/python/pkgs/standard-nntplib/default.nix +++ b/python/pkgs/standard-nntplib/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "standard-nntplib"; version = "3.13.0"; pyproject = true; @@ -16,13 +16,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "youknowone"; repo = "python-deadlib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-J8c55f527QGcK8p/QKJBZeZV0y9DU0iM1RUFVkWh2Hc="; sparseCheckout = [ "nntplib" ]; }; build-system = [ setuptools ]; - sourceRoot = "${src.name}/nntplib"; + sourceRoot = "${finalAttrs.src.name}/nntplib"; pythonImportsCheck = [ "nntplib" ]; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/youknowone/python-deadlib"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/standard-sunau/default.nix b/python/pkgs/standard-sunau/default.nix index a80d5c202..6da006175 100644 --- a/python/pkgs/standard-sunau/default.nix +++ b/python/pkgs/standard-sunau/default.nix @@ -6,7 +6,7 @@ audioop-lts, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "standard-sunau"; version = "3.13.0"; pyproject = true; @@ -14,11 +14,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "youknowone"; repo = "python-deadlib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg="; }; - sourceRoot = "${src.name}/sunau"; + sourceRoot = "${finalAttrs.src.name}/sunau"; build-system = [ setuptools ]; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/youknowone/python-deadlib/tree/main/sunau"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/stanio/default.nix b/python/pkgs/stanio/default.nix index 0b9971556..33d336552 100644 --- a/python/pkgs/stanio/default.nix +++ b/python/pkgs/stanio/default.nix @@ -6,19 +6,19 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stanio"; version = "0.5.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NI1S+UfexDHhGPS2AcTFKWkpuGQB1NTdWqk3Ow1K5Kw="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; pythonImportsCheck = [ "stanio" ]; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/WardBrian/stanio"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/starlette/default.nix b/python/pkgs/starlette/default.nix index e2b03d5d9..809236e4c 100644 --- a/python/pkgs/starlette/default.nix +++ b/python/pkgs/starlette/default.nix @@ -17,7 +17,7 @@ httpx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "starlette"; version = "1.6.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; repo = "starlette"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Cp6wkRxbDdC+Yf3z4TvRF5xrchJ+PAo36qHbBg+FcXw="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { description = "Little ASGI framework that shines"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/statistics/default.nix b/python/pkgs/statistics/default.nix index 5161f8a5b..b649aa4dd 100644 --- a/python/pkgs/statistics/default.nix +++ b/python/pkgs/statistics/default.nix @@ -10,13 +10,13 @@ docutils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "statistics"; version = "3.4.0b3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0jSF2WZoBIALeUOXdsFvWxi5bt9WGC7otfLLXHra0MU="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/digitalemagine/py-statistics"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/statmake/default.nix b/python/pkgs/statmake/default.nix index c2919c2c0..c1055fa49 100644 --- a/python/pkgs/statmake/default.nix +++ b/python/pkgs/statmake/default.nix @@ -9,7 +9,7 @@ hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "statmake"; version = "2.0.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "daltonmaag"; repo = "statmake"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PlMbJuJUkUjKXhkcCfLO5G3R1z9Zwf9qKYj9olOANno="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/daltonmaag/statmake"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/statsd/default.nix b/python/pkgs/statsd/default.nix index 044b52bb8..7749b8f2d 100644 --- a/python/pkgs/statsd/default.nix +++ b/python/pkgs/statsd/default.nix @@ -6,7 +6,7 @@ mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "statsd"; version = "4.0.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jsocol"; repo = "pystatsd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-g830TjFERKUguFKlZeaOhCTlaUs0wcDg4bMdRDr3smw="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { license = lib.licenses.mit; homepage = "https://github.com/jsocol/pystatsd"; }; -} +}) diff --git a/python/pkgs/statsmodels/default.nix b/python/pkgs/statsmodels/default.nix index f066bf539..2c4e5a556 100644 --- a/python/pkgs/statsmodels/default.nix +++ b/python/pkgs/statsmodels/default.nix @@ -58,7 +58,6 @@ buildPythonPackage (finalAttrs: { ]; # Huge test suites with several test failures - doCheck = false; pythonImportsCheck = [ "statsmodels" ]; diff --git a/python/pkgs/std-uritemplate/default.nix b/python/pkgs/std-uritemplate/default.nix index c8762f859..e32738fcb 100644 --- a/python/pkgs/std-uritemplate/default.nix +++ b/python/pkgs/std-uritemplate/default.nix @@ -19,7 +19,6 @@ buildPythonPackage (finalAttrs: { build-system = [ poetry-core ]; # Module doesn't have unittest, only functional tests - doCheck = false; pythonImportsCheck = [ "stduritemplate" ]; diff --git a/python/pkgs/stdlib-list/default.nix b/python/pkgs/stdlib-list/default.nix index 6960c0d8d..b5aa47ba7 100644 --- a/python/pkgs/stdlib-list/default.nix +++ b/python/pkgs/stdlib-list/default.nix @@ -5,14 +5,14 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stdlib-list"; version = "0.12.0"; pyproject = true; src = fetchPypi { pname = "stdlib_list"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-UXgk8n7onlkdiufB3Z/zT2curlDuiG6jG7iBbXdTVnU="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/jackmaney/python-stdlib-list"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/stdlibs/default.nix b/python/pkgs/stdlibs/default.nix index 6c76ebe73..83f04bdc2 100644 --- a/python/pkgs/stdlibs/default.nix +++ b/python/pkgs/stdlibs/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stdlibs"; version = "2026.2.26"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "omnilib"; repo = "stdlibs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5Brb214tglEEjsJXOvEhlaJgSYCUpOGPbHkmI9AWPoM="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/omnilib/stdlibs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/steam/default.nix b/python/pkgs/steam/default.nix index 6b39fe1f4..e6d65646f 100644 --- a/python/pkgs/steam/default.nix +++ b/python/pkgs/steam/default.nix @@ -13,7 +13,7 @@ cachetools, setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "steam"; version = "1.4.4"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ValvePython"; repo = "steam"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OY04GsX3KMPvpsQl8sUurzFyJu+JKpES8B0iD6Z5uyw="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/stem/default.nix b/python/pkgs/stem/default.nix index 6dfc713dd..7ecbd37f9 100644 --- a/python/pkgs/stem/default.nix +++ b/python/pkgs/stem/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stem"; version = "1.8.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-g/sZ/9TJ+CIHwAYFFIA4n4CvIhp+R4MACu3sTjhOtYI="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://stem.torproject.org/"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/stevedore/default.nix b/python/pkgs/stevedore/default.nix index ceec02ac6..770a269a3 100644 --- a/python/pkgs/stevedore/default.nix +++ b/python/pkgs/stevedore/default.nix @@ -8,13 +8,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stevedore"; version = "5.9.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6XomZ5I+/akm6HE/3mpzYW32ghCjy8bwK0iWe2dv2L8="; }; @@ -23,8 +23,6 @@ buildPythonPackage rec { setuptools ]; - doCheck = false; - pythonImportsCheck = [ "stevedore" ]; meta = { @@ -32,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/stevedore"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/stix2-patterns/default.nix b/python/pkgs/stix2-patterns/default.nix index ee88ae5a1..516d48348 100644 --- a/python/pkgs/stix2-patterns/default.nix +++ b/python/pkgs/stix2-patterns/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stix2-patterns"; version = "2.1.2"; pyproject = true; src = fetchPypi { pname = "stix2_patterns"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-sgWdNsH9h3QPP6zCKkFHzeHisKy41eTAj78EsdxVMYU="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/oasis-open/cti-pattern-validator"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/stone/default.nix b/python/pkgs/stone/default.nix index 4f7cdfeac..4667eebb1 100644 --- a/python/pkgs/stone/default.nix +++ b/python/pkgs/stone/default.nix @@ -9,13 +9,13 @@ ply, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stone"; version = "3.5.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-T09DmeanZGkXcW19wG+BTTL5TzD7UdYbXHYOj207pTs="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { description = "Official API Spec Language for Dropbox API V2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/strenum/default.nix b/python/pkgs/strenum/default.nix index ea8d34919..9c0ce91d9 100644 --- a/python/pkgs/strenum/default.nix +++ b/python/pkgs/strenum/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "strenum"; version = "0.4.15"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "irgeek"; repo = "StrEnum"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LrDLIWiV/zIbl7CwKh7DAy4LoLyY7+hfUu8nqduclnA="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/irgeek/StrEnum"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/strict-rfc3339/default.nix b/python/pkgs/strict-rfc3339/default.nix index 29a2a6013..83310f365 100644 --- a/python/pkgs/strict-rfc3339/default.nix +++ b/python/pkgs/strict-rfc3339/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "strict-rfc3339"; version = "0.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XK0Xvt/Dr1ezmdsP7TJ3Hxj8VLvZF+hVRgiGB6xeEnc="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/danielrichman/strict-rfc3339"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/strictyaml/default.nix b/python/pkgs/strictyaml/default.nix index a677d39a8..20b64dc2e 100644 --- a/python/pkgs/strictyaml/default.nix +++ b/python/pkgs/strictyaml/default.nix @@ -7,13 +7,13 @@ python-dateutil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "strictyaml"; version = "1.7.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IvhUpfyrQrXduoAwoOS+UcqJrwJnlhyNbPqGOVWGxAc="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://hitchdev.com/strictyaml/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/stringcase/default.nix b/python/pkgs/stringcase/default.nix index d1259fac8..de5705ec7 100644 --- a/python/pkgs/stringcase/default.nix +++ b/python/pkgs/stringcase/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stringcase"; version = "1.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SKBpgGYZCO/o2dNOqytsE676IWOzztJpcpAuO9/YcAg="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "stringcase" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/okunishinishi/python-stringcase"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/stringzilla/default.nix b/python/pkgs/stringzilla/default.nix index a71d4d11d..3a06c8c5d 100644 --- a/python/pkgs/stringzilla/default.nix +++ b/python/pkgs/stringzilla/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stringzilla"; version = "5.1.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ashvardanian"; repo = "stringzilla"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RENsISsEfDJaoQK9v9i6vM3OId7FREw5hixpEUETfEw="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/ashvardanian/stringzilla"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/stripe/default.nix b/python/pkgs/stripe/default.nix index cccabb79c..5bf8e558d 100644 --- a/python/pkgs/stripe/default.nix +++ b/python/pkgs/stripe/default.nix @@ -7,13 +7,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stripe"; version = "15.6.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nzmGqpYEGQQaupx2GRdGvfLDQslYkqz79u21AKsAbTE="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/stripe/stripe-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/striprtf/default.nix b/python/pkgs/striprtf/default.nix index 58b5c28a0..04aaa6abf 100644 --- a/python/pkgs/striprtf/default.nix +++ b/python/pkgs/striprtf/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "striprtf"; version = "0.0.32"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fzdaN12ZonAIQhcxaMkMm1RcskQkH/xdho7Z9rr5FV8="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/joshy/striprtf"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/structlog/default.nix b/python/pkgs/structlog/default.nix index 9f8aa5f62..75382a02c 100644 --- a/python/pkgs/structlog/default.nix +++ b/python/pkgs/structlog/default.nix @@ -9,7 +9,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "structlog"; version = "26.1.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hynek"; repo = "structlog"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Q31eqeRYAbwn6Cj3hkXfy3udeBHHglEk5/qTjKbBbL8="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/hynek/structlog"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/submitit/default.nix b/python/pkgs/submitit/default.nix index 4dc88313f..78e0c33fe 100644 --- a/python/pkgs/submitit/default.nix +++ b/python/pkgs/submitit/default.nix @@ -19,7 +19,6 @@ buildPythonPackage (finalAttrs: { pname = "submitit"; version = "1.5.4"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "facebookincubator"; diff --git a/python/pkgs/subprocess-tee/default.nix b/python/pkgs/subprocess-tee/default.nix index 32de3ddf0..29a0ef783 100644 --- a/python/pkgs/subprocess-tee/default.nix +++ b/python/pkgs/subprocess-tee/default.nix @@ -7,7 +7,7 @@ enrich, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "subprocess-tee"; version = "0.4.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pycontribs"; repo = "subprocess-tee"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rfI4UZdENfSQ9EbQeldv6DDGIQe5yMjboGTCOwed1AU="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { description = "Subprocess.run drop-in replacement that supports a tee mode"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/succulent/default.nix b/python/pkgs/succulent/default.nix index c92fbcd5b..5e82aea0f 100644 --- a/python/pkgs/succulent/default.nix +++ b/python/pkgs/succulent/default.nix @@ -10,7 +10,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "succulent"; version = "0.4.6"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "firefly-cpp"; repo = "succulent"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rZNBe6l6rFaaiwhFB4nqS8D6N0uSPdqNgufsSyLNf2g="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/firefly-cpp/succulent"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/suds/default.nix b/python/pkgs/suds/default.nix index e820be07b..2ea0ea0b7 100644 --- a/python/pkgs/suds/default.nix +++ b/python/pkgs/suds/default.nix @@ -6,7 +6,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "suds"; version = "1.2.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "suds-community"; repo = "suds"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YdL+zDelRspQ6VMqa45vK1DDS3HjFvKE1P02USVBrEo="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/suds-community/suds"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/super-collections/default.nix b/python/pkgs/super-collections/default.nix index 9038a5777..2afb0edb4 100644 --- a/python/pkgs/super-collections/default.nix +++ b/python/pkgs/super-collections/default.nix @@ -8,7 +8,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "super-collections"; version = "0.6.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fralau"; repo = "super-collections"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7QW5cL+TZlPX8ZMNNH+xZSGNIGr8Cy2jP1oSWy5tKaY="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/fralau/super-collections"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/supervisor/default.nix b/python/pkgs/supervisor/default.nix index dd178605b..22129bdae 100644 --- a/python/pkgs/supervisor/default.nix +++ b/python/pkgs/supervisor/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "supervisor"; version = "4.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SivxSa30KZfhu0S3DEO2EydeyYUsPtrMqGqRZrJ+lF4="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "supervisor" ]; meta = { @@ -27,4 +25,4 @@ buildPythonPackage rec { mainProgram = "supervisord"; license = lib.licenses.free; }; -} +}) diff --git a/python/pkgs/sure/default.nix b/python/pkgs/sure/default.nix index 6bf5f05fa..1e38d5d49 100644 --- a/python/pkgs/sure/default.nix +++ b/python/pkgs/sure/default.nix @@ -7,13 +7,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sure"; version = "2.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yPxvq8Dn9phO6ruUJUDkVkblvvC7mf5Z4C2mNOTUuco="; }; @@ -24,8 +24,6 @@ buildPythonPackage rec { six ]; - doCheck = false; - pythonImportsCheck = [ "sure" ]; meta = { @@ -33,4 +31,4 @@ buildPythonPackage rec { description = "Utility belt for automated testing"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/survey/default.nix b/python/pkgs/survey/default.nix index 2eba02e1a..01bcee74f 100644 --- a/python/pkgs/survey/default.nix +++ b/python/pkgs/survey/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "survey"; version = "5.4.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4vnjtSbw2y/o+fSWDl/CqTEZkl0jULGOLURdZ0BpKvY="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/Exahilosys/survey"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/svcs/default.nix b/python/pkgs/svcs/default.nix index 812bde58e..0bf9d74ea 100644 --- a/python/pkgs/svcs/default.nix +++ b/python/pkgs/svcs/default.nix @@ -20,7 +20,7 @@ sybil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "svcs"; version = "26.2.0"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hynek"; repo = "svcs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-GgfuCZ1LvcPD3p9/YSrUUXZHS86GTMjLwmXivYmwgCQ="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/hynek/svcs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/svg-path/default.nix b/python/pkgs/svg-path/default.nix index 86f784227..6dc692099 100644 --- a/python/pkgs/svg-path/default.nix +++ b/python/pkgs/svg-path/default.nix @@ -6,7 +6,7 @@ pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "svg.path"; version = "7.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "regebro"; repo = "svg.path"; - tag = version; + tag = finalAttrs.version; hash = "sha256-x1u56O3HilA7Zmkrsot6Nh9E1e88qHwYnk1ySs08tbQ="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/regebro/svg.path"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/svglib/default.nix b/python/pkgs/svglib/default.nix index d576d688a..7f8dbc4fa 100644 --- a/python/pkgs/svglib/default.nix +++ b/python/pkgs/svglib/default.nix @@ -10,13 +10,13 @@ tinycss2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "svglib"; version = "2.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-veXF+bDgkfHiELiq/doHpJvY6/IcDpDWc4OmZcg1l6w="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/deeplook/svglib"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/svgpathtools/default.nix b/python/pkgs/svgpathtools/default.nix index a0ee5cdd8..558da6954 100644 --- a/python/pkgs/svgpathtools/default.nix +++ b/python/pkgs/svgpathtools/default.nix @@ -10,7 +10,7 @@ svgwrite, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "svgpathtools"; version = "1.7.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mathandy"; repo = "svgpathtools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OGengjPIEuxDYHqzFUBbYcVs9RjBSKSd1NNjx/KqnSk="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/mathandy/svgpathtools"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/svgutils/default.nix b/python/pkgs/svgutils/default.nix index bb0d9afdb..4f9114146 100644 --- a/python/pkgs/svgutils/default.nix +++ b/python/pkgs/svgutils/default.nix @@ -7,7 +7,7 @@ lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "svgutils"; version = "0.3.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "btel"; repo = "svg_utils"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ITvZx+3HMbTyaRmCb7tR0LKqCxGjqDdV9/2taziUD0c="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/btel/svg_utils"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/svgwrite/default.nix b/python/pkgs/svgwrite/default.nix index b54a3f674..871cad4db 100644 --- a/python/pkgs/svgwrite/default.nix +++ b/python/pkgs/svgwrite/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "svgwrite"; version = "1.4.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-qPvf1EQzAqZhmn92vJN/xoPa8mKNm3N8iR7Ai4zlJMM="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/mozman/svgwrite"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/swagger-ui-bundle/default.nix b/python/pkgs/swagger-ui-bundle/default.nix index c24b66bdf..f70f38f38 100644 --- a/python/pkgs/swagger-ui-bundle/default.nix +++ b/python/pkgs/swagger-ui-bundle/default.nix @@ -11,27 +11,26 @@ }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swagger-ui-bundle"; version = "1.1.0"; pyproject = true; src = fetchPypi { pname = "swagger_ui_bundle"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-IGc8NDHIcz1dFhXs952azzDP91ICrK8hp9nH9IlxRSk="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ jinja2 ]; + dependencies = [ jinja2 ]; # package contains no tests - doCheck = false; meta = { description = "Bundled swagger-ui pip package"; homepage = "https://github.com/dtkav/swagger_ui_bundle"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/sybil/default.nix b/python/pkgs/sybil/default.nix index 28d3852b0..9c4f8ca36 100644 --- a/python/pkgs/sybil/default.nix +++ b/python/pkgs/sybil/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sybil"; version = "10.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BiJJyIhqCrGeRdHDr9VjHsgG56lc9RU8llYPXkd1bL0="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/simplistix/sybil"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/symfc/default.nix b/python/pkgs/symfc/default.nix index bc75bfcc6..e7ef1d846 100644 --- a/python/pkgs/symfc/default.nix +++ b/python/pkgs/symfc/default.nix @@ -14,7 +14,6 @@ buildPythonPackage (finalAttrs: { pname = "symfc"; version = "1.7.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "symfc"; diff --git a/python/pkgs/sympy/default.nix b/python/pkgs/sympy/default.nix index 66d915981..30393d585 100644 --- a/python/pkgs/sympy/default.nix +++ b/python/pkgs/sympy/default.nix @@ -14,7 +14,6 @@ buildPythonPackage (finalAttrs: { pname = "sympy"; version = "1.14.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "sympy"; @@ -34,7 +33,6 @@ buildPythonPackage (finalAttrs: { mpmath ]; - doCheck = false; pythonImportsCheck = [ "sympy" ]; meta = { diff --git a/python/pkgs/syncedlyrics/default.nix b/python/pkgs/syncedlyrics/default.nix index fcf2a208a..510c85105 100644 --- a/python/pkgs/syncedlyrics/default.nix +++ b/python/pkgs/syncedlyrics/default.nix @@ -8,7 +8,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "syncedlyrics"; version = "1.0.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rtcq"; repo = "syncedlyrics"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rKYze8Z7F6cEkpex6UCFUW9+mf2UWT+T86C5COhYQHY="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "syncedlyrics"; }; -} +}) diff --git a/python/pkgs/synchronicity/default.nix b/python/pkgs/synchronicity/default.nix index cccd6e169..40cb77d00 100644 --- a/python/pkgs/synchronicity/default.nix +++ b/python/pkgs/synchronicity/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { pname = "synchronicity"; version = "0.12.5"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "modal-labs"; diff --git a/python/pkgs/syslog-rfc5424-formatter/default.nix b/python/pkgs/syslog-rfc5424-formatter/default.nix index 021511a7a..83f8dfab2 100644 --- a/python/pkgs/syslog-rfc5424-formatter/default.nix +++ b/python/pkgs/syslog-rfc5424-formatter/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "1.2.3"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "easypost"; repo = "syslog-rfc5424-formatter"; diff --git a/python/pkgs/sysrsync/default.nix b/python/pkgs/sysrsync/default.nix index 8b2b15085..aa488113d 100644 --- a/python/pkgs/sysrsync/default.nix +++ b/python/pkgs/sysrsync/default.nix @@ -8,7 +8,7 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sysrsync"; version = "1.1.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gchamon"; repo = "sysrsync"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2Sz3JrNmIGOnad+qjRzbAgsFEzDtwBT0KLEFyQKZra4="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/gchamon/sysrsync"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tableauserverclient/default.nix b/python/pkgs/tableauserverclient/default.nix index 7defecae6..ad876438a 100644 --- a/python/pkgs/tableauserverclient/default.nix +++ b/python/pkgs/tableauserverclient/default.nix @@ -11,13 +11,13 @@ versioneer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tableauserverclient"; version = "0.41"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5JGXW58OGUZ/tkI7gUURqfVJwivOeMhoB5ol++gaDpU="; }; @@ -38,7 +38,6 @@ buildPythonPackage rec { typing-extensions ]; # Tests attempt to create some file artifacts and fails - doCheck = false; pythonImportsCheck = [ "tableauserverclient" ]; @@ -47,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/tableau/server-client-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tabledata/default.nix b/python/pkgs/tabledata/default.nix index 3587510dc..0bfb76bf9 100644 --- a/python/pkgs/tabledata/default.nix +++ b/python/pkgs/tabledata/default.nix @@ -7,7 +7,7 @@ typepy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tabledata"; version = "1.3.5"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thombashi"; repo = "tabledata"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yt71e2ZPJ5WpDLs6sU4kYQGR13IgJB7gMEzhaCHblos="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { description = "Library to represent tabular data"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tables/default.nix b/python/pkgs/tables/default.nix index e5a0c9e55..007ab1643 100644 --- a/python/pkgs/tables/default.nix +++ b/python/pkgs/tables/default.nix @@ -32,7 +32,6 @@ buildPythonPackage (finalAttrs: { pname = "tables"; version = "3.11.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "PyTables"; diff --git a/python/pkgs/tablib/default.nix b/python/pkgs/tablib/default.nix index 33ab57b79..7efa5d971 100644 --- a/python/pkgs/tablib/default.nix +++ b/python/pkgs/tablib/default.nix @@ -15,13 +15,13 @@ xlwt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tablib"; version = "3.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eBz6mkLejzPFKv+Ff9CgTkg95P0cU+qqmmrqxiutEd4="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://tablib.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tabula-py/default.nix b/python/pkgs/tabula-py/default.nix index 94e091177..df9ea4381 100644 --- a/python/pkgs/tabula-py/default.nix +++ b/python/pkgs/tabula-py/default.nix @@ -11,7 +11,7 @@ jpype1, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tabula-py"; version = "2.10.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chezou"; repo = "tabula-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PQbwm9ho3XtpmZ7N7ASkrV8gk9Jom+yQKlt2fUa948s="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/chezou/tabula-py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tag-expressions/default.nix b/python/pkgs/tag-expressions/default.nix index 4b9346b81..0dd541811 100644 --- a/python/pkgs/tag-expressions/default.nix +++ b/python/pkgs/tag-expressions/default.nix @@ -5,20 +5,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tag-expressions"; version = "2.0.1"; pyproject = true; src = fetchPypi { pname = "tag_expressions"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-EbSwfAH+sL3JGW+COfDA2f7cLGyKmQMsbyyDGy13Lkg="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail 'version=read_version()' 'version="${version}"' + --replace-fail 'version=read_version()' 'version="${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/timofurrer/tag-expressions"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/tailer/default.nix b/python/pkgs/tailer/default.nix index a6e2c4ae2..6420048bb 100644 --- a/python/pkgs/tailer/default.nix +++ b/python/pkgs/tailer/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tailer"; version = "0.4.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "six8"; repo = "pytailer"; - rev = version; + tag = finalAttrs.version; sha256 = "1s5p5m3q9k7r1m0wx5wcxf20xzs0rj14qwg1ydwhf6adr17y2w5y"; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "tailer" ]; meta = { @@ -24,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/six8/pytailer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/takethetime/default.nix b/python/pkgs/takethetime/default.nix index 6b1a035c0..628561d01 100644 --- a/python/pkgs/takethetime/default.nix +++ b/python/pkgs/takethetime/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "takethetime"; version = "0.3.1"; pyproject = true; src = fetchPypi { pname = "TakeTheTime"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-2+MEU6G1lqOPni4/qOGtxa8tv2RsoIN61cIFmhb+L/k="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/ErikBjare/TakeTheTime"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tantivy/default.nix b/python/pkgs/tantivy/default.nix index 02a5d8a58..a0ce8b43f 100644 --- a/python/pkgs/tantivy/default.nix +++ b/python/pkgs/tantivy/default.nix @@ -16,7 +16,6 @@ buildPythonPackage (finalAttrs: { pname = "tantivy"; version = "0.26.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "quickwit-oss"; diff --git a/python/pkgs/tasklib/default.nix b/python/pkgs/tasklib/default.nix index 5a7c70d18..fe5c5f678 100644 --- a/python/pkgs/tasklib/default.nix +++ b/python/pkgs/tasklib/default.nix @@ -5,19 +5,23 @@ pytz, tzlocal, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tasklib"; version = "2.5.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XM1zG1JjbdEEV6i42FjLDQJv+qsePnUbr3kb+APjfXs="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ six pytz tzlocal @@ -29,4 +33,4 @@ buildPythonPackage rec { platforms = lib.platforms.all; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/tatsu/default.nix b/python/pkgs/tatsu/default.nix index 609007cee..e61574641 100644 --- a/python/pkgs/tatsu/default.nix +++ b/python/pkgs/tatsu/default.nix @@ -7,7 +7,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tatsu"; version = "5.24.0"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "neogeny"; repo = "TatSu"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FJBtZ8OP/Tv4KUvJBwuyP1HCco9XW4Z9ODpPFn2tKss="; }; nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ colorama regex ]; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://tatsu.readthedocs.io/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/tblib/default.nix b/python/pkgs/tblib/default.nix index 67b362710..a42e86f65 100644 --- a/python/pkgs/tblib/default.nix +++ b/python/pkgs/tblib/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tblib"; version = "3.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6aZSaS2Rv090PUoVvBdMC3avx1D+jHttGVzBwdbSzOw="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ionelmc/python-tblib"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/tcolorpy/default.nix b/python/pkgs/tcolorpy/default.nix index b5ec05ef2..aee9f9681 100644 --- a/python/pkgs/tcolorpy/default.nix +++ b/python/pkgs/tcolorpy/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tcolorpy"; version = "0.1.7"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thombashi"; repo = "tcolorpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0AXpwRQgBisO4360J+Xd4+EWzDtDJ64UpSUmDnSYjKE="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { description = "Library to apply true color for terminal text"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/telegram-text/default.nix b/python/pkgs/telegram-text/default.nix index cb11e36cf..1e16eca7a 100644 --- a/python/pkgs/telegram-text/default.nix +++ b/python/pkgs/telegram-text/default.nix @@ -7,13 +7,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "telegram_text"; version = "0.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7ilaNfLHckbdmoDF4ajezMWYlY3/NXQGl5AcYyxhIfo="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://telegram-text.alinsky.tech/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/teletype/default.nix b/python/pkgs/teletype/default.nix index 41ed4bf3d..e8098a95e 100644 --- a/python/pkgs/teletype/default.nix +++ b/python/pkgs/teletype/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "teletype"; version = "1.3.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uBppM4w9GlMgYqKFGw1Rcjvq+mnU04K3E74jCgK9YYo="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/jkwill87/teletype"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tempman/default.nix b/python/pkgs/tempman/default.nix index 708404b65..ad4328430 100644 --- a/python/pkgs/tempman/default.nix +++ b/python/pkgs/tempman/default.nix @@ -6,7 +6,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tempman"; version = "0.1.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mwilliamson"; repo = "python-tempman"; - tag = version; + tag = finalAttrs.version; hash = "sha256-EHTnlT3vcmyjyyS3QCJXjAuZqOEc0i11rEb6zfX6rDY="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "tempman" ]; # Disabling tests, they rely on dependencies that are outdated and not supported - doCheck = false; passthru.updateScript = gitUpdater { }; @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/mwilliamson/python-tempman"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/tempora/default.nix b/python/pkgs/tempora/default.nix index e8299f20b..8bef4b122 100644 --- a/python/pkgs/tempora/default.nix +++ b/python/pkgs/tempora/default.nix @@ -14,13 +14,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tempora"; version = "5.12.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tJt4zH7AslK/vXTO8BhxIbGOT1oMV+O5w9j8FQkK87Q="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { mainProgram = "calc-prorate"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/temporalio/default.nix b/python/pkgs/temporalio/default.nix index 8b6271cfb..10bf2b6af 100644 --- a/python/pkgs/temporalio/default.nix +++ b/python/pkgs/temporalio/default.nix @@ -19,7 +19,7 @@ rustc, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "temporalio"; version = "1.30.0"; pyproject = true; @@ -27,13 +27,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "temporalio"; repo = "sdk-python"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-8bCkm2b66CUSfIri0PhDLCijFSQR82wzAQKjdlk8VBg="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit + inherit (finalAttrs) pname version src @@ -80,4 +80,4 @@ buildPythonPackage rec { homepage = "https://temporal.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tensorboard-data-server/default.nix b/python/pkgs/tensorboard-data-server/default.nix index f592bf907..ca6c7d263 100644 --- a/python/pkgs/tensorboard-data-server/default.nix +++ b/python/pkgs/tensorboard-data-server/default.nix @@ -4,14 +4,14 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tensorboard-data-server"; version = "0.7.2"; format = "wheel"; src = fetchPypi { pname = "tensorboard_data_server"; - inherit version; + inherit (finalAttrs) version; format = "wheel"; dist = "py3"; python = "py3"; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/tensorflow/tensorboard/tree/master/tensorboard/data/server"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/tensorboard/default.nix b/python/pkgs/tensorboard/default.nix index e6955f401..140243a96 100644 --- a/python/pkgs/tensorboard/default.nix +++ b/python/pkgs/tensorboard/default.nix @@ -17,7 +17,7 @@ standard-imghdr, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tensorboard"; version = "2.21.0"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tensorflow/tensorboard is built from a downloaded wheel, because # https://github.com/tensorflow/tensorboard/issues/719 blocks buildBazelPackage. src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; format = "wheel"; dist = "py3"; python = "py3"; @@ -71,4 +71,4 @@ buildPythonPackage rec { mainProgram = "tensorboard"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -} +}) diff --git a/python/pkgs/tensorboardx/default.nix b/python/pkgs/tensorboardx/default.nix index 0c54aa947..8c6e647bd 100644 --- a/python/pkgs/tensorboardx/default.nix +++ b/python/pkgs/tensorboardx/default.nix @@ -11,7 +11,7 @@ tensorboard, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tensorboardx"; version = "2.6.5"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lanpa"; repo = "tensorboardX"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VTekZSfD2oZUQe7B2NwePlljGdrZNQMdjJ4K66hS4Ps="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.all; }; -} +}) diff --git a/python/pkgs/tensorflow-metadata/default.nix b/python/pkgs/tensorflow-metadata/default.nix index 99dedcbff..e4511195f 100644 --- a/python/pkgs/tensorflow-metadata/default.nix +++ b/python/pkgs/tensorflow-metadata/default.nix @@ -16,7 +16,6 @@ buildPythonPackage (finalAttrs: { pname = "tensorflow-metadata"; version = "1.21.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "tensorflow"; @@ -49,7 +48,6 @@ buildPythonPackage (finalAttrs: { ]; # has no tests - doCheck = false; pythonImportsCheck = [ "tensorflow_metadata" diff --git a/python/pkgs/tensorly/default.nix b/python/pkgs/tensorly/default.nix index 397f1e6fb..b9fd12d8e 100644 --- a/python/pkgs/tensorly/default.nix +++ b/python/pkgs/tensorly/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tensorly"; version = "0.9.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tensorly"; repo = "tensorly"; - tag = version; + tag = finalAttrs.version; hash = "sha256-A6Zlp8fa7XFgf4qpg7SEtNLlYSNtDGLuRUEfzD+crQc="; }; @@ -50,4 +50,4 @@ buildPythonPackage rec { homepage = "https://tensorly.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/tensorstore/default.nix b/python/pkgs/tensorstore/default.nix index 2d2c3549d..e0909cfad 100644 --- a/python/pkgs/tensorstore/default.nix +++ b/python/pkgs/tensorstore/default.nix @@ -35,7 +35,6 @@ buildPythonPackage (finalAttrs: { pname = "tensorstore"; version = "0.1.85"; format = "wheel"; - __structuredAttrs = true; # The source build involves some wonky Bazel stuff. src = fetchPypi { diff --git a/python/pkgs/termcolor/default.nix b/python/pkgs/termcolor/default.nix index 7704e0ab3..824fead37 100644 --- a/python/pkgs/termcolor/default.nix +++ b/python/pkgs/termcolor/default.nix @@ -6,13 +6,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "termcolor"; version = "3.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NIhxymSOxqmpg6E6tibArM4C9RW54ZgzMrF695eVIcU="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/termcolor/termcolor"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/terminado/default.nix b/python/pkgs/terminado/default.nix index aad330338..8b4266a6a 100644 --- a/python/pkgs/terminado/default.nix +++ b/python/pkgs/terminado/default.nix @@ -7,19 +7,19 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "terminado"; version = "0.18.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3gnyxLhd5HZfdxRoj/9X0+dbrR+Qm1if3ogEYMdT/S4="; }; nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ ptyprocess tornado ]; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/terminado"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/terminaltables/default.nix b/python/pkgs/terminaltables/default.nix index 84c25bba7..734cd4d15 100644 --- a/python/pkgs/terminaltables/default.nix +++ b/python/pkgs/terminaltables/default.nix @@ -5,13 +5,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "terminaltables"; version = "3.1.10"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-um7KXLW6ArukyfT5ha+AxU7D3M+Uz80ZAVQ4YlXkdUM="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { description = "Display simple tables in terminals"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/terminaltables3/default.nix b/python/pkgs/terminaltables3/default.nix index e60984e4c..708789eac 100644 --- a/python/pkgs/terminaltables3/default.nix +++ b/python/pkgs/terminaltables3/default.nix @@ -7,7 +7,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "terminaltables3"; version = "4.0.0-unstable-2024-07-21"; pyproject = true; @@ -28,4 +28,4 @@ buildPythonPackage rec { description = "Generate simple tables in terminals from a nested list of strings"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/terminaltexteffects/default.nix b/python/pkgs/terminaltexteffects/default.nix index 998e457b4..5ba053dbf 100644 --- a/python/pkgs/terminaltexteffects/default.nix +++ b/python/pkgs/terminaltexteffects/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "terminaltexteffects"; version = "0.15.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-9LMchr+pQ9W/Oyxey/rqDeZe1KlRAoxA+OTLVO/QZDk="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { mainProgram = "tte"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/termstyle/default.nix b/python/pkgs/termstyle/default.nix index ea9cedf0f..25171d3ad 100644 --- a/python/pkgs/termstyle/default.nix +++ b/python/pkgs/termstyle/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "termstyle"; version = "0.1.11"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-73S4NpjqAUESBAzzKxoJPBqz2RxN0Y7MA+wXj9mcn58="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/python-termstyle/"; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/python/pkgs/test2ref/default.nix b/python/pkgs/test2ref/default.nix index f902b571b..34dc8811b 100644 --- a/python/pkgs/test2ref/default.nix +++ b/python/pkgs/test2ref/default.nix @@ -17,7 +17,6 @@ buildPythonPackage (finalAttrs: { pname = "test2ref"; version = "1.2.3"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "nbiotcloud"; diff --git a/python/pkgs/testcontainers/default.nix b/python/pkgs/testcontainers/default.nix index 54cbae684..b6261ee7c 100644 --- a/python/pkgs/testcontainers/default.nix +++ b/python/pkgs/testcontainers/default.nix @@ -41,7 +41,6 @@ buildPythonPackage (finalAttrs: { ]; # Tests require various container and database services running - doCheck = false; pythonImportsCheck = [ "testcontainers" diff --git a/python/pkgs/testfixtures/default.nix b/python/pkgs/testfixtures/default.nix index ce826bc2d..d56481eb5 100644 --- a/python/pkgs/testfixtures/default.nix +++ b/python/pkgs/testfixtures/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "testfixtures"; version = "12.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2AfOub3W6nzAZjNw3VVoM5BWs13BXCbv/RriZ+MjrPE="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/Simplistix/testfixtures"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/testing-common-database/default.nix b/python/pkgs/testing-common-database/default.nix index a76f4b2e5..f5427c986 100644 --- a/python/pkgs/testing-common-database/default.nix +++ b/python/pkgs/testing-common-database/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "testing-common-database"; version = "2.0.3"; pyproject = true; src = fetchPypi { pname = "testing.common.database"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ll2AsphTFTJdw1jDBhsXSnEvTU1b9qgLWLEfmh3YbXM="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/tk0miya/testing.common.database"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/testpath/default.nix b/python/pkgs/testpath/default.nix index 6e3812c8a..ff6daf15a 100644 --- a/python/pkgs/testpath/default.nix +++ b/python/pkgs/testpath/default.nix @@ -6,13 +6,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "testpath"; version = "0.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LxuX5kQsAmgevgG9hPUxAop8rqGvOCUAD1I0XDAoXg8="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { rm testpath/cli-32.exe testpath/cli-64.exe ''; -} +}) diff --git a/python/pkgs/testrail-api/default.nix b/python/pkgs/testrail-api/default.nix index 491f863e4..487cfd146 100644 --- a/python/pkgs/testrail-api/default.nix +++ b/python/pkgs/testrail-api/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "testrail-api"; version = "1.13.6"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tolstislon"; repo = "testrail-api"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xCarEmJM+liyh8T8qG8sqSLXMnFN49yZapbktIElSF0="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/tolstislon/testrail-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/testresources/default.nix b/python/pkgs/testresources/default.nix index 086f42489..933c2dd0b 100644 --- a/python/pkgs/testresources/default.nix +++ b/python/pkgs/testresources/default.nix @@ -6,7 +6,7 @@ pbr, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "testresources"; version = "2.0.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "testing-cabal"; repo = "testresources"; - tag = version; + tag = finalAttrs.version; hash = "sha256-cdZObOgBOUxYg4IGUUMb6arlpb6NTU7w+EW700LKH4Y="; }; @@ -27,7 +27,7 @@ buildPythonPackage rec { pbr ]; - env.PBR_VERSION = version; + env.PBR_VERSION = finalAttrs.version; meta = { description = "Pyunit extension for managing expensive test resources"; @@ -37,4 +37,4 @@ buildPythonPackage rec { bsd3 ]; }; -} +}) diff --git a/python/pkgs/testscenarios/default.nix b/python/pkgs/testscenarios/default.nix index 30443b3c7..d5c92a0e9 100644 --- a/python/pkgs/testscenarios/default.nix +++ b/python/pkgs/testscenarios/default.nix @@ -11,13 +11,13 @@ testtools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "testscenarios"; version = "0.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2hhe4xbYdwIb62OV8tgM7SKpnCh2xC1UmU47rTw9r00="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/testing-cabal/testscenarios"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/testtools/default.nix b/python/pkgs/testtools/default.nix index 45f0e8623..704cb7035 100644 --- a/python/pkgs/testtools/default.nix +++ b/python/pkgs/testtools/default.nix @@ -12,13 +12,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "testtools"; version = "2.9.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Oa2eueG5NdaDj0s67k1ucttl31YC9v7amY27T+jeCxk="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/testing-cabal/testtools"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/text-unidecode/default.nix b/python/pkgs/text-unidecode/default.nix index 1f4ff1b66..47d0ec103 100644 --- a/python/pkgs/text-unidecode/default.nix +++ b/python/pkgs/text-unidecode/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "text-unidecode"; version = "1.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"; }; + build-system = [ setuptools ]; + meta = { description = "Most basic Text::Unidecode port"; homepage = "https://github.com/kmike/text-unidecode"; license = lib.licenses.artistic1; }; -} +}) diff --git a/python/pkgs/textblob/default.nix b/python/pkgs/textblob/default.nix index b9ceffa52..4b017a017 100644 --- a/python/pkgs/textblob/default.nix +++ b/python/pkgs/textblob/default.nix @@ -10,13 +10,13 @@ nltk, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textblob"; version = "0.20.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+9GjMHUy6d3bj1AoSHRVngECDnm1/lrkwdpwmp4gh+o="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://textblob.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/textdistance/default.nix b/python/pkgs/textdistance/default.nix index c82d2f020..0efc98cfc 100644 --- a/python/pkgs/textdistance/default.nix +++ b/python/pkgs/textdistance/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textdistance"; version = "4.6.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1tq8ULTqgyzc8OHmAhvQx/zZreFViI15u2o8Mfzi3G8="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/life4/textdistance"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/textfsm/default.nix b/python/pkgs/textfsm/default.nix index ac7f6f2ab..3518560fd 100644 --- a/python/pkgs/textfsm/default.nix +++ b/python/pkgs/textfsm/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textfsm"; version = "2.1.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = "textfsm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ygVcDdT85mRN+qYfTZqraRVyp2JlLwwujBW1e/pPJNc="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/textfsm"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/textparser/default.nix b/python/pkgs/textparser/default.nix index 71073c75d..3ff6f4a2d 100644 --- a/python/pkgs/textparser/default.nix +++ b/python/pkgs/textparser/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textparser"; version = "0.26.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hZglh2qcOPfDE+4c+ZGlnWtWIyqfZ75tzAp1jYRlT7o="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/eerimoq/textparser"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/texttable/default.nix b/python/pkgs/texttable/default.nix index b57e56346..85850398b 100644 --- a/python/pkgs/texttable/default.nix +++ b/python/pkgs/texttable/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "texttable"; version = "1.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LSBo+1URWAfTrHekymj6SIA+hOuw7iNA+FgQejZSJjg="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "texttable" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/foutaise/texttable"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/textual-autocomplete/default.nix b/python/pkgs/textual-autocomplete/default.nix index d1bf6d9b7..af30700ab 100644 --- a/python/pkgs/textual-autocomplete/default.nix +++ b/python/pkgs/textual-autocomplete/default.nix @@ -8,14 +8,14 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textual-autocomplete"; version = "4.0.6"; pyproject = true; src = fetchPypi { pname = "textual_autocomplete"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-K6Lw12e+RIDsrLPksTDPBzQOAzw1APxCT+2RJdJ6RYY="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/darrenburns/textual-autocomplete"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/textual-dev/default.nix b/python/pkgs/textual-dev/default.nix index 557cfd7ee..4e6796487 100644 --- a/python/pkgs/textual-dev/default.nix +++ b/python/pkgs/textual-dev/default.nix @@ -13,7 +13,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textual-dev"; version = "1.8.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Textualize"; repo = "textual-dev"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0NOFc0FKbVEeZ6rNZGX8lo5W8RU3lKJlH+AqRCifuOE="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "textual"; }; -} +}) diff --git a/python/pkgs/textual-fastdatatable/default.nix b/python/pkgs/textual-fastdatatable/default.nix index 326aff9c1..89737c5c8 100644 --- a/python/pkgs/textual-fastdatatable/default.nix +++ b/python/pkgs/textual-fastdatatable/default.nix @@ -11,7 +11,7 @@ polars, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textual-fastdatatable"; version = "0.19.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tconbeer"; repo = "textual-fastdatatable"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-buOgvDFzK6wRrzm7AvT7BFFzHbCNEqX3OVsFS1FyJio="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/tconbeer/textual-fastdatatable"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/textual-serve/default.nix b/python/pkgs/textual-serve/default.nix index 0ed3a144d..883cde957 100644 --- a/python/pkgs/textual-serve/default.nix +++ b/python/pkgs/textual-serve/default.nix @@ -14,14 +14,14 @@ textual, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textual-serve"; version = "1.1.3"; pyproject = true; src = fetchPypi { pname = "textual_serve"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-+PY2ri9f1lG3nZZUc8PpOD01Ic34lvm8KJcJGF2j9oM="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/textual-serve/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/textual/default.nix b/python/pkgs/textual/default.nix index 16455b1d0..03ee17ece 100644 --- a/python/pkgs/textual/default.nix +++ b/python/pkgs/textual/default.nix @@ -24,7 +24,6 @@ buildPythonPackage (finalAttrs: { pname = "textual"; version = "8.2.8"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "Textualize"; diff --git a/python/pkgs/textwrap3/default.nix b/python/pkgs/textwrap3/default.nix index 277f1f6e6..7249f076e 100644 --- a/python/pkgs/textwrap3/default.nix +++ b/python/pkgs/textwrap3/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textwrap3"; version = "0.9.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-UAju69sjb2MD3NaPGLhW01X2GXUR2VK6dLx15A4MNBQ="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/jonathaneunice/textwrap3"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/textx/default.nix b/python/pkgs/textx/default.nix index 8b89f15c8..916c011a2 100644 --- a/python/pkgs/textx/default.nix +++ b/python/pkgs/textx/default.nix @@ -9,7 +9,7 @@ }: let - textx = buildPythonPackage rec { + textx = buildPythonPackage (finalAttrs: { pname = "textx"; version = "4.4.0"; pyproject = true; @@ -17,7 +17,7 @@ let src = fetchFromGitHub { owner = "textx"; repo = "textx"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bwwINUJiMG6Isi0/p1DsIzzlSa0y7xR4Q6OnpKy894s="; }; @@ -49,7 +49,7 @@ let homepage = "https://github.com/textx/textx/"; license = lib.licenses.mit; }; - }; + }); textx-data-dsl = buildPythonPackage rec { pname = "textx-data-dsl"; @@ -70,7 +70,7 @@ let meta = { inherit (textx.meta) license; description = "Sample textX language for testing"; - homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot; + homepage = textx.meta.homepage + "tree/${textx.version}/" + pathToSourceRoot; }; }; @@ -93,7 +93,7 @@ let meta = { inherit (textx.meta) license; description = "Sample textX language for testing"; - homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot; + homepage = textx.meta.homepage + "tree/${textx.version}/" + pathToSourceRoot; }; }; @@ -113,7 +113,7 @@ let meta = { inherit (textx.meta) license; description = "Sample textX language for testing"; - homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot; + homepage = textx.meta.homepage + "tree/${textx.version}/" + pathToSourceRoot; }; }; @@ -133,7 +133,7 @@ let meta = { inherit (textx.meta) license; description = "Sample textX language for testing"; - homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot; + homepage = textx.meta.homepage + "tree/${textx.version}/" + pathToSourceRoot; }; }; @@ -153,7 +153,7 @@ let meta = { inherit (textx.meta) license; description = "Sample textX sub-command for testing"; - homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot; + homepage = textx.meta.homepage + "tree/${textx.version}/" + pathToSourceRoot; }; }; in diff --git a/python/pkgs/tftpy/default.nix b/python/pkgs/tftpy/default.nix index 3f02c33d0..7dd04c534 100644 --- a/python/pkgs/tftpy/default.nix +++ b/python/pkgs/tftpy/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tftpy"; version = "0.8.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6KWqCS2rLhy7m5Q5IDaCe4CNw362zxsaszyBlXs/X+I="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/msoulier/tftpy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/thefuzz/default.nix b/python/pkgs/thefuzz/default.nix index 998330bfb..a5a908e6a 100644 --- a/python/pkgs/thefuzz/default.nix +++ b/python/pkgs/thefuzz/default.nix @@ -10,13 +10,13 @@ levenshtein, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "thefuzz"; version = "0.22.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cTgDmn7PVA2jI3kthZLvmQKx1563jBR9TyBmTeefNoA="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/seatgeek/thefuzz"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/python/pkgs/threadpoolctl/default.nix b/python/pkgs/threadpoolctl/default.nix index f94616d16..4823c6bc1 100644 --- a/python/pkgs/threadpoolctl/default.nix +++ b/python/pkgs/threadpoolctl/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "threadpoolctl"; version = "3.6.0"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "joblib"; repo = "threadpoolctl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yICErKIHc9XKiWg9C9EH0il9zhbbkGntw6mlYDibr9g="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "Helpers to limit number of threads used in native libraries"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/three-merge/default.nix b/python/pkgs/three-merge/default.nix index 35c75eb12..d9ba38097 100644 --- a/python/pkgs/three-merge/default.nix +++ b/python/pkgs/three-merge/default.nix @@ -6,13 +6,13 @@ diff-match-patch, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "three-merge"; version = "0.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-YPav4URZVWDWOuMmJTUbzvO5RzO1Trl4AKn+sPPZ2XA="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/spyder-ide/three-merge"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/thrift/default.nix b/python/pkgs/thrift/default.nix index 21448314e..8e536821a 100644 --- a/python/pkgs/thrift/default.nix +++ b/python/pkgs/thrift/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "thrift"; version = "0.24.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nvYBxJ6YhHX/DnQdjhtF/uwjtIUU5SQ0HvwnQZHxeJw="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://thrift.apache.org/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/thriftpy2/default.nix b/python/pkgs/thriftpy2/default.nix index e1e42764d..b60694714 100644 --- a/python/pkgs/thriftpy2/default.nix +++ b/python/pkgs/thriftpy2/default.nix @@ -11,7 +11,7 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "thriftpy2"; version = "0.7.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Thriftpy"; repo = "thriftpy2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vbNCPYWO/D+7/UJU/0ATdLzZ4lIPOKeBZ1sgWCdxx/c="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/Thriftpy/thriftpy2"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tidalapi/default.nix b/python/pkgs/tidalapi/default.nix index 054aa0350..1a2adb2ac 100644 --- a/python/pkgs/tidalapi/default.nix +++ b/python/pkgs/tidalapi/default.nix @@ -11,7 +11,7 @@ mpegdash, pyaes, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tidalapi"; version = "0.8.11"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "EbbLabs"; repo = "python-tidal"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5IGMSiDwEGCnMtTARmx8Z9nfc3BaCe6z32m5j2FFBAI="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/tamland/python-tidal"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/tifffile/default.nix b/python/pkgs/tifffile/default.nix index 47d943222..50095ace0 100644 --- a/python/pkgs/tifffile/default.nix +++ b/python/pkgs/tifffile/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tifffile"; version = "2026.9.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XloN+hbmN2vwYrxG4huJb7/olfy0dVmvnGS5std7tKA="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/cgohlke/tifffile/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/tika-client/default.nix b/python/pkgs/tika-client/default.nix index 00da93f16..94c8b19ef 100644 --- a/python/pkgs/tika-client/default.nix +++ b/python/pkgs/tika-client/default.nix @@ -7,7 +7,7 @@ httpx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tika-client"; version = "1.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stumpylog"; repo = "tika-client"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ZXtNHjdbAzur6lRZIom+wDMhXgpqQxvHPQMxjXJDwlw="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/stumpylog/tika-client"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/tiktoken/default.nix b/python/pkgs/tiktoken/default.nix index 4e5a8eb43..45be28697 100644 --- a/python/pkgs/tiktoken/default.nix +++ b/python/pkgs/tiktoken/default.nix @@ -61,8 +61,6 @@ buildPythonPackage { regex ]; - doCheck = false; - pythonImportsCheck = [ "tiktoken" ]; meta = { diff --git a/python/pkgs/timeago/default.nix b/python/pkgs/timeago/default.nix index 46e201838..2f6acb328 100644 --- a/python/pkgs/timeago/default.nix +++ b/python/pkgs/timeago/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "timeago"; version = "1.0.16"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hustcc"; repo = "timeago"; - tag = version; + tag = finalAttrs.version; hash = "sha256-PqORJKAVrjezU/yP2ky3gb1XsM8obDI3GQzi+mok/OM="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/hustcc/timeago"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/timelib/default.nix b/python/pkgs/timelib/default.nix index 7f887f245..ba8ef433f 100644 --- a/python/pkgs/timelib/default.nix +++ b/python/pkgs/timelib/default.nix @@ -3,18 +3,22 @@ buildPythonPackage, cython, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "timelib"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0bInBlVxhuYFjaiLoPhYN0AbKuneFX9ZNT3JeNglGHo="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ cython ]; meta = { @@ -22,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/pediapress/timelib/"; license = lib.licenses.zlib; }; -} +}) diff --git a/python/pkgs/timeout-decorator/default.nix b/python/pkgs/timeout-decorator/default.nix index 586834d56..9bd5ff871 100644 --- a/python/pkgs/timeout-decorator/default.nix +++ b/python/pkgs/timeout-decorator/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "timeout-decorator"; version = "0.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ai8vWNscWySizHneY0V2A3eti9wTgT9SZfbD5j0Ws9c="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/pnpnpn/timeout-decorator"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tiny-proxy/default.nix b/python/pkgs/tiny-proxy/default.nix index 3cb777308..bb2797345 100644 --- a/python/pkgs/tiny-proxy/default.nix +++ b/python/pkgs/tiny-proxy/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tiny-proxy"; version = "0.3.0"; pyproject = true; @@ -14,16 +14,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "romis2012"; repo = "tiny-proxy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zE0SnO4IfX4KynCNQXWTJlHNe3TaZodg4eyriX2RRl8="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ anyio ]; + dependencies = [ anyio ]; # The tests depend on httpx-socks, whose tests depend on tiny-proxy. - doCheck = false; pythonImportsCheck = [ "tiny_proxy" ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/romis2012/tiny-proxy"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/tinycss/default.nix b/python/pkgs/tinycss/default.nix index 6c0558970..f053b7312 100644 --- a/python/pkgs/tinycss/default.nix +++ b/python/pkgs/tinycss/default.nix @@ -4,25 +4,29 @@ cssutils, cython, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tinycss"; version = "0.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-EjBvtQ5enn6u74S4Au2HdIi6gONcZyhn9UjAkkp2cW4="; }; + build-system = [ setuptools ]; + postPatch = '' sed -i "/--cov/d" setup.cfg ''; nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ cssutils ]; + dependencies = [ cssutils ]; preBuild = '' # Force Cython to re-generate this file. If it is present, Cython will @@ -42,4 +46,4 @@ buildPythonPackage rec { homepage = "https://tinycss.readthedocs.io"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/tinycss2/default.nix b/python/pkgs/tinycss2/default.nix index 63f0961a1..b2ab16f26 100644 --- a/python/pkgs/tinycss2/default.nix +++ b/python/pkgs/tinycss2/default.nix @@ -6,7 +6,7 @@ webencodings, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tinycss2"; version = "1.5.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kozea"; repo = "tinycss2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-34qmoKVH5M0l5Is7YoreN9X3iPD0km0TLvGLbfW8KBY="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/Kozea/tinycss2"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/tinydb/default.nix b/python/pkgs/tinydb/default.nix index 3fa9545d8..e97954509 100644 --- a/python/pkgs/tinydb/default.nix +++ b/python/pkgs/tinydb/default.nix @@ -7,7 +7,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tinydb"; version = "4.9.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "msiemens"; repo = "tinydb"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7YKqbBf+WrSVDZdPb6dT/22f5uggXy8uQ3lkxvWD5AI="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://tinydb.readthedocs.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tinyhtml5/default.nix b/python/pkgs/tinyhtml5/default.nix index 39e6ff4c7..3f56fff53 100644 --- a/python/pkgs/tinyhtml5/default.nix +++ b/python/pkgs/tinyhtml5/default.nix @@ -6,7 +6,7 @@ webencodings, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tinyhtml5"; version = "2.1.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CourtBouillon"; repo = "tinyhtml5"; - tag = version; + tag = finalAttrs.version; hash = "sha256-PSDlCLPK3JVMq5dyt6xzNb4xx3F8Jwf8HAgYLKoXH+E="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/CourtBouillon/tinyhtml5"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tinyrecord/default.nix b/python/pkgs/tinyrecord/default.nix index 2a0da4011..b3bf1125e 100644 --- a/python/pkgs/tinyrecord/default.nix +++ b/python/pkgs/tinyrecord/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "0.2.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "eugene-eeo"; repo = "tinyrecord"; diff --git a/python/pkgs/tinytag/default.nix b/python/pkgs/tinytag/default.nix index 0877e78a1..d7191b0bf 100644 --- a/python/pkgs/tinytag/default.nix +++ b/python/pkgs/tinytag/default.nix @@ -8,13 +8,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tinytag"; version = "2.3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ah1xHNvb+EDTtnuXbLNNrcWNL8/UkOt075YCs3uZFBQ="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/tinytag/tinytag"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tld/default.nix b/python/pkgs/tld/default.nix index 9a36407df..ba474baab 100644 --- a/python/pkgs/tld/default.nix +++ b/python/pkgs/tld/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tld"; version = "0.13.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2YP6krnXF0AHQvyoROKdXhgnEHnHvPq/ZtAbObShQ0U="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/barseghyanartur/tld"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/tldextract/default.nix b/python/pkgs/tldextract/default.nix index 1b45dd377..65a0e643b 100644 --- a/python/pkgs/tldextract/default.nix +++ b/python/pkgs/tldextract/default.nix @@ -14,13 +14,13 @@ filelock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tldextract"; version = "5.3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-wBdDG8CADy09G1fM424GZo8JMPYKbYxGFdTiuNopj6k="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/john-kurkowski/tldextract"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/tls-parser/default.nix b/python/pkgs/tls-parser/default.nix index 2f22246ab..1cf01565a 100644 --- a/python/pkgs/tls-parser/default.nix +++ b/python/pkgs/tls-parser/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tls-parser"; version = "2.0.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nabla-c0d3"; repo = "tls_parser"; - tag = version; + tag = finalAttrs.version; hash = "sha256-nNQ5XLsZMUXmsTnaqiUeaaHtiVc5r4woRxeYVhO3ICY="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tlsh/default.nix b/python/pkgs/tlsh/default.nix index a4664118f..5d8a0b36b 100644 --- a/python/pkgs/tlsh/default.nix +++ b/python/pkgs/tlsh/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tlsh"; version = "5.0.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "trendmicro"; repo = "tlsh"; - tag = version; + tag = finalAttrs.version; hash = "sha256-cYvXZrd+8ZC5LfucguFFNlEX8FR+AkchmCFButYoiMg="; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace py_ext/setup.py \ - --replace-fail "4.5.0" "${version}" + --replace-fail "4.5.0" "${finalAttrs.version}" ''; nativeBuildInputs = [ cmake ]; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://tlsh.org/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/tlslite-ng/default.nix b/python/pkgs/tlslite-ng/default.nix index 6a45c1afd..dc7236960 100644 --- a/python/pkgs/tlslite-ng/default.nix +++ b/python/pkgs/tlslite-ng/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tlslite-ng"; version = "0.8.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tlsfuzzer"; repo = "tlslite-ng"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lKSFPJ4Dm8o1zUgvXjUUpStV5M+xf7s6wOg2ceYbpbw="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/tlsfuzzer/tlslite-ng"; license = lib.licenses.lgpl21Only; }; -} +}) diff --git a/python/pkgs/tlv8/default.nix b/python/pkgs/tlv8/default.nix index 26650961d..b49a34e6c 100644 --- a/python/pkgs/tlv8/default.nix +++ b/python/pkgs/tlv8/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tlv8"; version = "0.10.0"; - format = "setuptools"; + pyproject = true; # pypi does not contain test files src = fetchFromGitHub { owner = "jlusiardi"; repo = "tlv8_python"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-G35xMFYasKD3LnGi9q8wBmmFvqgtg0HPdC+y82nxRWA="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "tlv8" ]; meta = { @@ -24,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/jlusiardi/tlv8_python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/tokenize-rt/default.nix b/python/pkgs/tokenize-rt/default.nix index daa79375f..2ad22b569 100644 --- a/python/pkgs/tokenize-rt/default.nix +++ b/python/pkgs/tokenize-rt/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tokenize_rt"; version = "6.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hDnAQrMwxVP9vhdY5KBcDtRg27uySmBvEfDe512kytY="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/asottile/tokenize-rt"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tokenizers/default.nix b/python/pkgs/tokenizers/default.nix index 032e01b6c..105c2ec10 100644 --- a/python/pkgs/tokenizers/default.nix +++ b/python/pkgs/tokenizers/default.nix @@ -72,7 +72,7 @@ let }; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tokenizers"; version = "0.22.2"; pyproject = true; @@ -80,12 +80,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "huggingface"; repo = "tokenizers"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XAb3YBaW3hJHFHhRBBCt1KurCijn3O3FQQ/fBuvckVU="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit + inherit (finalAttrs) pname version src @@ -94,7 +94,7 @@ buildPythonPackage rec { hash = "sha256-anYZ7M5OvLOOHDy+sLuZlHQ/cNTk6xHksBHSHa75iY4="; }; - sourceRoot = "${src.name}/bindings/python"; + sourceRoot = "${finalAttrs.src.name}/bindings/python"; nativeBuildInputs = [ cargo @@ -126,4 +126,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/python/pkgs/toml-adapt/default.nix b/python/pkgs/toml-adapt/default.nix index 2067c31a8..2808ed5ae 100644 --- a/python/pkgs/toml-adapt/default.nix +++ b/python/pkgs/toml-adapt/default.nix @@ -7,7 +7,7 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "toml-adapt"; version = "0.3.4"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "firefly-cpp"; repo = "toml-adapt"; - tag = version; + tag = finalAttrs.version; hash = "sha256-GtwE8P4uP3F6wOrzv/vZ4CJR4tzF7CxpWV/8X/hBZhc="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ click toml ]; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "toml-adapt"; }; -} +}) diff --git a/python/pkgs/toml/default.nix b/python/pkgs/toml/default.nix index 6562d3dd4..6ea1fe9f4 100644 --- a/python/pkgs/toml/default.nix +++ b/python/pkgs/toml/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "toml"; version = "0.10.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-s72h0QjV3Zn0og0k2cNI6RxNt6sbdJIAve0vg5zL5o8="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "toml" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/uiri/toml"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tomli-w/default.nix b/python/pkgs/tomli-w/default.nix index f60d95d03..28f66a1ec 100644 --- a/python/pkgs/tomli-w/default.nix +++ b/python/pkgs/tomli-w/default.nix @@ -6,7 +6,7 @@ tomli, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tomli-w"; version = "1.2.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hukkin"; repo = "tomli-w"; - rev = version; + tag = finalAttrs.version; hash = "sha256-Du37ySvAL9iwGec5wbWxwLTYm+kcDSOs5OJ5Sw7R87g="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/hukkin/tomli-w"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tomli/default.nix b/python/pkgs/tomli/default.nix index 9d84a8216..d2444149b 100644 --- a/python/pkgs/tomli/default.nix +++ b/python/pkgs/tomli/default.nix @@ -8,7 +8,7 @@ flit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tomli"; version = "2.4.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hukkin"; repo = "tomli"; - rev = version; + tag = finalAttrs.version; hash = "sha256-MBcmp0SeK/wum3c2c/eu8VEofXDguolHI30QwKahAGE="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/hukkin/tomli"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tomlkit/default.nix b/python/pkgs/tomlkit/default.nix index 57519651a..953c6a60e 100644 --- a/python/pkgs/tomlkit/default.nix +++ b/python/pkgs/tomlkit/default.nix @@ -7,13 +7,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tomlkit"; version = "0.15.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4lu/OIQwBSRiEKEpgndvJ/mcub5nFg4UQ00MDSHuHpc="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { description = "Style-preserving TOML library for Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/toolz/default.nix b/python/pkgs/toolz/default.nix index 9862b248d..0c895ee0e 100644 --- a/python/pkgs/toolz/default.nix +++ b/python/pkgs/toolz/default.nix @@ -5,20 +5,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "toolz"; version = "1.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-J6XHcNBowRDZ7ZMj8k8VQ+g7LzAKaHt4kcGm1Wtpe1s="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools-git-versioning >=2.0",' "" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/pytoolz/toolz"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/toposort/default.nix b/python/pkgs/toposort/default.nix index 4df5b1d5e..782b14519 100644 --- a/python/pkgs/toposort/default.nix +++ b/python/pkgs/toposort/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "toposort"; version = "1.10"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-v7tHnFPQppbqdAJgH05pPJewNng3yImLxkca38o3pr0="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/toposort/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/tornado/default.nix b/python/pkgs/tornado/default.nix index dc965d8bb..2eb3ee325 100644 --- a/python/pkgs/tornado/default.nix +++ b/python/pkgs/tornado/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tornado"; version = "6.5.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tornadoweb"; repo = "tornado"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-d6lKg8yrQqaCeKxdPjQNzv7Nc23U/v8d5x3sE3trRM4="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://www.tornadoweb.org/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/torrequest/default.nix b/python/pkgs/torrequest/default.nix index c2aecd0fb..de35ba7d8 100644 --- a/python/pkgs/torrequest/default.nix +++ b/python/pkgs/torrequest/default.nix @@ -8,13 +8,13 @@ stem, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "torrequest"; version = "0.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-N0XU6j/9qY16A0Njx4ets3qrd72rQAlKTZNzks1NroI="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/erdiaker/torrequest"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/towncrier/default.nix b/python/pkgs/towncrier/default.nix index f78ea8197..9f42845b1 100644 --- a/python/pkgs/towncrier/default.nix +++ b/python/pkgs/towncrier/default.nix @@ -12,13 +12,13 @@ jinja2, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "towncrier"; version = "26.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rOkDFjHHGMwHCRB7h1Xm4xNQ64rNyHevQ98xd63bmlU="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/towncrier/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tox/default.nix b/python/pkgs/tox/default.nix index f068d539d..098a27e37 100644 --- a/python/pkgs/tox/default.nix +++ b/python/pkgs/tox/default.nix @@ -19,13 +19,13 @@ virtualenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tox"; version = "4.34.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7x6Cl0wvXqApVNWQ7guWf61QDDh5smTqGe+5pVTzzGA="; }; @@ -46,8 +46,6 @@ buildPythonPackage rec { virtualenv ]; - doCheck = false; - pythonImportsCheck = [ "tox" ]; meta = { @@ -56,4 +54,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "tox"; }; -} +}) diff --git a/python/pkgs/tpm2-pytss/default.nix b/python/pkgs/tpm2-pytss/default.nix index 077628342..d86833b6e 100644 --- a/python/pkgs/tpm2-pytss/default.nix +++ b/python/pkgs/tpm2-pytss/default.nix @@ -5,6 +5,8 @@ fetchPypi, fetchpatch, fetchpatch2, + # build-system + setuptools, asn1crypto, cffi, cryptography, @@ -21,16 +23,18 @@ let isCross = (stdenv.buildPlatform != stdenv.hostPlatform); in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tpm2-pytss"; version = "2.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IAcRKTeWVvXzw7wW02RhJnKxR9gRkftOufn/n77khBA="; }; + build-system = [ setuptools ]; + patches = [ # libtpms (underneath swtpm) bumped the TPM revision # https://github.com/tpm2-software/tpm2-pytss/pull/593 @@ -76,14 +80,13 @@ buildPythonPackage rec { nativeBuildInputs = [ cffi - pkgconfig # this is the Python module - pkg-config # this is the actual pkg-config tool + pkgconfig setuptools-scm ]; buildInputs = [ tpm2-tss ]; - propagatedBuildInputs = [ + dependencies = [ cffi asn1crypto cryptography @@ -97,4 +100,4 @@ buildPythonPackage rec { description = "TPM2 TSS Python bindings for Enhanced System API (ESYS)"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/tqdm/default.nix b/python/pkgs/tqdm/default.nix index 26c4bd8a1..7f1836b49 100644 --- a/python/pkgs/tqdm/default.nix +++ b/python/pkgs/tqdm/default.nix @@ -7,13 +7,13 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tqdm"; version = "4.70.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VbCw29l0YtBuvukeTawk7U1HAr6Csk8H5sHSfgjOoiA="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/tqdm/tqdm"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/traceback2/default.nix b/python/pkgs/traceback2/default.nix index 8a854f404..c4db4e210 100644 --- a/python/pkgs/traceback2/default.nix +++ b/python/pkgs/traceback2/default.nix @@ -8,13 +8,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "traceback2"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BazGegmYDC7P7dNCP3rgEEg57MtV/GRXc+HKoJUcMDA="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { description = "Backport of traceback to older supported Pythons"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/tracerite/default.nix b/python/pkgs/tracerite/default.nix index 3cc29819e..6aac7c6e3 100644 --- a/python/pkgs/tracerite/default.nix +++ b/python/pkgs/tracerite/default.nix @@ -9,7 +9,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tracerite"; version = "2.3.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sanic-org"; repo = "tracerite"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UXIQc5rXVaZuZj5xu2X9H38vKWAM+AoKrKfudovUhwA="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { unlicense ]; }; -} +}) diff --git a/python/pkgs/trafilatura/default.nix b/python/pkgs/trafilatura/default.nix index 31a4de1d2..dc8560db7 100644 --- a/python/pkgs/trafilatura/default.nix +++ b/python/pkgs/trafilatura/default.nix @@ -20,7 +20,6 @@ buildPythonPackage (finalAttrs: { pname = "trafilatura"; version = "2.2.0"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "adbar"; diff --git a/python/pkgs/trailrunner/default.nix b/python/pkgs/trailrunner/default.nix index 87b0a9898..c3fd4c1d9 100644 --- a/python/pkgs/trailrunner/default.nix +++ b/python/pkgs/trailrunner/default.nix @@ -7,7 +7,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "trailrunner"; version = "1.4.0"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "omnilib"; repo = "trailrunner"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qtEBr22yyj6WcSfyYr/4r0IuuMJ6chFFqnmb+uMfQPA="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ pathspec ]; + dependencies = [ pathspec ]; pythonImportsCheck = [ "trailrunner" ]; meta = { @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/omnilib/trailrunner"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/traitlets/default.nix b/python/pkgs/traitlets/default.nix index 8806410ce..22224bfbe 100644 --- a/python/pkgs/traitlets/default.nix +++ b/python/pkgs/traitlets/default.nix @@ -7,7 +7,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "traitlets"; version = "5.16.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ipython"; repo = "traitlets"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lBVPRZU3fK1ha7tLi0d2wlBcoUVBZS8bjt+c16jDi/c="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/ipython/traitlets"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/traits/default.nix b/python/pkgs/traits/default.nix index 8456118af..aaeb389b1 100644 --- a/python/pkgs/traits/default.nix +++ b/python/pkgs/traits/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "traits"; version = "7.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-r0d1dH4R4F/+E9O6Rj2S9n8fPRqeT0a6M6ROoisMlkQ="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/traits/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/traittypes/default.nix b/python/pkgs/traittypes/default.nix index f18fdf58f..ca9b6e1b3 100644 --- a/python/pkgs/traittypes/default.nix +++ b/python/pkgs/traittypes/default.nix @@ -6,7 +6,7 @@ traitlets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "traittypes"; version = "0.2.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter-widgets"; repo = "traittypes"; - tag = version; + tag = finalAttrs.version; hash = "sha256-RwEZs4QFK+IrPFPBI7+jnQSFQryQFzEbrnOF8OyExuk="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter-widgets/traittypes"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/trakit/default.nix b/python/pkgs/trakit/default.nix index 54b6a6323..a0bc26d4e 100644 --- a/python/pkgs/trakit/default.nix +++ b/python/pkgs/trakit/default.nix @@ -10,7 +10,7 @@ rebulk, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "trakit"; version = "0.3.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ratoaq2"; repo = "trakit"; - tag = version; + tag = finalAttrs.version; hash = "sha256-uKLuXkvyZWjCMx5MHlsTKvTJwHYYV+wnRyE+D8BtCC0="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/ratoaq2/trakit"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/transaction/default.nix b/python/pkgs/transaction/default.nix index f8174612d..6ffd78b7e 100644 --- a/python/pkgs/transaction/default.nix +++ b/python/pkgs/transaction/default.nix @@ -6,7 +6,7 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "transaction"; version = "5.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "transaction"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8yvA2dvB69+EqsAa+hc93rgg6D64lcajl6JgFabhjwY="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://transaction.readthedocs.io/"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/transformers/default.nix b/python/pkgs/transformers/default.nix index 707420b88..a9667d4c1 100644 --- a/python/pkgs/transformers/default.nix +++ b/python/pkgs/transformers/default.nix @@ -40,8 +40,6 @@ buildPythonPackage (finalAttrs: { typer ]; - doCheck = false; - pythonImportsCheck = [ "transformers" ]; meta = { diff --git a/python/pkgs/transforms3d/default.nix b/python/pkgs/transforms3d/default.nix index 7483b7b07..925781c98 100644 --- a/python/pkgs/transforms3d/default.nix +++ b/python/pkgs/transforms3d/default.nix @@ -7,7 +7,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "transforms3d"; version = "0.4.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matthew-brett"; repo = "transforms3d"; - tag = version; + tag = finalAttrs.version; hash = "sha256-9wICu7zNYF54e6xcDpZxqctB4GVu5Knf79Z36016Rpw="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { description = "Convert between various geometric transformations"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/transitions/default.nix b/python/pkgs/transitions/default.nix index 472c68be4..88045b1be 100644 --- a/python/pkgs/transitions/default.nix +++ b/python/pkgs/transitions/default.nix @@ -12,13 +12,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "transitions"; version = "0.9.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iB+3W7FlTtVdhgYLsGfyxxb44VX1e7c/1ETlNxOq/sg="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { description = "Lightweight, object-oriented finite state machine implementation in Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/translationstring/default.nix b/python/pkgs/translationstring/default.nix index df15900db..28ee5894c 100644 --- a/python/pkgs/translationstring/default.nix +++ b/python/pkgs/translationstring/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "translationstring"; version = "1.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-v5R1ONduaboSqxcoOxA1Wp7PvAeOYSNEP0PyEH9jdvM="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://pylonsproject.org/"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/translitcodec/default.nix b/python/pkgs/translitcodec/default.nix index 20d795865..0ecbe4603 100644 --- a/python/pkgs/translitcodec/default.nix +++ b/python/pkgs/translitcodec/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "translitcodec"; version = "0.7.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-O+eXXGMOwPHdWzcSFgyZGpd2EymFrtJYjLoIO6APo8g="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Unicode to 8-bit charset transliteration codec"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/transmission-rpc/default.nix b/python/pkgs/transmission-rpc/default.nix index 201c93bb2..bb8fa7746 100644 --- a/python/pkgs/transmission-rpc/default.nix +++ b/python/pkgs/transmission-rpc/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "transmission-rpc"; version = "7.0.12"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Trim21"; repo = "transmission-rpc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BxbaBUzu/KPn/4AoRmIEBI+v3+mjJAXF9lzm0wNb25c="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/Trim21/transmission-rpc"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tree-sitter-c-sharp/default.nix b/python/pkgs/tree-sitter-c-sharp/default.nix index 746fcf011..73bc7eb50 100644 --- a/python/pkgs/tree-sitter-c-sharp/default.nix +++ b/python/pkgs/tree-sitter-c-sharp/default.nix @@ -9,7 +9,7 @@ tree-sitter, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tree-sitter-c-sharp"; version = "0.23.5"; pyproject = true; @@ -17,12 +17,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-N5AAlwQFGGi47cj0m7Te08bA486gwY6NBOx4Qcy4lpo="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit (finalAttrs) src; hash = "sha256-fPjCguwWE+beoOiLR2EyMtogiv1JRXI8NP4vCuvGHss="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tree-sitter-embedded-template/default.nix b/python/pkgs/tree-sitter-embedded-template/default.nix index 2854a6685..979bb4d6f 100644 --- a/python/pkgs/tree-sitter-embedded-template/default.nix +++ b/python/pkgs/tree-sitter-embedded-template/default.nix @@ -9,7 +9,7 @@ tree-sitter, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tree-sitter-embedded-template"; version = "0.25.0"; pyproject = true; @@ -17,12 +17,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nBQain0Lc21jOgQFfvkyq615ZmT8qdMxtqIoUcOcO3A="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit (finalAttrs) src; hash = "sha256-C+P/fALEmRDrX59diXS/cdzffvJyn0qnCUD5nFsW+ww="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tree-sitter-javascript/default.nix b/python/pkgs/tree-sitter-javascript/default.nix index 8e0615219..6f8c31ad0 100644 --- a/python/pkgs/tree-sitter-javascript/default.nix +++ b/python/pkgs/tree-sitter-javascript/default.nix @@ -6,7 +6,7 @@ tree-sitter, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tree-sitter-javascript"; version = "0.25.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2Jj/SUG+k8lHlGSuPZvHjJojvQFgDiZHZzH8xLu7suE="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { }; # There are no tests - doCheck = false; pythonImportsCheck = [ "tree_sitter_javascript" ]; meta = { @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tree-sitter-json/default.nix b/python/pkgs/tree-sitter-json/default.nix index d3055bf19..ed8faa1a0 100644 --- a/python/pkgs/tree-sitter-json/default.nix +++ b/python/pkgs/tree-sitter-json/default.nix @@ -6,7 +6,7 @@ tree-sitter, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tree-sitter-json"; version = "0.24.8"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DNZC2cTy1C8OaMOpEHM6NoRtOIbLaBf0CLXXWCKODlw="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { }; # There are no tests - doCheck = false; pythonImportsCheck = [ "tree_sitter_json" ]; meta = { @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/tree-sitter/tree-sitter-json"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tree-sitter-python/default.nix b/python/pkgs/tree-sitter-python/default.nix index fcbdb4d29..b859735f3 100644 --- a/python/pkgs/tree-sitter-python/default.nix +++ b/python/pkgs/tree-sitter-python/default.nix @@ -29,7 +29,6 @@ buildPythonPackage (finalAttrs: { }; # There are no tests - doCheck = false; pythonImportsCheck = [ "tree_sitter_python" ]; meta = { diff --git a/python/pkgs/tree-sitter-rust/default.nix b/python/pkgs/tree-sitter-rust/default.nix index 163030779..35fd5f093 100644 --- a/python/pkgs/tree-sitter-rust/default.nix +++ b/python/pkgs/tree-sitter-rust/default.nix @@ -6,7 +6,7 @@ tree-sitter, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tree-sitter-rust"; version = "0.24.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Ls6tB6IxXDQDWwx0BJ7RgbheelC4MH8z97E7wwhkDcY="; }; @@ -29,7 +29,6 @@ buildPythonPackage rec { }; # There are no tests - doCheck = false; pythonImportsCheck = [ "tree_sitter_rust" ]; meta = { @@ -37,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/tree-sitter/tree-sitter-rust"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tree-sitter-yaml/default.nix b/python/pkgs/tree-sitter-yaml/default.nix index 0feae63f0..e01d1e51c 100644 --- a/python/pkgs/tree-sitter-yaml/default.nix +++ b/python/pkgs/tree-sitter-yaml/default.nix @@ -9,7 +9,7 @@ tree-sitter, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tree-sitter-yaml"; version = "0.7.2"; pyproject = true; @@ -17,12 +17,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-yaml"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BX6TOfAZLW+0h2TNsgsLC9K2lfirraCWlBN2vCKiXQ4="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit (finalAttrs) src; hash = "sha256-mrLuGmauboKHHk0zADPXpwgZfc83syXk0jmD93Y9Jq4="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/tree-sitter/default.nix b/python/pkgs/tree-sitter/default.nix index d02d582fc..07defdd01 100644 --- a/python/pkgs/tree-sitter/default.nix +++ b/python/pkgs/tree-sitter/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tree-sitter"; version = "0.26.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tree-sitter"; repo = "py-tree-sitter"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-f1D7MdAWqVaYY0M0d+mR+AGNJjXOc41NGqbYG6ruLR4="; fetchSubmodules = true; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/tree-sitter/py-tree-sitter"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/treelib/default.nix b/python/pkgs/treelib/default.nix index 491f77dee..d311e8a37 100644 --- a/python/pkgs/treelib/default.nix +++ b/python/pkgs/treelib/default.nix @@ -6,7 +6,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "treelib"; version = "1.8.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "caesar0301"; repo = "treelib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jvaZVy+FUcCcIdvWK6zFL8IBVH+hMiPMmv5shFXLo0k="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/caesar0301/treelib"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/treescope/default.nix b/python/pkgs/treescope/default.nix index 87ce6d6b5..5f9f14cec 100644 --- a/python/pkgs/treescope/default.nix +++ b/python/pkgs/treescope/default.nix @@ -15,7 +15,7 @@ palettable, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "treescope"; version = "0.1.10"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google-deepmind"; repo = "treescope"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SfycwuI/B7S/rKkaqxtnJI26q89313pvj/Xsomg6qyA="; }; @@ -46,4 +46,4 @@ buildPythonPackage rec { homepage = "https://github.com/google-deepmind/treescope"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/treq/default.nix b/python/pkgs/treq/default.nix index b09d42dbb..730d42cc3 100644 --- a/python/pkgs/treq/default.nix +++ b/python/pkgs/treq/default.nix @@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: { hatchling ]; - propagatedBuildInputs = [ + dependencies = [ attrs hyperlink incremental diff --git a/python/pkgs/trie/default.nix b/python/pkgs/trie/default.nix index 001c16448..da4add20e 100644 --- a/python/pkgs/trie/default.nix +++ b/python/pkgs/trie/default.nix @@ -11,7 +11,7 @@ sortedcontainers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "trie"; version = "4.0.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "py-trie"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-njjIvBYavpMKr1DsBeWzHQzeP+3ACwpItUySxMcTlNY="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/py-trie"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/trino-python-client/default.nix b/python/pkgs/trino-python-client/default.nix index 09e80c1f5..3541766d6 100644 --- a/python/pkgs/trino-python-client/default.nix +++ b/python/pkgs/trino-python-client/default.nix @@ -19,7 +19,7 @@ zstandard, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "trino-python-client"; version = "0.339.0"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "trino-python-client"; owner = "trinodb"; - tag = version; + tag = finalAttrs.version; hash = "sha256-gdxSxCbFBuOGJuS5j8bJHf4IA0B/umFRiDGNU4ezZkU="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/trinodb/trino-python-client"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/trio-typing/default.nix b/python/pkgs/trio-typing/default.nix index e0a47a0d8..4d8157dc3 100644 --- a/python/pkgs/trio-typing/default.nix +++ b/python/pkgs/trio-typing/default.nix @@ -10,7 +10,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "trio-typing"; version = "0.10.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-trio"; repo = "trio-typing"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6IhPdPj+bHzMyt3uyqfX2UOuCmV8lb6vmgdlc5+9/4g="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { asl20 ]; }; -} +}) diff --git a/python/pkgs/trio-websocket/default.nix b/python/pkgs/trio-websocket/default.nix index b2ac95d34..9f8cb3d4b 100644 --- a/python/pkgs/trio-websocket/default.nix +++ b/python/pkgs/trio-websocket/default.nix @@ -7,7 +7,7 @@ wsproto, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "trio-websocket"; version = "0.12.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "HyperionGray"; repo = "trio-websocket"; - rev = version; + tag = finalAttrs.version; hash = "sha256-TGFf4WUeZDrjp/UiQ9O/GoaK5BRC2aaGZVPfqZ4Ip9I="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/HyperionGray/trio-websocket"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/trio/default.nix b/python/pkgs/trio/default.nix index 8d6c3a54b..c851e628c 100644 --- a/python/pkgs/trio/default.nix +++ b/python/pkgs/trio/default.nix @@ -23,11 +23,10 @@ let pytest-trio' = (pytest-trio.override { trio = null; }).overrideAttrs { # `pythonRemoveDeps` is not working properly dontCheckRuntimeDeps = true; - doCheck = false; pythonImportsCheck = [ ]; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "trio"; version = "0.34.0"; pyproject = true; @@ -35,7 +34,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-trio"; repo = "trio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5ooFU1TP9CU0+dpIWs8cw+gHvBzntCnxejpBQn/QffE="; }; @@ -57,4 +56,4 @@ buildPythonPackage rec { asl20 ]; }; -} +}) diff --git a/python/pkgs/tritonclient/default.nix b/python/pkgs/tritonclient/default.nix index 87a0c1122..062aa5fb8 100644 --- a/python/pkgs/tritonclient/default.nix +++ b/python/pkgs/tritonclient/default.nix @@ -18,7 +18,7 @@ let version = "2.68.0"; format = "wheel"; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { inherit pname version format; src = @@ -43,7 +43,7 @@ buildPythonPackage rec { hashes.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - propagatedBuildInputs = [ + dependencies = [ numpy python-rapidjson urllib3 @@ -70,4 +70,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/trove-classifiers/default.nix b/python/pkgs/trove-classifiers/default.nix index d902671b6..9dafbb6d8 100644 --- a/python/pkgs/trove-classifiers/default.nix +++ b/python/pkgs/trove-classifiers/default.nix @@ -27,7 +27,6 @@ buildPythonPackage (finalAttrs: { setuptools ]; - doCheck = false; # avoid infinite recursion with hatchling pythonImportsCheck = [ "trove_classifiers" ]; passthru.tests.trove-classifiers = finalAttrs.finalPackage.overrideAttrs { doInstallCheck = true; }; diff --git a/python/pkgs/trubar/default.nix b/python/pkgs/trubar/default.nix index fc4cb8461..7a994d479 100644 --- a/python/pkgs/trubar/default.nix +++ b/python/pkgs/trubar/default.nix @@ -8,7 +8,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "trubar"; version = "0.3.4"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "janezd"; repo = "trubar"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ChKmeACEMnFcMYSdkdVlFiE3td171ihUS2A+qsP5ASk="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/janezd/trubar"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/trueskill/default.nix b/python/pkgs/trueskill/default.nix index 0ce2ea863..592b8d354 100644 --- a/python/pkgs/trueskill/default.nix +++ b/python/pkgs/trueskill/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "trueskill"; version = "0.4.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nWK0jSQoNp1xK9m+z/n5osqjJeGiq1+TktNL/3V4Z7s="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://trueskill.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/trustme/default.nix b/python/pkgs/trustme/default.nix index 930f2ad3a..dbb685c3e 100644 --- a/python/pkgs/trustme/default.nix +++ b/python/pkgs/trustme/default.nix @@ -7,13 +7,13 @@ idna, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "trustme"; version = "1.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZSi6K7x/LbQfM4JcjdE+Pj650zS6D5CXE8jDE59K5H8="; }; @@ -24,8 +24,6 @@ buildPythonPackage rec { idna ]; - doCheck = false; - pythonImportsCheck = [ "trustme" ]; meta = { @@ -36,4 +34,4 @@ buildPythonPackage rec { asl20 ]; }; -} +}) diff --git a/python/pkgs/truststore/default.nix b/python/pkgs/truststore/default.nix index c8c6f02d0..0045782c5 100644 --- a/python/pkgs/truststore/default.nix +++ b/python/pkgs/truststore/default.nix @@ -5,13 +5,13 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "truststore"; version = "0.10.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nZG9Q2RjrV5O5KunZmKN1s1wEM8+JGF1azMDcQ7rwwE="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Verify certificates using native system trust stores"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/trx-python/default.nix b/python/pkgs/trx-python/default.nix index 246491d3d..92380e257 100644 --- a/python/pkgs/trx-python/default.nix +++ b/python/pkgs/trx-python/default.nix @@ -11,7 +11,7 @@ typer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "trx-python"; version = "0.5.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tee-ar-ex"; repo = "trx-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2rWFjnvOIMT++tk9Dcf3j/rsfGf+uQjueeR0pKMZqZM="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/tee-ar-ex/trx-python"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/tubes/default.nix b/python/pkgs/tubes/default.nix index 8c63f38e9..a971b9fb6 100644 --- a/python/pkgs/tubes/default.nix +++ b/python/pkgs/tubes/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, python, six, twisted, @@ -10,7 +12,7 @@ buildPythonPackage { pname = "tubes"; version = "0.2.1-unstable-2023-11-06"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "twisted"; @@ -19,7 +21,9 @@ buildPythonPackage { hash = "sha256-E8brnt8CtTEEP1KQTsTsgnl54H4zRGp+1IuoI/Qf5NA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ six twisted ]; diff --git a/python/pkgs/tweepy/default.nix b/python/pkgs/tweepy/default.nix index 1ac3230f5..ce6839b7d 100644 --- a/python/pkgs/tweepy/default.nix +++ b/python/pkgs/tweepy/default.nix @@ -11,7 +11,7 @@ vcrpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tweepy"; version = "4.17.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tweepy"; repo = "tweepy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Jr/62vXxBIiZGQeM5bbqnHDP9GCxrbJmCF2oiYglLbE="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/tweepy/tweepy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/twiggy/default.nix b/python/pkgs/twiggy/default.nix index 9697c2bea..d16172535 100644 --- a/python/pkgs/twiggy/default.nix +++ b/python/pkgs/twiggy/default.nix @@ -6,13 +6,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "Twiggy"; version = "0.5.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eTiEAnWXL2zomZSlvfsLhPA4YwGgQ6lgr2NklS54/+Q="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "http://twiggy.wearpants.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/twine/default.nix b/python/pkgs/twine/default.nix index 97c65b7d4..015bfa3ec 100644 --- a/python/pkgs/twine/default.nix +++ b/python/pkgs/twine/default.nix @@ -16,13 +16,13 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "twine"; version = "7.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hc2ynFGO/vhnNgrkrNSw39YchlSiL8oI5vhTnwUCIXc="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/twine"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/twisted/default.nix b/python/pkgs/twisted/default.nix index 18c551772..24e649e03 100644 --- a/python/pkgs/twisted/default.nix +++ b/python/pkgs/twisted/default.nix @@ -42,7 +42,7 @@ httpx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "twisted"; version = "26.4.0"; pyproject = true; @@ -50,7 +50,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "twisted"; repo = "twisted"; - tag = "twisted-${version}"; + tag = "twisted-${finalAttrs.version}"; hash = "sha256-D6vDa+8qwjryKnElPBZgXCNokMX2l3i2bMdtk4FhEp4="; }; @@ -235,4 +235,4 @@ buildPythonPackage rec { description = "Asynchronous networking framework written in Python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/twitter/default.nix b/python/pkgs/twitter/default.nix index 912ee04ed..7c88e8e38 100644 --- a/python/pkgs/twitter/default.nix +++ b/python/pkgs/twitter/default.nix @@ -7,13 +7,13 @@ certifi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "twitter"; version = "2.0a2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CzjsEI184ruO48kOHVbrexkZgJ01gKTq/5gkjvTNmqc="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://mike.verdone.ca/twitter/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/txaio/default.nix b/python/pkgs/txaio/default.nix index eab5a816b..991f6e2da 100644 --- a/python/pkgs/txaio/default.nix +++ b/python/pkgs/txaio/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "txaio"; version = "26.6.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PukAsjMck0V1MP3bzMGjIMTi16yPkHPQHD++h3YsyzU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/crossbario/txaio"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/txamqp/default.nix b/python/pkgs/txamqp/default.nix index 7c3a2995e..f5084f239 100644 --- a/python/pkgs/txamqp/default.nix +++ b/python/pkgs/txamqp/default.nix @@ -2,25 +2,33 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, + six, twisted, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "txamqp"; version = "0.8.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "txAMQP"; - inherit version; + inherit (finalAttrs) version; sha256 = "0jd9864k3csc06kipiwzjlk9mq4054s8kzk5q1cfnxj8572s4iv4"; }; - propagatedBuildInputs = [ twisted ]; + build-system = [ setuptools ]; + + dependencies = [ + six + twisted + ]; meta = { homepage = "https://github.com/txamqp/txamqp"; description = "Library for communicating with AMQP peers and brokers using Twisted"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/txredisapi/default.nix b/python/pkgs/txredisapi/default.nix index 5bbce99ae..429cfcde5 100644 --- a/python/pkgs/txredisapi/default.nix +++ b/python/pkgs/txredisapi/default.nix @@ -7,7 +7,7 @@ twisted, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "txredisapi"; version = "1.5.0"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "IlyaSkriblovsky"; repo = "txredisapi"; - tag = version; + tag = finalAttrs.version; hash = "sha256-PXWw2AGeEbaxh9PG7MqTnhU5/5S90GQuq5PNwGIoKxY="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ six twisted ] @@ -34,4 +34,4 @@ buildPythonPackage rec { description = "Non-blocking redis client for python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/txrequests/default.nix b/python/pkgs/txrequests/default.nix index 19a8526f5..81dd6b102 100644 --- a/python/pkgs/txrequests/default.nix +++ b/python/pkgs/txrequests/default.nix @@ -2,33 +2,36 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, twisted, requests, cryptography, unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "txrequests"; version = "0.9.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "b452a1cafa4d005678f6fa47922a330feb4907d5b4732d1841ca98e89f1362e1"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ twisted requests cryptography ]; # Require network access - doCheck = false; meta = { description = "Asynchronous Python HTTP for Humans"; homepage = "https://github.com/tardyp/txrequests"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/txtorcon/default.nix b/python/pkgs/txtorcon/default.nix index 0a50dceeb..480baede1 100644 --- a/python/pkgs/txtorcon/default.nix +++ b/python/pkgs/txtorcon/default.nix @@ -10,13 +10,13 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "txtorcon"; version = "26.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BAjwY6n8uN9Snayle7c3PqD1tOuv/NUQN1S3xWF3P2g="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/meejah/txtorcon"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/txzmq/default.nix b/python/pkgs/txzmq/default.nix index e8206cdd3..f708c20f4 100644 --- a/python/pkgs/txzmq/default.nix +++ b/python/pkgs/txzmq/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pyzmq, twisted, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "txzmq"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "txZMQ"; hash = "sha256-jWB9C/CcqUYAuOQvByHb5D7lOgRwGCNErHrOfljcYXc="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyzmq twisted ]; @@ -29,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/smira/txZMQ"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/typed-settings/default.nix b/python/pkgs/typed-settings/default.nix index ab5b7698c..0c4f4ec36 100644 --- a/python/pkgs/typed-settings/default.nix +++ b/python/pkgs/typed-settings/default.nix @@ -17,14 +17,14 @@ rich-click, sybil, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "typed-settings"; version = "26.0.0"; pyproject = true; src = fetchPypi { pname = "typed_settings"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-iNDaM+RAoEGfGU4kuS7M5MEufBZbW5Zpf+QUDIPThuo="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://gitlab.com/sscherfke/typed-settings"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/typeguard/default.nix b/python/pkgs/typeguard/default.nix index e3cbd9758..ceffca173 100644 --- a/python/pkgs/typeguard/default.nix +++ b/python/pkgs/typeguard/default.nix @@ -7,13 +7,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "typeguard"; version = "4.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-50FPCRETF94+M13pLNOXxcDKALHMFnbeEuHURKebPyE="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/agronholm/typeguard"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/typepy/default.nix b/python/pkgs/typepy/default.nix index 155f33aba..848c5cb17 100644 --- a/python/pkgs/typepy/default.nix +++ b/python/pkgs/typepy/default.nix @@ -10,7 +10,7 @@ tcolorpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "typepy"; version = "2.0.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thombashi"; repo = "typepy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QzfzAWQjKQBIVkgH+dPVVhlk717R71DiOhXZyfooJus="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/thombashi/typepy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/typer/default.nix b/python/pkgs/typer/default.nix index 2bdfefe27..b42532fac 100644 --- a/python/pkgs/typer/default.nix +++ b/python/pkgs/typer/default.nix @@ -10,7 +10,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "typer"; version = "0.27.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fastapi"; repo = "typer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vBHSJoyIQawkqqhbPJGKzPjBPm42OR/Ref/k6XFJTi8="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://typer.tiangolo.com/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/types-beautifulsoup4/default.nix b/python/pkgs/types-beautifulsoup4/default.nix index 7e5e95137..7953f2708 100644 --- a/python/pkgs/types-beautifulsoup4/default.nix +++ b/python/pkgs/types-beautifulsoup4/default.nix @@ -6,14 +6,14 @@ types-html5lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-beautifulsoup4"; version = "4.12.0.20250516"; pyproject = true; src = fetchPypi { pname = "types_beautifulsoup4"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-qhndc7M7cNYpat+S2oq4oMlFxQfm+31dtVNBXMd7QX4="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { dependencies = [ types-html5lib ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "bs4-stubs" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/types-beautifulsoup4/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-certifi/default.nix b/python/pkgs/types-certifi/default.nix index 3f1aaae9b..495158ad5 100644 --- a/python/pkgs/types-certifi/default.nix +++ b/python/pkgs/types-certifi/default.nix @@ -18,7 +18,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # No tests - doCheck = false; meta = { description = "Typing stubs for certifi"; diff --git a/python/pkgs/types-cffi/default.nix b/python/pkgs/types-cffi/default.nix index 20ae5d1f1..56a2d963d 100644 --- a/python/pkgs/types-cffi/default.nix +++ b/python/pkgs/types-cffi/default.nix @@ -6,14 +6,14 @@ types-setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-cffi"; version = "2.1.0.20260827"; pyproject = true; src = fetchPypi { pname = "types_cffi"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-U9FgR3GtT/CaGpDW9pgKs2vrtsOUdtzFu/SJb6UQ1zY="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-colorama/default.nix b/python/pkgs/types-colorama/default.nix index 50af38fe5..beab3f6b6 100644 --- a/python/pkgs/types-colorama/default.nix +++ b/python/pkgs/types-colorama/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-colorama"; version = "0.4.15.20260508"; pyproject = true; src = fetchPypi { pname = "types_colorama"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-OokWA55XRSvSH1fmdOHyIcqeTzGYk8Xju9N7hFwn2OY="; }; @@ -23,4 +23,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-decorator/default.nix b/python/pkgs/types-decorator/default.nix index 55343b768..cdf845d0f 100644 --- a/python/pkgs/types-decorator/default.nix +++ b/python/pkgs/types-decorator/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-decorator"; version = "5.2.0.20260712"; pyproject = true; src = fetchPypi { pname = "types_decorator"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-KJDwX+PGVUa69QAP1fHu1NHJW65VFuI+FzW3taTdmMY="; }; @@ -23,4 +23,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-deprecated/default.nix b/python/pkgs/types-deprecated/default.nix index e6f2a14b8..433f300c0 100644 --- a/python/pkgs/types-deprecated/default.nix +++ b/python/pkgs/types-deprecated/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # Modules has no tests - doCheck = false; pythonImportsCheck = [ "deprecated-stubs" ]; diff --git a/python/pkgs/types-docutils/default.nix b/python/pkgs/types-docutils/default.nix index cdca767b8..7d25e647e 100644 --- a/python/pkgs/types-docutils/default.nix +++ b/python/pkgs/types-docutils/default.nix @@ -25,7 +25,6 @@ buildPythonPackage (finalAttrs: { ''; # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "docutils-stubs" ]; diff --git a/python/pkgs/types-freezegun/default.nix b/python/pkgs/types-freezegun/default.nix index 01e311460..2786c0031 100644 --- a/python/pkgs/types-freezegun/default.nix +++ b/python/pkgs/types-freezegun/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "1.1.10"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "types-freezegun"; inherit (finalAttrs) version; @@ -21,7 +19,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "freezegun-stubs" ]; diff --git a/python/pkgs/types-html5lib/default.nix b/python/pkgs/types-html5lib/default.nix index 5f71c8d2b..3f0800d1c 100644 --- a/python/pkgs/types-html5lib/default.nix +++ b/python/pkgs/types-html5lib/default.nix @@ -6,14 +6,14 @@ types-webencodings, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-html5lib"; version = "1.1.11.20260518"; pyproject = true; src = fetchPypi { pname = "types_html5lib"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-TzPAh8sRGdZcTIDspDI8K1Afnq+K+WFri3Mu1Njq6Po="; }; @@ -22,7 +22,6 @@ buildPythonPackage rec { dependencies = [ types-webencodings ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "html5lib-stubs" ]; @@ -31,4 +30,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/types-html5lib/"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-mock/default.nix b/python/pkgs/types-mock/default.nix index 187224bb4..a6d43c00f 100644 --- a/python/pkgs/types-mock/default.nix +++ b/python/pkgs/types-mock/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types_mock"; version = "5.2.0.20260518"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Sa+cGKrEyqkODh6EN+IWDNiz8SYFPa5kU9ZbOTWQ/Pk="; }; @@ -22,4 +22,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/types-mock"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-paramiko/default.nix b/python/pkgs/types-paramiko/default.nix index 4d4bed322..ed50fc46e 100644 --- a/python/pkgs/types-paramiko/default.nix +++ b/python/pkgs/types-paramiko/default.nix @@ -6,14 +6,14 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-paramiko"; version = "5.0.0.20260724"; pyproject = true; src = fetchPypi { pname = "types_paramiko"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-N+fz8hls8YfIlkmtg2YhxnW8MYNp2A+ngFFQekrncMk="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-pillow/default.nix b/python/pkgs/types-pillow/default.nix index 1eba00967..c8de8f43d 100644 --- a/python/pkgs/types-pillow/default.nix +++ b/python/pkgs/types-pillow/default.nix @@ -2,21 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-pillow"; version = "10.2.0.20240822"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "types-Pillow"; hash = "sha256-VZ+1Ki75kcMm5KDSCsyzu2Onuo1A60k+DssDELpS8NM="; }; + build-system = [ setuptools ]; + # Modules doesn't have tests - doCheck = false; pythonImportsCheck = [ "PIL-stubs" ]; @@ -25,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-protobuf/default.nix b/python/pkgs/types-protobuf/default.nix index 665c7c5fa..feb3ef26c 100644 --- a/python/pkgs/types-protobuf/default.nix +++ b/python/pkgs/types-protobuf/default.nix @@ -5,21 +5,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-protobuf"; version = "7.35.1.20260906"; pyproject = true; src = fetchPypi { pname = "types_protobuf"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-79Gjhi1Mln2tVRLvjVaxUwrITxgsQXNblABHVlGMSZg="; }; build-system = [ setuptools ]; # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "google-stubs" ]; @@ -28,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-psutil/default.nix b/python/pkgs/types-psutil/default.nix index 1385509d0..014c5463c 100644 --- a/python/pkgs/types-psutil/default.nix +++ b/python/pkgs/types-psutil/default.nix @@ -5,21 +5,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-psutil"; version = "7.2.2.20260906"; pyproject = true; src = fetchPypi { pname = "types_psutil"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-k6vyLPmmK5Ffck5DO95wKZWsJ0hlQl/Up20dm1go2ho="; }; build-system = [ setuptools ]; # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "psutil-stubs" ]; @@ -28,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-psycopg2/default.nix b/python/pkgs/types-psycopg2/default.nix index 158d509a5..e7b5c3889 100644 --- a/python/pkgs/types-psycopg2/default.nix +++ b/python/pkgs/types-psycopg2/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-psycopg2"; version = "2.9.21.20260724"; pyproject = true; src = fetchPypi { pname = "types_psycopg2"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-2zEDHDfegjorIceHy4SDIXT92iqZqLGvZIIG8ZzDL4w="; }; @@ -20,11 +20,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "psycopg2-stubs" ]; - doCheck = false; - meta = { description = "Typing stubs for psycopg2"; homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-pyopenssl/default.nix b/python/pkgs/types-pyopenssl/default.nix index 4832f09ee..92da65b84 100644 --- a/python/pkgs/types-pyopenssl/default.nix +++ b/python/pkgs/types-pyopenssl/default.nix @@ -7,13 +7,13 @@ types-cffi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-pyOpenSSL"; version = "24.1.0.20240722"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-R5E7RnigHYefUDoSBERoIh7YV2JjwVQNywSEyiGwjDk="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-python-dateutil/default.nix b/python/pkgs/types-python-dateutil/default.nix index b7152f86d..e275fed6c 100644 --- a/python/pkgs/types-python-dateutil/default.nix +++ b/python/pkgs/types-python-dateutil/default.nix @@ -5,21 +5,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-python-dateutil"; version = "2.9.0.20260807"; pyproject = true; src = fetchPypi { pname = "types_python_dateutil"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-4LipDUZMhoTGa3uORVbZB0r93cxWykUyPwmHE0+ecDQ="; }; build-system = [ setuptools ]; # Modules doesn't have tests - doCheck = false; pythonImportsCheck = [ "dateutil-stubs" ]; @@ -28,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-pytz/default.nix b/python/pkgs/types-pytz/default.nix index 54d2f3e69..cc9de7eb6 100644 --- a/python/pkgs/types-pytz/default.nix +++ b/python/pkgs/types-pytz/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-pytz"; version = "2026.3.1.20260727"; pyproject = true; src = fetchPypi { pname = "types_pytz"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Q2QHW2hn3RWyELuMHSlyfWCZFxKbRWAN7+HUs+2l7Lk="; }; @@ -23,4 +23,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-pyyaml/default.nix b/python/pkgs/types-pyyaml/default.nix index 765dab3a6..9cf5dcb8b 100644 --- a/python/pkgs/types-pyyaml/default.nix +++ b/python/pkgs/types-pyyaml/default.nix @@ -19,7 +19,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "yaml-stubs" ]; diff --git a/python/pkgs/types-redis/default.nix b/python/pkgs/types-redis/default.nix index e9bea196d..8b796598e 100644 --- a/python/pkgs/types-redis/default.nix +++ b/python/pkgs/types-redis/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-redis"; version = "4.6.0.20241004"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XxfSs/kJGrdThBU7+idmGf+hz2o42mDhDV5nScxbkC4="; }; @@ -25,7 +25,6 @@ buildPythonPackage rec { ]; # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "redis-stubs" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-regex/default.nix b/python/pkgs/types-regex/default.nix index 5ffa01811..c53b07cc4 100644 --- a/python/pkgs/types-regex/default.nix +++ b/python/pkgs/types-regex/default.nix @@ -21,7 +21,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "regex-stubs" ]; # Module has no tests - doCheck = false; meta = { description = "Typing stubs for regex"; diff --git a/python/pkgs/types-requests/default.nix b/python/pkgs/types-requests/default.nix index dc08d61de..c31adeb19 100644 --- a/python/pkgs/types-requests/default.nix +++ b/python/pkgs/types-requests/default.nix @@ -6,14 +6,14 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-requests"; version = "2.33.0.20260906"; pyproject = true; src = fetchPypi { pname = "types_requests"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-dquKD7c2dEoMPe7nqleykn4wHweNnmH1ORs+kgAkFrk="; }; @@ -24,7 +24,6 @@ buildPythonPackage rec { ]; # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "requests-stubs" ]; @@ -33,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-retry/default.nix b/python/pkgs/types-retry/default.nix index 8f71fae3d..c720efa96 100644 --- a/python/pkgs/types-retry/default.nix +++ b/python/pkgs/types-retry/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "0.9.9.20260408"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "types_retry"; inherit (finalAttrs) version; @@ -21,7 +19,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # Modules doesn't have tests - doCheck = false; pythonImportsCheck = [ "retry-stubs" ]; diff --git a/python/pkgs/types-s3transfer/default.nix b/python/pkgs/types-s3transfer/default.nix index 37e83d95d..9af4d746b 100644 --- a/python/pkgs/types-s3transfer/default.nix +++ b/python/pkgs/types-s3transfer/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-s3transfer"; version = "0.16.0"; pyproject = true; src = fetchPypi { pname = "types_s3transfer"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-tGNkcgJMXitiJ4xbdZZh7+tSqBhRzeXwkvJBALHstEM="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/youtype/types-s3transfer"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/types-setuptools/default.nix b/python/pkgs/types-setuptools/default.nix index 3c59141fb..97727dda8 100644 --- a/python/pkgs/types-setuptools/default.nix +++ b/python/pkgs/types-setuptools/default.nix @@ -5,21 +5,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-setuptools"; version = "84.0.0.20260812"; pyproject = true; src = fetchPypi { pname = "types_setuptools"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Cb7cJI67t6IyyUGd/NyjKXBuYb8qpXQ+lCTQJ/HZVrQ="; }; nativeBuildInputs = [ setuptools ]; # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "setuptools-stubs" ]; @@ -28,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-six/default.nix b/python/pkgs/types-six/default.nix index 3f8ae5bcd..758f29e61 100644 --- a/python/pkgs/types-six/default.nix +++ b/python/pkgs/types-six/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-six"; version = "1.17.0.20260724"; pyproject = true; src = fetchPypi { pname = "types_six"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-16v6gtQOt9+7Y1bFsau03ch+CFRRWiE1Eua+mMXWvAI="; }; @@ -23,4 +23,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-tabulate/default.nix b/python/pkgs/types-tabulate/default.nix index 66c1b7d92..1e85c3faa 100644 --- a/python/pkgs/types-tabulate/default.nix +++ b/python/pkgs/types-tabulate/default.nix @@ -5,21 +5,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-tabulate"; version = "0.10.0.20260508"; pyproject = true; src = fetchPypi { pname = "types_tabulate"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-jlHxWeiySXaElwauLtHcmtuo670ICxfklOu2aozJLHQ="; }; build-system = [ setuptools ]; # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "tabulate-stubs" ]; @@ -28,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-toml/default.nix b/python/pkgs/types-toml/default.nix index b27099690..9763a1783 100644 --- a/python/pkgs/types-toml/default.nix +++ b/python/pkgs/types-toml/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-toml"; version = "0.10.8.20240310"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-PUFQEwKXJDamuLI5yFCyZollfiUoG0j/DsBjRbiDAzE="; }; + build-system = [ setuptools ]; + # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "toml-stubs" ]; @@ -24,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-tqdm/default.nix b/python/pkgs/types-tqdm/default.nix index 01c8578b7..f5f0a2b9e 100644 --- a/python/pkgs/types-tqdm/default.nix +++ b/python/pkgs/types-tqdm/default.nix @@ -10,7 +10,6 @@ buildPythonPackage (finalAttrs: { pname = "types-tqdm"; version = "4.70.0.20260906"; pyproject = true; - __structuredAttrs = true; src = fetchPypi { pname = "types_tqdm"; @@ -23,7 +22,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ types-requests ]; # This package does not have tests. - doCheck = false; meta = { description = "Typing stubs for tqdm"; diff --git a/python/pkgs/types-ujson/default.nix b/python/pkgs/types-ujson/default.nix index 319f3b4fe..972be0f5c 100644 --- a/python/pkgs/types-ujson/default.nix +++ b/python/pkgs/types-ujson/default.nix @@ -5,21 +5,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-ujson"; version = "5.10.0.20250822"; pyproject = true; src = fetchPypi { pname = "types_ujson"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-CnlVWOH3hTI3PPPwPzWx8IvGDVLZJBh7l5le41l7oAY="; }; build-system = [ setuptools ]; # Module has no tests - doCheck = false; pythonImportsCheck = [ "ujson-stubs" ]; @@ -28,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typeshed"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/types-urllib3/default.nix b/python/pkgs/types-urllib3/default.nix index fd9e05193..43e5dd0ae 100644 --- a/python/pkgs/types-urllib3/default.nix +++ b/python/pkgs/types-urllib3/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "1.26.25.14"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-Ipt/V3yVG4wbksG8Ky/bC0mEe9KvbRzCouPdNA872o8="; @@ -20,7 +18,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; # Module doesn't have tests - doCheck = false; pythonImportsCheck = [ "urllib3-stubs" ]; diff --git a/python/pkgs/typeshed-client/default.nix b/python/pkgs/typeshed-client/default.nix index 20c9df936..2de0d3cc0 100644 --- a/python/pkgs/typeshed-client/default.nix +++ b/python/pkgs/typeshed-client/default.nix @@ -7,13 +7,13 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "typeshed_client"; version = "2.13.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hc5zvpil46Ucr7LikhZT43Wc5+nRUwrcypNd7CARUvI="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/JelleZijlstra/typeshed_client"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/typing-extensions/default.nix b/python/pkgs/typing-extensions/default.nix index 693be46f7..0213e597d 100644 --- a/python/pkgs/typing-extensions/default.nix +++ b/python/pkgs/typing-extensions/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "typing-extensions"; version = "4.16.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python"; repo = "typing_extensions"; - tag = version; + tag = finalAttrs.version; hash = "sha256-L1BRIDYz0YqYE4geKTxIkbCbzTGz7AtrbpB5vR8T4dw="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/typing"; license = lib.licenses.psfl; }; -} +}) diff --git a/python/pkgs/typing-inspect/default.nix b/python/pkgs/typing-inspect/default.nix index 52c97c99b..70021f349 100644 --- a/python/pkgs/typing-inspect/default.nix +++ b/python/pkgs/typing-inspect/default.nix @@ -10,7 +10,7 @@ buildPythonPackage { pname = "typing-inspect"; version = "0.9.0-unstable-2025-10-20"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ilevkivskyi"; diff --git a/python/pkgs/typing-inspection/default.nix b/python/pkgs/typing-inspection/default.nix index d029d6a19..ab5715a11 100644 --- a/python/pkgs/typing-inspection/default.nix +++ b/python/pkgs/typing-inspection/default.nix @@ -6,7 +6,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "typing-inspection"; version = "0.4.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pydantic"; repo = "typing-inspection"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jNAMYV9mpUnClLOahQyLisBkOfELcmjKavKJgyxkQr4="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydantic/typing-inspection"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/typish/default.nix b/python/pkgs/typish/default.nix index 7f70ab62f..1663a638b 100644 --- a/python/pkgs/typish/default.nix +++ b/python/pkgs/typish/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "1.9.3"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "ramonhagenaars"; repo = "typish"; diff --git a/python/pkgs/typogrify/default.nix b/python/pkgs/typogrify/default.nix index 2e3026126..07ad5b437 100644 --- a/python/pkgs/typogrify/default.nix +++ b/python/pkgs/typogrify/default.nix @@ -6,13 +6,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "typogrify"; version = "2.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8KoATpgDKm5r5MnaZefrcVDjbKO/UIrbzagrTQA+Ye4="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/justinmayer/typogrify"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/tzdata/default.nix b/python/pkgs/tzdata/default.nix index 2d9e0bfc6..a5da5e54d 100644 --- a/python/pkgs/tzdata/default.nix +++ b/python/pkgs/tzdata/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tzdata"; version = "2026.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ShUYuJkwhqeYJSPgcWQ/PA5fIT51shMY54vKv/+dFBU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/python/tzdata"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/tzlocal/default.nix b/python/pkgs/tzlocal/default.nix index b0d08e0ff..502e3c366 100644 --- a/python/pkgs/tzlocal/default.nix +++ b/python/pkgs/tzlocal/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tzlocal"; version = "5.4.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jbuGYIOGiKe2uk/tMdGN7fhCr7TUfKBQ1tiRwsFfO+Q="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/regebro/tzlocal"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/u-msgpack-python/default.nix b/python/pkgs/u-msgpack-python/default.nix index 375a32a2f..931cddea9 100644 --- a/python/pkgs/u-msgpack-python/default.nix +++ b/python/pkgs/u-msgpack-python/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "u-msgpack-python"; version = "2.8.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uAGoPW7XXm30HkRRi08qnCIdwtpLzVOA46D+2lILxho="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/vsergeev/u-msgpack-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ua-parser-builtins/default.nix b/python/pkgs/ua-parser-builtins/default.nix index df69e2b62..b06210a81 100644 --- a/python/pkgs/ua-parser-builtins/default.nix +++ b/python/pkgs/ua-parser-builtins/default.nix @@ -6,17 +6,17 @@ versioningit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ua-parser-builtins"; inherit (ua-parser) version src; pyproject = true; - sourceRoot = "${src.name}/ua-parser-builtins"; + sourceRoot = "${finalAttrs.src.name}/ua-parser-builtins"; postPatch = '' # don't use git to determine version substituteInPlace pyproject.toml \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ @@ -32,4 +32,4 @@ buildPythonPackage rec { license ; }; -} +}) diff --git a/python/pkgs/ua-parser-rs/default.nix b/python/pkgs/ua-parser-rs/default.nix index 74c8e2809..220d17ae2 100644 --- a/python/pkgs/ua-parser-rs/default.nix +++ b/python/pkgs/ua-parser-rs/default.nix @@ -1,27 +1,31 @@ { buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, gitUpdater, lib, pyyaml, rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ua-parser-rs"; version = "0.1.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ua-parser"; repo = "uap-rust"; - tag = "ua-parser-rs-${version}"; + tag = "ua-parser-rs-${finalAttrs.version}"; hash = "sha256-8IU4NNW0v2zl6COtL6o7FALxqYNVKBGhERugxpXIN5g="; fetchSubmodules = true; }; + build-system = [ setuptools ]; + cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-PNkyd9/0DdIqEmXbnw3dZs5ajWSo0rLhjJwRu3H06Cc="; }; @@ -38,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/ua-parser/uap-rust/tree/main/ua-parser-py"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/ua-parser/default.nix b/python/pkgs/ua-parser/default.nix index 1ea1aa57a..e8c5f7833 100644 --- a/python/pkgs/ua-parser/default.nix +++ b/python/pkgs/ua-parser/default.nix @@ -9,7 +9,7 @@ ua-parser-rs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ua-parser"; version = "1.0.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ua-parser"; repo = "uap-python"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-KKQlM1AonRqanhWlWIqPMoD+AzDCdwAzBsAbhqpZ4cs="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/ua-parser/uap-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/uart-devices/default.nix b/python/pkgs/uart-devices/default.nix index 1e3f68fab..3a765009b 100644 --- a/python/pkgs/uart-devices/default.nix +++ b/python/pkgs/uart-devices/default.nix @@ -7,7 +7,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uart-devices"; version = "0.1.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = "uart-devices"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vBwQXeXw9y7eETtlC4dcqGytIgrAm7iomnvoaxhl6JI="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.mit; platforms = lib.platforms.linux; }; -} +}) diff --git a/python/pkgs/ubelt/default.nix b/python/pkgs/ubelt/default.nix index ba6819cd8..ef2d7305b 100644 --- a/python/pkgs/ubelt/default.nix +++ b/python/pkgs/ubelt/default.nix @@ -12,7 +12,7 @@ xdoctest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ubelt"; version = "1.4.3"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Erotemic"; repo = "ubelt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LCewB9K4nGw/uyGK35mcesJYXju2N0FsdLW1XkPLD+I="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { homepage = "https://github.com/Erotemic/ubelt"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/uc-micro-py/default.nix b/python/pkgs/uc-micro-py/default.nix index bb93cd40a..1b793abd4 100644 --- a/python/pkgs/uc-micro-py/default.nix +++ b/python/pkgs/uc-micro-py/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uc-micro-py"; version = "2.0.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tsutsu3"; repo = "uc.micro-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-o4rUK16skeB7+9gvOltYC6u1bIPvw44bVSMoB+BHvRk="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/tsutsu3/uc.micro-py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/ufonormalizer/default.nix b/python/pkgs/ufonormalizer/default.nix index 412e7a9a6..e6263bcc1 100644 --- a/python/pkgs/ufonormalizer/default.nix +++ b/python/pkgs/ufonormalizer/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ufonormalizer"; version = "0.6.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-TFcVu5SDgfLGQa+CuUk4rSQtm1Nl3RxbfOPXVVaibDo="; extension = "zip"; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; meta = { @@ -24,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/unified-font-object/ufoNormalizer"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ufoprocessor/default.nix b/python/pkgs/ufoprocessor/default.nix index c196ad7d8..ba4645658 100644 --- a/python/pkgs/ufoprocessor/default.nix +++ b/python/pkgs/ufoprocessor/default.nix @@ -10,13 +10,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ufoprocessor"; version = "1.14.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-/TjTzDWblBcbqNP9weTe/eIgas70+X11tIUDu4rAOwE="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { ++ fonttools.optional-dependencies.lxml ++ fonttools.optional-dependencies.ufo; -} +}) diff --git a/python/pkgs/uharfbuzz/default.nix b/python/pkgs/uharfbuzz/default.nix index ee7b5ec45..1f2fe8996 100644 --- a/python/pkgs/uharfbuzz/default.nix +++ b/python/pkgs/uharfbuzz/default.nix @@ -10,7 +10,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uharfbuzz"; version = "0.56.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "harfbuzz"; repo = "uharfbuzz"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-pxfLUOx4oeymrOb4KnRjEIu4CXp0HKUbWeUT9144k8Q="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { description = "Streamlined Cython bindings for the harfbuzz shaping engine"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/uhashring/default.nix b/python/pkgs/uhashring/default.nix index 537a4896b..87d3d749c 100644 --- a/python/pkgs/uhashring/default.nix +++ b/python/pkgs/uhashring/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uhashring"; version = "2.4"; pyproject = true; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ultrabug"; repo = "uhashring"; - tag = version; + tag = finalAttrs.version; hash = "sha256-6zNPExbcwTUne0lT8V6xp2Gf6J1VgG7Q93qizVOAc+k="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/ultrabug/uhashring"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/uhi/default.nix b/python/pkgs/uhi/default.nix index 919b8df66..6e282812e 100644 --- a/python/pkgs/uhi/default.nix +++ b/python/pkgs/uhi/default.nix @@ -10,13 +10,13 @@ uhi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uhi"; version = "1.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-05xNwWLWkby0Q1KanPX+mbEeFKOHzfgoQVTMJYcNL/A="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://uhi.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ujson/default.nix b/python/pkgs/ujson/default.nix index a8d111516..52aded5a0 100644 --- a/python/pkgs/ujson/default.nix +++ b/python/pkgs/ujson/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ujson"; version = "6.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gOIzk/63B1guCtSVw5ekR3tkbQgJTS32T3MW+fr9iq4="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ setuptools-scm ]; pythonImportsCheck = [ "ujson" ]; @@ -24,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/ultrajson/ultrajson"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/ukpostcodeparser/default.nix b/python/pkgs/ukpostcodeparser/default.nix index 0284f8f21..a9c4d8fe2 100644 --- a/python/pkgs/ukpostcodeparser/default.nix +++ b/python/pkgs/ukpostcodeparser/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ukpostcodeparser"; version = "1.1.2"; pyproject = true; src = fetchPypi { pname = "UkPostcodeParser"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-kwJk76KT24CvAQOk/pwWGwY2VZjSS7b+VAPz9XxwUw4="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/hamstah/ukpostcodeparser"; license = lib.licenses.publicDomain; }; -} +}) diff --git a/python/pkgs/ulid-transform/default.nix b/python/pkgs/ulid-transform/default.nix index df82afa74..81ee9b0b2 100644 --- a/python/pkgs/ulid-transform/default.nix +++ b/python/pkgs/ulid-transform/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ulid-transform"; version = "2.2.9"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = "ulid-transform"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-j4nDvTR7qNpzYor6Pgfp+KNux7FRKdSc7jmuWj94WMM="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/bdraco/ulid-transform"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/umalqurra/default.nix b/python/pkgs/umalqurra/default.nix index 0667759b2..d651beeb3 100644 --- a/python/pkgs/umalqurra/default.nix +++ b/python/pkgs/umalqurra/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "umalqurra"; version = "0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cZ9qNvkIraHCna4Nk03Q8eH24zBXhO2+wjrXGTl95ng="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/tytkal/python-hijiri-ummalqura"; license = lib.licenses.publicDomain; }; -} +}) diff --git a/python/pkgs/umodbus/default.nix b/python/pkgs/umodbus/default.nix index cc5889cde..50839a77f 100644 --- a/python/pkgs/umodbus/default.nix +++ b/python/pkgs/umodbus/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, pyserial, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "umodbus"; version = "1.0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "AdvancedClimateSystems"; repo = "uModbus"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5IXadb5mjrMwr+L9S1iMN5kba5VGrzYt1p8nBvvLCh4="; }; - propagatedBuildInputs = [ pyserial ]; + build-system = [ setuptools ]; + + dependencies = [ pyserial ]; pythonImportsCheck = [ "umodbus" ]; @@ -26,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/AdvancedClimateSystems/uModbus/"; license = lib.licenses.mpl20; }; -} +}) diff --git a/python/pkgs/unasync/default.nix b/python/pkgs/unasync/default.nix index adad7c641..a3a0e1ec3 100644 --- a/python/pkgs/unasync/default.nix +++ b/python/pkgs/unasync/default.nix @@ -6,7 +6,7 @@ tokenize-rt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unasync"; version = "0.6.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-trio"; repo = "unasync"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-ZRvmX1fSfSJ1HNEymzhIuUi3tdjFmUoidfr0rN8c7tk="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { asl20 ]; }; -} +}) diff --git a/python/pkgs/uncertainties/default.nix b/python/pkgs/uncertainties/default.nix index 72d384281..af220bf49 100644 --- a/python/pkgs/uncertainties/default.nix +++ b/python/pkgs/uncertainties/default.nix @@ -14,7 +14,7 @@ scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uncertainties"; version = "3.2.4"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lmfit"; repo = "uncertainties"; - tag = version; + tag = finalAttrs.version; hash = "sha256-XfEiE27azEBNCZ6sIBncJI1cYocoXwgxEkclVgR5O34="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/uncompresspy/default.nix b/python/pkgs/uncompresspy/default.nix index 51c2b16b8..df47fc24b 100644 --- a/python/pkgs/uncompresspy/default.nix +++ b/python/pkgs/uncompresspy/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uncompresspy"; version = "0.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-556tZurtjUI2TYB8C6PzqK7w4Ah6m+rxpg8jqAimwUc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/kYwzor/uncompresspy"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/uncompyle6/default.nix b/python/pkgs/uncompyle6/default.nix index c9f6767b9..da0d4dc59 100644 --- a/python/pkgs/uncompyle6/default.nix +++ b/python/pkgs/uncompyle6/default.nix @@ -8,13 +8,13 @@ xdis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uncompyle6"; version = "3.9.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eLdk1MhDsEVfs5223rQhpI1dPruEZTe6ZESv4QfE68E="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/rocky/python-uncompyle6"; license = lib.licenses.gpl3; }; -} +}) diff --git a/python/pkgs/unearth/default.nix b/python/pkgs/unearth/default.nix index 8da8ada57..2a13a4472 100644 --- a/python/pkgs/unearth/default.nix +++ b/python/pkgs/unearth/default.nix @@ -13,13 +13,13 @@ trustme, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unearth"; version = "0.18.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-FAZ88RQckG94fW2dBwy8/dRD/RBYrsqmUM6VGaoQ29w="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/frostming/unearth"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/unicode-segmentation-rs/default.nix b/python/pkgs/unicode-segmentation-rs/default.nix index b7a4d8e83..ae8645028 100644 --- a/python/pkgs/unicode-segmentation-rs/default.nix +++ b/python/pkgs/unicode-segmentation-rs/default.nix @@ -6,7 +6,7 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unicode-segmentation-rs"; version = "0.2.4"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "WeblateOrg"; repo = "unicode-segmentation-rs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-c/KWCJz8ZbWWE7S+2Uxp3+eQWHXAEZXcVN3C5OrFlrc="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/WeblateOrg/unicode-segmentation-rs/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/unicodecsv/default.nix b/python/pkgs/unicodecsv/default.nix index 0543f15fb..72d6ddaf0 100644 --- a/python/pkgs/unicodecsv/default.nix +++ b/python/pkgs/unicodecsv/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unicodecsv"; version = "0.14.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AYwIA31IZJoEEgY/9O2ibqqB7/FUbb/6UfpSkydv9/w="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/jdunck/python-unicodecsv"; license = lib.licenses.bsd2WithViews; }; -} +}) diff --git a/python/pkgs/unicodedata2/default.nix b/python/pkgs/unicodedata2/default.nix index fbe5e853f..7adcaef1c 100644 --- a/python/pkgs/unicodedata2/default.nix +++ b/python/pkgs/unicodedata2/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unicodedata2"; version = "17.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-15lD0VP19r++P1Wl7GEZhRhL2jf87bPsx1Mi2CrmrTs="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/mikekap/unicodedata2"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/unicrypto/default.nix b/python/pkgs/unicrypto/default.nix index 4baa870b2..2066a39e4 100644 --- a/python/pkgs/unicrypto/default.nix +++ b/python/pkgs/unicrypto/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unicrypto"; version = "0.0.12"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "skelsec"; repo = "unicrypto"; - tag = version; + tag = finalAttrs.version; hash = "sha256-RYwovFMalBNDPDEVjQ/8/N7DkOMiyeEQ5ESdgCK8RW8="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/skelsec/unicrypto"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/unidecode/default.nix b/python/pkgs/unidecode/default.nix index 68469fca7..69778264f 100644 --- a/python/pkgs/unidecode/default.nix +++ b/python/pkgs/unidecode/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "Unidecode"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zjWYUAgzi2dlcwI6zDgtYsJk8wfI95Y3M0Ba3TfqKyM="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/avian2/unidecode"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/unique-log-filter/default.nix b/python/pkgs/unique-log-filter/default.nix index c34c1d211..c87db495b 100644 --- a/python/pkgs/unique-log-filter/default.nix +++ b/python/pkgs/unique-log-filter/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unique-log-filter"; version = "0.1.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "twizmwazin"; repo = "unique_log_filter"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-av1pVPDsO2dto5fhBK74jKfVsVY2ChyUE5NNja2B1Qw="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/twizmwazin/unique_log_filter"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/unittest-xml-reporting/default.nix b/python/pkgs/unittest-xml-reporting/default.nix index d53bf48e6..0130b9ee7 100644 --- a/python/pkgs/unittest-xml-reporting/default.nix +++ b/python/pkgs/unittest-xml-reporting/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unittest-xml-reporting"; version = "4.0.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "xmlrunner"; repo = "unittest-xml-reporting"; - tag = version; + tag = finalAttrs.version; hash = "sha256-9gV/DX/G12bthonBJlMDKaS6Iwt9nF5DrNG33KK7KbU="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/xmlrunner/unittest-xml-reporting"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/universal-pathlib/default.nix b/python/pkgs/universal-pathlib/default.nix index 63ad7685f..0e75b8982 100644 --- a/python/pkgs/universal-pathlib/default.nix +++ b/python/pkgs/universal-pathlib/default.nix @@ -8,14 +8,14 @@ pathlib-abc, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "universal-pathlib"; version = "0.3.10"; pyproject = true; src = fetchPypi { pname = "universal_pathlib"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-RIfLyQcwpIz7ZPgR2Z4UtvrtbXOEIM1fk/WfSOaTC/s="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/fsspec/universal_pathlib"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/unix-ar/default.nix b/python/pkgs/unix-ar/default.nix index 38701f71d..52568bb5a 100644 --- a/python/pkgs/unix-ar/default.nix +++ b/python/pkgs/unix-ar/default.nix @@ -4,13 +4,14 @@ fetchPypi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unix-ar"; version = "0.2.1"; format = "wheel"; src = fetchPypi { - inherit format version; + inherit (finalAttrs) version; + format = "wheel"; pname = "unix_ar"; hash = "sha256-Kstxi8Ewi/gOW52iYU2CQswv475M2LL9Rxm84Ymq/PE="; }; @@ -21,4 +22,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/python/pkgs/unpaddedbase64/default.nix b/python/pkgs/unpaddedbase64/default.nix index 67f077f6e..3fe78cf09 100644 --- a/python/pkgs/unpaddedbase64/default.nix +++ b/python/pkgs/unpaddedbase64/default.nix @@ -5,13 +5,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unpaddedbase64"; version = "2.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cnPGDAid452Q9dbUp4g6eeMZ3J2bHIkkp/q5YXil8AU="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Unpadded Base64"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/untangle/default.nix b/python/pkgs/untangle/default.nix index 390f0eed0..949d1f698 100644 --- a/python/pkgs/untangle/default.nix +++ b/python/pkgs/untangle/default.nix @@ -2,23 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, defusedxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "untangle"; version = "1.2.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "stchris"; repo = "untangle"; # 1.1.1 is not tagged on GitHub - tag = version; + tag = finalAttrs.version; hash = "sha256-i7B37Rj46ZVlN8vaMq7FoqS9dOoC680AqASdGk6pBJU="; }; - propagatedBuildInputs = [ defusedxml ]; + build-system = [ setuptools ]; + + dependencies = [ defusedxml ]; unittestFlagsArray = [ "-s" @@ -30,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/stchris/untangle"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/untokenize/default.nix b/python/pkgs/untokenize/default.nix index 7dd63c9b3..25b416f85 100644 --- a/python/pkgs/untokenize/default.nix +++ b/python/pkgs/untokenize/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "untokenize"; version = "0.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OGXbu7jvtLteqnLxvn8+C+AOqLfxJcacvR9f2pJvN6I="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/myint/untokenize"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/update-checker/default.nix b/python/pkgs/update-checker/default.nix index c7613c8b9..c9b356764 100644 --- a/python/pkgs/update-checker/default.nix +++ b/python/pkgs/update-checker/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "update-checker"; version = "1.0.0"; pyproject = true; src = fetchPypi { pname = "update_checker"; - inherit version; + inherit (finalAttrs) version; sha256 = "sha256-v8rGZBRXKoKpjqjIYzvxzl0QJ1DjuTRpuJswqoRc0dc="; }; @@ -25,7 +25,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; # requires network - doCheck = false; pythonImportsCheck = [ "update_checker" ]; @@ -34,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/bboe/update_checker"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/uproot/default.nix b/python/pkgs/uproot/default.nix index 82641d6e6..e4ebf8b33 100644 --- a/python/pkgs/uproot/default.nix +++ b/python/pkgs/uproot/default.nix @@ -19,7 +19,6 @@ buildPythonPackage (finalAttrs: { pname = "uproot"; version = "5.7.5"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "scikit-hep"; diff --git a/python/pkgs/uptime/default.nix b/python/pkgs/uptime/default.nix index b3ae230ab..d34e6eacc 100644 --- a/python/pkgs/uptime/default.nix +++ b/python/pkgs/uptime/default.nix @@ -5,20 +5,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uptime"; version = "3.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fDACVHdbgHzkbj3LzaMKo7miBLnFenrB557m2+OUKXM="; }; build-system = [ setuptools ]; # Tests are not shipped - doCheck = false; pythonImportsCheck = [ "uptime" ]; @@ -27,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/Cairnarvon/uptime"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/uri-template/default.nix b/python/pkgs/uri-template/default.nix index 3cb489de2..5dff561e7 100644 --- a/python/pkgs/uri-template/default.nix +++ b/python/pkgs/uri-template/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uri-template"; version = "1.3.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "plinss"; repo = "uri_template"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-38HFFqM6yfpsPrhIpE639ePy/NbLqKw7gbnE3y8sL3w="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/plinss/uri_template/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/uritemplate/default.nix b/python/pkgs/uritemplate/default.nix index 46f626272..7e5cf306b 100644 --- a/python/pkgs/uritemplate/default.nix +++ b/python/pkgs/uritemplate/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uritemplate"; version = "4.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SAwu0YCHiVWGMyPuoxsO3maHld4YJhf++cbKCebsnQ4="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { bsd3 ]; }; -} +}) diff --git a/python/pkgs/uritools/default.nix b/python/pkgs/uritools/default.nix index 6d9772f17..e62385feb 100644 --- a/python/pkgs/uritools/default.nix +++ b/python/pkgs/uritools/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uritools"; version = "6.1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OkmOfoXvMkk0PVcQYY1kGkFNoPuubSMFOtp5du6D6l8="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/tkem/uritools/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/url-normalize/default.nix b/python/pkgs/url-normalize/default.nix index 1d0b71185..778e0358b 100644 --- a/python/pkgs/url-normalize/default.nix +++ b/python/pkgs/url-normalize/default.nix @@ -6,14 +6,14 @@ idna, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "url-normalize"; version = "3.0.0"; pyproject = true; src = fetchPypi { pname = "url_normalize"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-BVLL8oMaMqKJlKE9KbylimDhD/bAOA40PsbRwqDSMtg="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/niksite/url-normalize"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/urlextract/default.nix b/python/pkgs/urlextract/default.nix index f50a1c063..bbc765bb7 100644 --- a/python/pkgs/urlextract/default.nix +++ b/python/pkgs/urlextract/default.nix @@ -9,13 +9,13 @@ uritools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "urlextract"; version = "1.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cFCOArqd83LiXPBkLbNnzs4nPocSzQzngXj8XdfqANs="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/lipoja/URLExtract"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/urlgrabber/default.nix b/python/pkgs/urlgrabber/default.nix index 80a71c21d..5136ea55b 100644 --- a/python/pkgs/urlgrabber/default.nix +++ b/python/pkgs/urlgrabber/default.nix @@ -2,21 +2,25 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, pycurl, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "urlgrabber"; version = "4.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "075af8afabae6362482d254e5ac3ffa595d1766117b684e53d9c25c2e937e139"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pycurl six ]; @@ -27,4 +31,4 @@ buildPythonPackage rec { description = "Python module for downloading files"; mainProgram = "urlgrabber"; }; -} +}) diff --git a/python/pkgs/urllib3-future/default.nix b/python/pkgs/urllib3-future/default.nix index cb5099d32..49575cf14 100644 --- a/python/pkgs/urllib3-future/default.nix +++ b/python/pkgs/urllib3-future/default.nix @@ -15,7 +15,7 @@ zstandard, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "urllib3-future"; version = "2.24.908"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jawah"; repo = "urllib3.future"; - tag = version; + tag = finalAttrs.version; hash = "sha256-/1gAHvXtp0g88PE0pZrBDlB0Gj/NkpbrggvsNHQO+8o="; }; @@ -61,4 +61,4 @@ buildPythonPackage rec { homepage = "https://github.com/jawah/urllib3.future"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/urllib3/default.nix b/python/pkgs/urllib3/default.nix index 84b230b56..87fc238ea 100644 --- a/python/pkgs/urllib3/default.nix +++ b/python/pkgs/urllib3/default.nix @@ -50,7 +50,6 @@ buildPythonPackage (finalAttrs: { # - LONG_TIMEOUT # When CI is in the env, LONG_TIMEOUT will be significantly increased. # Still, failures can occur and for that reason tests are disabled. - doCheck = false; passthru.tests.pytest = finalAttrs.finalPackage.overrideAttrs (_: { doInstallCheck = true; diff --git a/python/pkgs/urlman/default.nix b/python/pkgs/urlman/default.nix index 6cd2e7d37..a29bdd116 100644 --- a/python/pkgs/urlman/default.nix +++ b/python/pkgs/urlman/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "urlman"; version = "2.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QP4bGBkUph8FR+ZoYjW2D9dPMlOWvK8c3QtjJg4phK4="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/andrewgodwin/urlman"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/urlobject/default.nix b/python/pkgs/urlobject/default.nix index de9fc0ee1..569216905 100644 --- a/python/pkgs/urlobject/default.nix +++ b/python/pkgs/urlobject/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "urlobject"; version = "2.4.3"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zacharyvoase"; repo = "urlobject"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4UuQZTkVre8jXlchW7/TjeaADYvLnGMpGbJR/sdeKv4="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "http://zacharyvoase.github.com/urlobject"; license = lib.licenses.unlicense; }; -} +}) diff --git a/python/pkgs/urwid-readline/default.nix b/python/pkgs/urwid-readline/default.nix index 15d915cc6..ffeaf47ec 100644 --- a/python/pkgs/urwid-readline/default.nix +++ b/python/pkgs/urwid-readline/default.nix @@ -6,7 +6,7 @@ urwid, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "urwid-readline"; version = "0.15.1"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rr-"; repo = "urwid_readline"; - tag = version; + tag = finalAttrs.version; hash = "sha256-HiMMLzVE/Qw/PR7LXACyfzblxrGYrbMoi3/e/QzqF34="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail 'version="0.15"' 'version="${version}"' + --replace-fail 'version="0.15"' 'version="${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/rr-/urwid_readline"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/urwid/default.nix b/python/pkgs/urwid/default.nix index a22162d09..27af44eb0 100644 --- a/python/pkgs/urwid/default.nix +++ b/python/pkgs/urwid/default.nix @@ -8,13 +8,13 @@ wcwidth, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "urwid"; version = "4.1.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QL804H0FuC+zBggpJcQE+Pc4/Xbgr1SAEAXX86aa0Yo="; }; @@ -28,8 +28,6 @@ buildPythonPackage rec { wcwidth ]; - doCheck = false; - pythonImportsCheck = [ "urwid" ]; meta = { @@ -37,4 +35,4 @@ buildPythonPackage rec { homepage = "https://urwid.org/"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/python/pkgs/urwidgets/default.nix b/python/pkgs/urwidgets/default.nix index 50b1f7df3..e169476ab 100644 --- a/python/pkgs/urwidgets/default.nix +++ b/python/pkgs/urwidgets/default.nix @@ -6,7 +6,7 @@ urwid, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "urwidgets"; version = "0.2.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AnonymouX47"; repo = "urwidgets"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RgY7m0smcdUspGkCdzepxruEMDq/mAsVFNjHMLoWAyc="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/AnonymouX47/urwidgets"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/urwidtrees/default.nix b/python/pkgs/urwidtrees/default.nix index 7ddc9bf21..bc9af27d5 100644 --- a/python/pkgs/urwidtrees/default.nix +++ b/python/pkgs/urwidtrees/default.nix @@ -6,7 +6,7 @@ urwid, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "urwidtrees"; version = "1.0.4"; pyproject = true; @@ -14,13 +14,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pazz"; repo = "urwidtrees"; - tag = version; + tag = finalAttrs.version; hash = "sha256-MQy2b0Q3gTbY8lmmt39Z1Nix0UpQtj+14T/zE1F/YJ4="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ urwid ]; + dependencies = [ urwid ]; # Module has no tests @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/pazz/urwidtrees"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/python/pkgs/us/default.nix b/python/pkgs/us/default.nix index ae292c3b6..8d6ff123b 100644 --- a/python/pkgs/us/default.nix +++ b/python/pkgs/us/default.nix @@ -6,13 +6,13 @@ jellyfish, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "us"; version = "3.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yyI+hTk9zFFx6tDdISutxH+WZ7I3AP6j5+pfMQ1UUzg="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/unitedstates/python-us/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/usb-devices/default.nix b/python/pkgs/usb-devices/default.nix index d6077006d..689d5bd44 100644 --- a/python/pkgs/usb-devices/default.nix +++ b/python/pkgs/usb-devices/default.nix @@ -6,7 +6,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "usb-devices"; version = "0.5.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "usb-devices"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-W6RWm9x/emb1F8Oox927SnH3v8HWCXIFYivVJJh6ves="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/Bluetooth-Devices/usb-devices"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/usb-monitor/default.nix b/python/pkgs/usb-monitor/default.nix index 44f5afbe0..bead6f936 100644 --- a/python/pkgs/usb-monitor/default.nix +++ b/python/pkgs/usb-monitor/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "1.23"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) version; pname = "usb_monitor"; diff --git a/python/pkgs/usbtmc/default.nix b/python/pkgs/usbtmc/default.nix index 942b05233..18c43cab4 100644 --- a/python/pkgs/usbtmc/default.nix +++ b/python/pkgs/usbtmc/default.nix @@ -1,27 +1,31 @@ { lib, fetchFromGitHub, + # build-system + setuptools, buildPythonPackage, pyusb, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "usbtmc"; version = "0.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "python-ivi"; repo = "python-usbtmc"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-69kqBTqnVqdWC2mqlXylzb9VkdhwTGZI0Ykf6lqbypI="; }; - propagatedBuildInputs = [ pyusb ]; + build-system = [ setuptools ]; + + dependencies = [ pyusb ]; meta = { description = "Python implementation of the USBTMC instrument control protocol"; homepage = "http://alexforencich.com/wiki/en/python-usbtmc/start"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/user-agents/default.nix b/python/pkgs/user-agents/default.nix index 072914cfe..a814d32dc 100644 --- a/python/pkgs/user-agents/default.nix +++ b/python/pkgs/user-agents/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "2.2.0"; pyproject = true; - __structuredAttrs = true; - # PyPI is missing devices.json src = fetchFromGitHub { owner = "selwin"; diff --git a/python/pkgs/userpath/default.nix b/python/pkgs/userpath/default.nix index e8ae06906..155f3053c 100644 --- a/python/pkgs/userpath/default.nix +++ b/python/pkgs/userpath/default.nix @@ -6,13 +6,13 @@ click, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "userpath"; version = "1.9.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bFIojasGklfMgxhG0V1IEzUiRV1Gd+5pqXgfEdvv2BU="; }; @@ -20,8 +20,6 @@ buildPythonPackage rec { dependencies = [ click ]; - doCheck = false; - pythonImportsCheck = [ "userpath" ]; meta = { @@ -32,4 +30,4 @@ buildPythonPackage rec { mit ]; }; -} +}) diff --git a/python/pkgs/utils/default.nix b/python/pkgs/utils/default.nix index 891d3a6d2..8b8503fc9 100644 --- a/python/pkgs/utils/default.nix +++ b/python/pkgs/utils/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "utils"; version = "1.0.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "haaksmash"; repo = "pyutils"; - tag = version; + tag = finalAttrs.version; hash = "sha256-eb2trh3eawdAcPo3De9NgYN2HT1+FGju/F4V7lga+R4="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/haaksmash/pyutils"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/uuid-utils/default.nix b/python/pkgs/uuid-utils/default.nix index 347da94ac..7a70b4c97 100644 --- a/python/pkgs/uuid-utils/default.nix +++ b/python/pkgs/uuid-utils/default.nix @@ -5,7 +5,7 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uuid-utils"; version = "0.16.1"; pyproject = true; @@ -13,12 +13,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aminalaee"; repo = "uuid-utils"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5pGBc1+2Vx0nIwhLFBy/Mx5GLLzA7Oj4eWPPCfBV1v4="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname src version; + inherit (finalAttrs) pname src version; hash = "sha256-o9fmecoYGu+UR0/Km6sGq5buVo8qHKnBSuvvfogmkx0="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/aminalaee/uuid-utils"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/uuid6/default.nix b/python/pkgs/uuid6/default.nix index dcfdba935..70cfedc06 100644 --- a/python/pkgs/uuid6/default.nix +++ b/python/pkgs/uuid6/default.nix @@ -5,7 +5,7 @@ setuptools, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uuid6"; version = "2025.0.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oittaa"; repo = "uuid6-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-E8oBbD52zTDcpRCBsJXfSgpF7FPNSVB43uxvsA62XHU="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/oittaa/uuid6-python"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/uv-build/default.nix b/python/pkgs/uv-build/default.nix index 23101c557..ef10b5a37 100644 --- a/python/pkgs/uv-build/default.nix +++ b/python/pkgs/uv-build/default.nix @@ -37,7 +37,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "uv_build" ]; # The package has no tests - doCheck = false; # Run the tests of a package built by `uv_build`. passthru = { diff --git a/python/pkgs/uv-dynamic-versioning/default.nix b/python/pkgs/uv-dynamic-versioning/default.nix index 443110ddd..91e93c73c 100644 --- a/python/pkgs/uv-dynamic-versioning/default.nix +++ b/python/pkgs/uv-dynamic-versioning/default.nix @@ -8,7 +8,7 @@ tomlkit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uv-dynamic-versioning"; version = "0.14.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ninoseki"; repo = "uv-dynamic-versioning"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-j9Fv4ryqV3nHYmI1zA/5f6pEYWK55ZBj8/FxT5bicEg="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/ninoseki/uv-dynamic-versioning"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/uvicorn-worker/default.nix b/python/pkgs/uvicorn-worker/default.nix index 652e0fe6d..403d2a4af 100644 --- a/python/pkgs/uvicorn-worker/default.nix +++ b/python/pkgs/uvicorn-worker/default.nix @@ -9,7 +9,7 @@ uvicorn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uvicorn-worker"; version = "0.4.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Kludex"; repo = "uvicorn-worker"; - tag = version; + tag = finalAttrs.version; hash = "sha256-qfk3lkHwuGbRWj4D65EontmEgKtk7ILq6gZCrxcrrJU="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/Kludex/uvicorn-worker"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/uvicorn/default.nix b/python/pkgs/uvicorn/default.nix index 7581a60e5..902120636 100644 --- a/python/pkgs/uvicorn/default.nix +++ b/python/pkgs/uvicorn/default.nix @@ -13,7 +13,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uvicorn"; version = "0.52.4"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; repo = "uvicorn"; - tag = version; + tag = finalAttrs.version; hash = "sha256-XDhfyL2+L2Dfa01brCgqKibdtkGOI0Xv4Mx0foqHT3A="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { mainProgram = "uvicorn"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/uvloop/default.nix b/python/pkgs/uvloop/default.nix index 06762e917..51e49ead1 100644 --- a/python/pkgs/uvloop/default.nix +++ b/python/pkgs/uvloop/default.nix @@ -12,7 +12,7 @@ libuv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uvloop"; version = "0.22.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MagicStack"; repo = "uvloop"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9NJugzxFycr1LLZXiDKbpeVcIvlCPHHIcYMp8jmffuE="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { homepage = "https://github.com/MagicStack/uvloop"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/validate-email/default.nix b/python/pkgs/validate-email/default.nix index 17205cc2d..37b960430 100644 --- a/python/pkgs/validate-email/default.nix +++ b/python/pkgs/validate-email/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "validate_email"; version = "1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eEcZ3F94C+MZzdGF3IXdk6/r2267lDgRvEx8X5xyrq8="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/syrusakbary/validate_email"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/validator-collection/default.nix b/python/pkgs/validator-collection/default.nix index 56847adbd..9707fe789 100644 --- a/python/pkgs/validator-collection/default.nix +++ b/python/pkgs/validator-collection/default.nix @@ -8,7 +8,7 @@ pyfakefs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "validator-collection"; version = "1.5.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "insightindustry"; repo = "validator-collection"; - tag = "v.${version}"; + tag = "v.${finalAttrs.version}"; hash = "sha256-CDPfIkZZRpl1rAzNpLKJfaBEGWUl71coic2jOHIgi6o="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/insightindustry/validator-collection/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/validators/default.nix b/python/pkgs/validators/default.nix index 246375bd0..d5c625353 100644 --- a/python/pkgs/validators/default.nix +++ b/python/pkgs/validators/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "validators"; version = "0.35.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-validators"; repo = "validators"; - tag = version; + tag = finalAttrs.version; hash = "sha256-b3kjKbqmfny6YnU0rlrralTgvYT06sUpckI4EDKDleA="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-validators/validators"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/valkey/default.nix b/python/pkgs/valkey/default.nix index bd1996d06..aec497c18 100644 --- a/python/pkgs/valkey/default.nix +++ b/python/pkgs/valkey/default.nix @@ -16,7 +16,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "valkey"; version = "6.1.1"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "valkey-io"; repo = "valkey-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-woJYfgLNIVzTYj9q8IjXo+SXhQZkQdB/Ofv5StGy9Rc="; }; @@ -74,4 +74,4 @@ buildPythonPackage rec { homepage = "https://github.com/valkey-io/valkey-py"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/varint/default.nix b/python/pkgs/varint/default.nix index 355bc4448..0ed0f775e 100644 --- a/python/pkgs/varint/default.nix +++ b/python/pkgs/varint/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "varint"; version = "1.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-puzAI3esXunWWmqK1Fyf8drIzO4ZQApZUPtR1ZQhTKU="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "varint" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/fmoo/python-varint"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/vcrpy/default.nix b/python/pkgs/vcrpy/default.nix index 4ddb70bd0..e6a7cf800 100644 --- a/python/pkgs/vcrpy/default.nix +++ b/python/pkgs/vcrpy/default.nix @@ -12,7 +12,7 @@ wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "vcrpy"; version = "8.3.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kevin1024"; repo = "vcrpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WQLWUr1EgOibdAVVASxMzeFi1YikYAjjye/NtCEJ6Kk="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/kevin1024/vcrpy"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/vcs-versioning/default.nix b/python/pkgs/vcs-versioning/default.nix index d60f648b6..52f6be91b 100644 --- a/python/pkgs/vcs-versioning/default.nix +++ b/python/pkgs/vcs-versioning/default.nix @@ -38,7 +38,6 @@ buildPythonPackage (finalAttrs: { "vcs_versioning" ]; - doCheck = false; # infinite recursion with pytest passthru.tests.pytest = vcs-versioning.overridePythonAttrs { doCheck = true; }; meta = { diff --git a/python/pkgs/vcversioner/default.nix b/python/pkgs/vcversioner/default.nix index 1a7143316..4be9870b0 100644 --- a/python/pkgs/vcversioner/default.nix +++ b/python/pkgs/vcversioner/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "vcversioner"; version = "2.16.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2uYMF6R5eB9EpAEHAYM/GCkUCx7szSWHYqdJdKoG4Zs="; }; @@ -22,4 +22,4 @@ buildPythonPackage rec { homepage = "https://github.com/habnabit/vcversioner"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/vdf/default.nix b/python/pkgs/vdf/default.nix index 970b2c647..ac1870b10 100644 --- a/python/pkgs/vdf/default.nix +++ b/python/pkgs/vdf/default.nix @@ -7,20 +7,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "vdf"; version = "3.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/VQZ9B4HoQCeX/0CfH3L5D0ffo70U66qkNnQS4B94q8="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "vdf" ]; meta = { @@ -28,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/ValvePython/vdf"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/vector/default.nix b/python/pkgs/vector/default.nix index aba73e505..2c96e9aff 100644 --- a/python/pkgs/vector/default.nix +++ b/python/pkgs/vector/default.nix @@ -16,7 +16,6 @@ buildPythonPackage (finalAttrs: { pname = "vector"; version = "1.8.1"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "scikit-hep"; diff --git a/python/pkgs/vega-datasets/default.nix b/python/pkgs/vega-datasets/default.nix index 32134bc52..558ee36da 100644 --- a/python/pkgs/vega-datasets/default.nix +++ b/python/pkgs/vega-datasets/default.nix @@ -6,30 +6,30 @@ pandas, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "vega-datasets"; version = "0.9.0"; pyproject = true; src = fetchPypi { pname = "vega_datasets"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-nb6YNCCOjsMqtElw3zFd6RAoYeTNoT2OFDqreoDZP8A="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ pandas ]; + dependencies = [ pandas ]; pythonImportsCheck = [ "vega_datasets" ]; meta = let - tag = lib.removeSuffix ".0" "v${version}"; + tag = lib.removeSuffix ".0" "v${finalAttrs.version}"; in { description = "Python package for offline access to vega datasets"; homepage = "https://github.com/altair-viz/vega_datasets"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/venusian/default.nix b/python/pkgs/venusian/default.nix index 0e785ec38..b7e6f4c02 100644 --- a/python/pkgs/venusian/default.nix +++ b/python/pkgs/venusian/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "venusian"; version = "3.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-U0+zs1VmkoPrOVRYGTHl0dBx/OYdAp1Y8yGaXjpvDEE="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://pylonsproject.org/"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/verboselogs/default.nix b/python/pkgs/verboselogs/default.nix index 6b20c73cb..e354f80db 100644 --- a/python/pkgs/verboselogs/default.nix +++ b/python/pkgs/verboselogs/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "1.7"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "xolox"; repo = "python-verboselogs"; diff --git a/python/pkgs/versioneer/default.nix b/python/pkgs/versioneer/default.nix index 90df63622..967507a7a 100644 --- a/python/pkgs/versioneer/default.nix +++ b/python/pkgs/versioneer/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "versioneer"; version = "0.29"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-WrKDuYVyEdYbUzGLfHks9o55jnZe4Xwnren2ySQjVzE="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "versioneer" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-versioneer/python-versioneer"; license = lib.licenses.publicDomain; }; -} +}) diff --git a/python/pkgs/versioningit/default.nix b/python/pkgs/versioningit/default.nix index 768c0122e..092b66b63 100644 --- a/python/pkgs/versioningit/default.nix +++ b/python/pkgs/versioningit/default.nix @@ -6,13 +6,13 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "versioningit"; version = "3.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uRrX1z5z0hIg5pVA8gIT8rcpofmzXATp4Tfq8o0iFNo="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/jwodder/versioningit"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/versiontools/default.nix b/python/pkgs/versiontools/default.nix index 9ddbb378e..1f939bd71 100644 --- a/python/pkgs/versiontools/default.nix +++ b/python/pkgs/versiontools/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "versiontools"; version = "1.9.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-qWkzKIehipyYsN8OpNTKdZcvJMqU8G+4fVkTd+g0FPY="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { description = "Smart replacement for plain tuple used in __version__"; license = lib.licenses.lgpl2; }; -} +}) diff --git a/python/pkgs/verspec/default.nix b/python/pkgs/verspec/default.nix index 7ba3792a6..8ff128d2e 100644 --- a/python/pkgs/verspec/default.nix +++ b/python/pkgs/verspec/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "verspec"; version = "0.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xFBMppeyBWzbS/pxIUYfWg6BgJJVtBwD3aS6gjY3wB4="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/jimporter/verspec"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/vertica-python/default.nix b/python/pkgs/vertica-python/default.nix index b47ec70da..91e44d9d6 100644 --- a/python/pkgs/vertica-python/default.nix +++ b/python/pkgs/vertica-python/default.nix @@ -9,13 +9,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "vertica-python"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VCB4ri/t7mlK3tsE2Bxu3Cd7h+10QDApQhB9hqC81EU="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/vertica/vertica-python"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/vharfbuzz/default.nix b/python/pkgs/vharfbuzz/default.nix index a2abc1ba9..f9a2d1d0e 100644 --- a/python/pkgs/vharfbuzz/default.nix +++ b/python/pkgs/vharfbuzz/default.nix @@ -12,13 +12,13 @@ uharfbuzz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "vharfbuzz"; version = "0.3.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zFVw8Nxh7cRJNk/S7D3uiIGShBMiZ/JeuSdX4hN94kc="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { description = "A user-friendly wrapper around uharfbuzz"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/virtualenv/default.nix b/python/pkgs/virtualenv/default.nix index 66666bf15..eb0cc8633 100644 --- a/python/pkgs/virtualenv/default.nix +++ b/python/pkgs/virtualenv/default.nix @@ -14,13 +14,13 @@ python-discovery, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "virtualenv"; version = "21.7.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-p+Qtgdd53siv19xL5xZA+5WeqGG8z6WYDLStn5LjBnU="; }; @@ -36,8 +36,6 @@ buildPythonPackage rec { python-discovery ]; - doCheck = false; - pythonImportsCheck = [ "virtualenv" ]; meta = { @@ -46,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "virtualenv"; }; -} +}) diff --git a/python/pkgs/virtualenvwrapper/default.nix b/python/pkgs/virtualenvwrapper/default.nix index b6f6eae27..10457861e 100644 --- a/python/pkgs/virtualenvwrapper/default.nix +++ b/python/pkgs/virtualenvwrapper/default.nix @@ -13,13 +13,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "virtualenvwrapper"; version = "6.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ES5+o0qaPOkKrqVBgvDTr+9NGpE+63XpiiY7SXjNc8Y="; }; @@ -36,7 +36,7 @@ buildPythonPackage rec { pip pkgs.which ]; - propagatedBuildInputs = [ + dependencies = [ stevedore virtualenv virtualenv-clone @@ -88,4 +88,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-virtualenvwrapper/virtualenvwrapper"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/vobject/default.nix b/python/pkgs/vobject/default.nix index 40719d97f..e74174f73 100644 --- a/python/pkgs/vobject/default.nix +++ b/python/pkgs/vobject/default.nix @@ -8,13 +8,13 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "vobject"; version = "0.9.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rETl1+IHnYTB1SxQphW5vsSxupWGCMTH/kDL8zJHs44="; }; @@ -26,8 +26,6 @@ buildPythonPackage rec { six ]; - doCheck = false; - pythonImportsCheck = [ "vobject" ]; meta = { @@ -35,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/py-vobject/vobject"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/volatile/default.nix b/python/pkgs/volatile/default.nix index 76357cdc7..e56673c76 100644 --- a/python/pkgs/volatile/default.nix +++ b/python/pkgs/volatile/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "volatile"; version = "2.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-m+Nq1QjjNU4BbBFd4Dl9wiA7mACnPZ0XfKnTeo06MdM="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/mbr/volatile"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/voluptuous-serialize/default.nix b/python/pkgs/voluptuous-serialize/default.nix index 2f5616099..dcd817193 100644 --- a/python/pkgs/voluptuous-serialize/default.nix +++ b/python/pkgs/voluptuous-serialize/default.nix @@ -6,7 +6,7 @@ voluptuous, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "voluptuous-serialize"; version = "2.7.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "voluptuous-serialize"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vmBK4FJr15wOYHtH14OqeyY/vgVOSrpo0Sd9wqu4zgo="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-libs/voluptuous-serialize"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/voluptuous/default.nix b/python/pkgs/voluptuous/default.nix index 2de399cdf..59a8c8879 100644 --- a/python/pkgs/voluptuous/default.nix +++ b/python/pkgs/voluptuous/default.nix @@ -5,20 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "voluptuous"; version = "0.16.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AGU14i/tlErsF7726HJUckdhlHQ8h70jPpEutGP4/wU="; }; build-system = [ setuptools ]; - doCheck = false; - pythonImportsCheck = [ "voluptuous" ]; meta = { @@ -26,4 +24,4 @@ buildPythonPackage rec { description = "Python data validation library"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/vsts-cd-manager/default.nix b/python/pkgs/vsts-cd-manager/default.nix index 7525d23a4..65f95ae77 100644 --- a/python/pkgs/vsts-cd-manager/default.nix +++ b/python/pkgs/vsts-cd-manager/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "1.0.2"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-C7CQWc1VPhwgbpLvMkyw3PkjNIRtZGxExoT2JWuGRHs="; diff --git a/python/pkgs/vsts/default.nix b/python/pkgs/vsts/default.nix index cb1c38691..12a55d7b5 100644 --- a/python/pkgs/vsts/default.nix +++ b/python/pkgs/vsts/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.25"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-2heRYBIfWzi+Bh2/8pzStg1dApsiBxAkVNd6cRTmT5c="; diff --git a/python/pkgs/vulture/default.nix b/python/pkgs/vulture/default.nix index 1077d6ad0..182e79389 100644 --- a/python/pkgs/vulture/default.nix +++ b/python/pkgs/vulture/default.nix @@ -8,13 +8,13 @@ toml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "vulture"; version = "2.16"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+Nn24q8DARZko8bCQMl2Wz85KRfTE1/dym1qaNNZ9xc="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "vulture"; }; -} +}) diff --git a/python/pkgs/w3lib/default.nix b/python/pkgs/w3lib/default.nix index 50bd6baa4..b6b636f98 100644 --- a/python/pkgs/w3lib/default.nix +++ b/python/pkgs/w3lib/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "w3lib"; version = "2.4.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jdae45/2OY1wjHk6vHecM0ppusfO4c33FzbGae1r6GQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Library of web-related functions"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/wadler-lindig/default.nix b/python/pkgs/wadler-lindig/default.nix index 906aed358..35566643a 100644 --- a/python/pkgs/wadler-lindig/default.nix +++ b/python/pkgs/wadler-lindig/default.nix @@ -10,7 +10,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wadler-lindig"; version = "0.1.7"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "patrick-kidger"; repo = "wadler_lindig"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qP826zdzR5BEQ8bGd45RFSLTH6Eal+b7UN+BW07/glo="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/patrick-kidger/wadler_lindig"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/waitress/default.nix b/python/pkgs/waitress/default.nix index 83c87fc17..10ab7c133 100644 --- a/python/pkgs/waitress/default.nix +++ b/python/pkgs/waitress/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "waitress"; version = "3.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aCqq8q8MRK2kq/tw3tNjk/DjB/SrlFaiFc4AILrvwx8="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { mainProgram = "waitress-serve"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/wakeonlan/default.nix b/python/pkgs/wakeonlan/default.nix index 44c7e6318..8764a00ea 100644 --- a/python/pkgs/wakeonlan/default.nix +++ b/python/pkgs/wakeonlan/default.nix @@ -5,13 +5,13 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wakeonlan"; version = "4.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-HLMMSuYPhe8on099T3Azgu0ZuoQQMgbcXiseUb7J9FY="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/remcohaszing/pywakeonlan"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/warcio/default.nix b/python/pkgs/warcio/default.nix index 9576879e8..7da4226ec 100644 --- a/python/pkgs/warcio/default.nix +++ b/python/pkgs/warcio/default.nix @@ -7,18 +7,20 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "warcio"; version = "1.7.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "webrecorder"; repo = "warcio"; - tag = "v${version}"; # Repo has no git tags, see https://github.com/webrecorder/warcio/issues/126 + tag = "v${finalAttrs.version}"; # Repo has no git tags, see https://github.com/webrecorder/warcio/issues/126 hash = "sha256-i1bVbXf1RQoWCADFwlVEnFhb3sVZ91vijUtzVLWMc2Q="; }; + build-system = [ setuptools ]; + patches = [ (fetchpatch { # Add offline mode to skip tests that require an internet connection, https://github.com/webrecorder/warcio/pull/135 @@ -28,7 +30,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + dependencies = [ six setuptools ]; @@ -41,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/webrecorder/warcio"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/warlock/default.nix b/python/pkgs/warlock/default.nix index 7d099206a..30c65b434 100644 --- a/python/pkgs/warlock/default.nix +++ b/python/pkgs/warlock/default.nix @@ -7,13 +7,13 @@ jsonschema, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "warlock"; version = "2.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gjGboBc0Hn/NyB78K+ndL4I3oNoHxxR2tUJWUbMXsck="; }; @@ -24,8 +24,6 @@ buildPythonPackage rec { jsonschema ]; - doCheck = false; - pythonImportsCheck = [ "warlock" ]; meta = { @@ -33,4 +31,4 @@ buildPythonPackage rec { description = "Python object model built on JSON schema and JSON patch"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/wasabi/default.nix b/python/pkgs/wasabi/default.nix index b9ed5364c..ed6073c58 100644 --- a/python/pkgs/wasabi/default.nix +++ b/python/pkgs/wasabi/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wasabi"; version = "1.1.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-S7MAjwA4CdsMPii02vIJBuqHGiu0P5kUGX1UD08uCHg="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/wasabi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/watchdog/default.nix b/python/pkgs/watchdog/default.nix index c044b8ab6..4ad7b55ca 100644 --- a/python/pkgs/watchdog/default.nix +++ b/python/pkgs/watchdog/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "watchdog"; version = "6.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nd98gv2jro4k3s2hM47eZuHJmIPbk3Edj7lB6qLYwoI="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/gorakhargosh/watchdog"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/watchgod/default.nix b/python/pkgs/watchgod/default.nix index 6d6529648..3236360bf 100644 --- a/python/pkgs/watchgod/default.nix +++ b/python/pkgs/watchgod/default.nix @@ -6,13 +6,13 @@ anyio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "watchgod"; version = "0.8.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yxH/ZmV777qU2CjjtiLV+3byL72hN281Xz5uUel9lFA="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/samuelcolvin/watchgod"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/waybackpy/default.nix b/python/pkgs/waybackpy/default.nix index ca6a287d6..6dff453b6 100644 --- a/python/pkgs/waybackpy/default.nix +++ b/python/pkgs/waybackpy/default.nix @@ -13,8 +13,6 @@ buildPythonPackage (finalAttrs: { version = "3.0.6"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-SXo3F1arp2ROt62g69TtsVy4xTvBNMyXO/AjoSyv+D8="; diff --git a/python/pkgs/wcag-contrast-ratio/default.nix b/python/pkgs/wcag-contrast-ratio/default.nix index 00631a57c..5faa85cb6 100644 --- a/python/pkgs/wcag-contrast-ratio/default.nix +++ b/python/pkgs/wcag-contrast-ratio/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "0.9"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-aRkrjlwKfQ3F/xGH7rPjmBQWM6S95RxpyH9Y/oftNhw="; diff --git a/python/pkgs/wcmatch/default.nix b/python/pkgs/wcmatch/default.nix index aa294a64f..1134f192f 100644 --- a/python/pkgs/wcmatch/default.nix +++ b/python/pkgs/wcmatch/default.nix @@ -6,13 +6,13 @@ bracex, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wcmatch"; version = "11.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-HqK0+meLjKJoJTeY1ZY5Nd85Ey1Hw+JBwKBzIiQAXn0="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { description = "Wilcard File Name matching library"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/wcwidth/default.nix b/python/pkgs/wcwidth/default.nix index eda340390..41dfa9fd5 100644 --- a/python/pkgs/wcwidth/default.nix +++ b/python/pkgs/wcwidth/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wcwidth"; version = "0.8.3"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jquast"; repo = "wcwidth"; - tag = version; + tag = finalAttrs.version; hash = "sha256-4GzYqoXdYqZjyB/iIsuOnwSjJGSKY9LitVKVDT2aUCo="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/jquast/wcwidth"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/weaviate-client/default.nix b/python/pkgs/weaviate-client/default.nix index 3284fbe48..9c25921d5 100644 --- a/python/pkgs/weaviate-client/default.nix +++ b/python/pkgs/weaviate-client/default.nix @@ -15,7 +15,7 @@ validators, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "weaviate-client"; version = "4.23.1"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate-python-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9vnGApuYJTzTeOufB0/3ONPaMMfgq2t4NxpmqyYDIhg="; }; @@ -58,4 +58,4 @@ buildPythonPackage rec { homepage = "https://github.com/weaviate/weaviate-python-client"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/web/default.nix b/python/pkgs/web/default.nix index 9c8bd8e7e..bfa170a16 100644 --- a/python/pkgs/web/default.nix +++ b/python/pkgs/web/default.nix @@ -7,13 +7,13 @@ legacy-cgi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "web.py"; version = "0.62"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XOaEyqJAZUyuWVDai0t7wXiBIDHgj5kFGNByvUSrUl4="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://webpy.org/"; license = lib.licenses.publicDomain; }; -} +}) diff --git a/python/pkgs/web3/default.nix b/python/pkgs/web3/default.nix index 379a32680..5672a5e31 100644 --- a/python/pkgs/web3/default.nix +++ b/python/pkgs/web3/default.nix @@ -19,7 +19,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "web3"; version = "7.15.0"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ethereum"; repo = "web3.py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BStkLH7lCnhVs2Fc3c0EBXzyZtEgI8ywA01OEBYLUeQ="; }; @@ -64,4 +64,4 @@ buildPythonPackage rec { homepage = "https://web3py.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/webargs/default.nix b/python/pkgs/webargs/default.nix index e722650d1..56bd7efc1 100644 --- a/python/pkgs/webargs/default.nix +++ b/python/pkgs/webargs/default.nix @@ -16,13 +16,13 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "webargs"; version = "8.7.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eZv5A5x2wj/Y3BlREHp1qeVhIDwV1q6PicHkbiNGNsE="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/marshmallow-code/webargs"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/webassets/default.nix b/python/pkgs/webassets/default.nix index c1e09af4d..07118385f 100644 --- a/python/pkgs/webassets/default.nix +++ b/python/pkgs/webassets/default.nix @@ -7,13 +7,13 @@ zope-dottedname, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "webassets"; version = "3.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BSDl/W+8wBL0hv78YblmR02o/Bs1sFaansLLB4LxYHo="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/miracle2k/webassets/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/webauthn/default.nix b/python/pkgs/webauthn/default.nix index 04921e8bc..a714b5038 100644 --- a/python/pkgs/webauthn/default.nix +++ b/python/pkgs/webauthn/default.nix @@ -11,7 +11,7 @@ pyopenssl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "webauthn"; version = "3.0.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "duo-labs"; repo = "py_webauthn"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rT/B95ILb2cI/HH01IC5b4319zdKnrf4ZLUIpAeC3fM="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/duo-labs/py_webauthn"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/webcolors/default.nix b/python/pkgs/webcolors/default.nix index 0484ee619..c3214a5f6 100644 --- a/python/pkgs/webcolors/default.nix +++ b/python/pkgs/webcolors/default.nix @@ -5,13 +5,13 @@ pdm-backend, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "webcolors"; version = "25.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-YquuhlBPZtD2NkwqhSDeSgxHuAwD/DpfGBX+2+98Gb8="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ubernostrum/webcolors"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/webdavclient3/default.nix b/python/pkgs/webdavclient3/default.nix index 78b92468d..2d456d834 100644 --- a/python/pkgs/webdavclient3/default.nix +++ b/python/pkgs/webdavclient3/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "webdavclient3"; version = "3.14.7"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ezhov-evgeny"; repo = "webdav-client-python-3"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-On2vCV3iLxqLYKaiUkwry/lZFjhzlAlU2OYYq/7rrcE="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "wdc"; }; -} +}) diff --git a/python/pkgs/webencodings/default.nix b/python/pkgs/webencodings/default.nix index efdd0a5b5..657cc3f89 100644 --- a/python/pkgs/webencodings/default.nix +++ b/python/pkgs/webencodings/default.nix @@ -6,13 +6,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "webencodings"; version = "0.6.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-Vl+a0DHHAtrkBOJ6CZ4+CRhqOrG5Ug8G0hVQK2Uf2RA="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/CourtBouillon/webencodings"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/webob/default.nix b/python/pkgs/webob/default.nix index 2ba0f002d..c66fd948e 100644 --- a/python/pkgs/webob/default.nix +++ b/python/pkgs/webob/default.nix @@ -6,7 +6,7 @@ legacy-cgi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "webob"; version = "1.8.9"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Pylons"; repo = "webob"; - tag = version; + tag = finalAttrs.version; hash = "sha256-axJQwlybuqBS6RgI2z9pbw58vHF9aC9AxCg13CIKCLs="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://webob.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/webrtc-models/default.nix b/python/pkgs/webrtc-models/default.nix index 4d8894fc5..0d2c66923 100644 --- a/python/pkgs/webrtc-models/default.nix +++ b/python/pkgs/webrtc-models/default.nix @@ -8,7 +8,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "webrtc-models"; version = "0.3.0"; pyproject = true; @@ -18,13 +18,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "python-webrtc-models"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WZPI7vYlfsihskRtrh4XJGx0JSDwn7JIJ8CL3jlryrA="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; pythonRelaxDeps = [ "orjson" ]; @@ -43,4 +43,4 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-libs/python-webrtc-models"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/webrtcvad/default.nix b/python/pkgs/webrtcvad/default.nix index af0ce66f1..677e67a82 100644 --- a/python/pkgs/webrtcvad/default.nix +++ b/python/pkgs/webrtcvad/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "2.0.10"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-8b7S+yW2P7expV1kCQyZPJyRZ7KEha4Lzdgc9u3pauo="; diff --git a/python/pkgs/websocket-client/default.nix b/python/pkgs/websocket-client/default.nix index 3b06d3d18..f31c3fe70 100644 --- a/python/pkgs/websocket-client/default.nix +++ b/python/pkgs/websocket-client/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "websocket-client"; version = "1.9.2"; pyproject = true; src = fetchPypi { pname = "websocket_client"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-D8tXVFhIvoaZLhKCGP2W3Yemdp/9salo3/eWMrhWBNA="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl21Plus; mainProgram = "wsdump"; }; -} +}) diff --git a/python/pkgs/websockets/default.nix b/python/pkgs/websockets/default.nix index 864c5dea8..d899d1cb2 100644 --- a/python/pkgs/websockets/default.nix +++ b/python/pkgs/websockets/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "websockets"; version = "17.0.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aaugustin"; repo = "websockets"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7qY2u0rIHnwQNZtgZ59YOcO2EKCV++/lc9q1BHRdJr0="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://websockets.readthedocs.io/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/websockify/default.nix b/python/pkgs/websockify/default.nix index f44b288f6..b922e02c3 100644 --- a/python/pkgs/websockify/default.nix +++ b/python/pkgs/websockify/default.nix @@ -15,8 +15,6 @@ buildPythonPackage (finalAttrs: { version = "0.13.0"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "novnc"; repo = "websockify"; diff --git a/python/pkgs/webtest-aiohttp/default.nix b/python/pkgs/webtest-aiohttp/default.nix index b281968d3..efe641de5 100644 --- a/python/pkgs/webtest-aiohttp/default.nix +++ b/python/pkgs/webtest-aiohttp/default.nix @@ -8,7 +8,7 @@ webtest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "webtest-aiohttp"; version = "2.0.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sloria"; repo = "webtest-aiohttp"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UuAz/k/Tnumupv3ybFR7PkYHwG3kH7M5oobZykEP+ao="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { homepage = "https://github.com/sloria/webtest-aiohttp"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/webtest/default.nix b/python/pkgs/webtest/default.nix index 158bec5fb..47ff5da38 100644 --- a/python/pkgs/webtest/default.nix +++ b/python/pkgs/webtest/default.nix @@ -12,13 +12,13 @@ webob, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "webtest"; version = "3.0.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-euq1D5cNRsBo56Nt0WLLJCWR7fcqHQTv0hN0dyuTF0E="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { homepage = "https://webtest.readthedocs.org/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/werkzeug/default.nix b/python/pkgs/werkzeug/default.nix index a56ceb11d..70790a0fc 100644 --- a/python/pkgs/werkzeug/default.nix +++ b/python/pkgs/werkzeug/default.nix @@ -13,13 +13,13 @@ watchdog, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "werkzeug"; version = "3.1.8"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-m61hpCaNrBEvHFzUYwpW7eYBtu1CAwBneoaQg9cKTEQ="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { ''; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/west/default.nix b/python/pkgs/west/default.nix index b3696d149..c13ae372c 100644 --- a/python/pkgs/west/default.nix +++ b/python/pkgs/west/default.nix @@ -9,13 +9,13 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "west"; version = "1.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cIj+Dpr+Bxnr7pXFHFKRSfe8/JGdg6ggbTX6nGg+0KU="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/zephyrproject-rtos/west"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/wget/default.nix b/python/pkgs/wget/default.nix index 38059a2f4..a68b80cd4 100644 --- a/python/pkgs/wget/default.nix +++ b/python/pkgs/wget/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wget"; version = "3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-NeYw7KKqUM6Zi5saEnuyazDf7lc3AngqqYL4dePxYGE="; extension = "zip"; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { description = "Pure python download utility"; license = lib.licenses.unlicense; }; -} +}) diff --git a/python/pkgs/whatthepatch/default.nix b/python/pkgs/whatthepatch/default.nix index 6c2c9be1f..14ddb23e3 100644 --- a/python/pkgs/whatthepatch/default.nix +++ b/python/pkgs/whatthepatch/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "whatthepatch"; version = "1.0.7"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cscorley"; repo = "whatthepatch"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0pkkwVo9yaFEZyitfpKMC8EVr8HgPLUkrGWmyYOdZNE="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/cscorley/whatthepatch"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/wheel-filename/default.nix b/python/pkgs/wheel-filename/default.nix index 23787d853..2c2d90cd1 100644 --- a/python/pkgs/wheel-filename/default.nix +++ b/python/pkgs/wheel-filename/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wheel-filename"; version = "2.1.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jwodder"; repo = "wheel-filename"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YlJ3mQoaNY7wiLzADLZuTET5i37e/zn2S7n9dOdcE0E="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "wheel-filename"; }; -} +}) diff --git a/python/pkgs/wheel/default.nix b/python/pkgs/wheel/default.nix index 8a7427843..f864e8847 100644 --- a/python/pkgs/wheel/default.nix +++ b/python/pkgs/wheel/default.nix @@ -5,7 +5,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wheel"; version = "0.47.0"; pyproject = true; @@ -13,14 +13,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pypa"; repo = "wheel"; - tag = version; + tag = finalAttrs.version; hash = "sha256-/5OxFySesdsFsuUbhdhcgFPsry8RSy5ZshG0TWGncVY="; }; nativeBuildInputs = [ flit-core ]; # No tests in archive - doCheck = false; pythonImportsCheck = [ "wheel" ]; @@ -42,4 +41,4 @@ buildPythonPackage rec { ''; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/wheezy-template/default.nix b/python/pkgs/wheezy-template/default.nix index 08e92b7f3..2a1898591 100644 --- a/python/pkgs/wheezy-template/default.nix +++ b/python/pkgs/wheezy-template/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wheezy.template"; version = "3.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-hknPXHGPPNjRAr0TYVosPaTntsjwQjOKZBCU+qFlIHw="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { description = "Lightweight template library"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/whenever/default.nix b/python/pkgs/whenever/default.nix index 1fa38f5cb..e26196936 100644 --- a/python/pkgs/whenever/default.nix +++ b/python/pkgs/whenever/default.nix @@ -16,7 +16,7 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "whenever"; version = "0.10.2"; pyproject = true; @@ -24,12 +24,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ariebovenberg"; repo = "whenever"; - tag = version; + tag = finalAttrs.version; hash = "sha256-D3jNrxNTBbSheymnI72xAhdvvRzsbjIk+Gp82X7AkdU="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit (finalAttrs) src; hash = "sha256-bmKUeVZwaqCN81v1YDnz66ZsUE8VTMBHlph6ZootKu8="; }; @@ -48,7 +48,6 @@ buildPythonPackage rec { # a bunch of failures, including an assumption of what the timezone on the host is # TODO: try enabling on bump - doCheck = false; passthru.updateScript = nix-update-script { }; @@ -57,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/ariebovenberg/whenever"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/whey-pth/default.nix b/python/pkgs/whey-pth/default.nix index aab748087..ce6ffc39a 100644 --- a/python/pkgs/whey-pth/default.nix +++ b/python/pkgs/whey-pth/default.nix @@ -7,7 +7,7 @@ whey, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "whey-pth"; version = "0.0.6"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "repo-helper"; repo = "whey-pth"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-A+bXB9F8FD+A1iRuETIxP12bkH/5NKcx01ERXJZAj+Q="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/repo-helper/whey-pth"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/whey/default.nix b/python/pkgs/whey/default.nix index 2c3ca0998..656803152 100644 --- a/python/pkgs/whey/default.nix +++ b/python/pkgs/whey/default.nix @@ -18,7 +18,7 @@ shippinglabel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "whey"; version = "0.1.1"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "repo-helper"; repo = "whey"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-s2jZmuFj0gTWVTcXWcBhcu5RBuaf/qMS/xzIpIoG1ZE="; }; @@ -54,7 +54,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "whey" ]; optional-dependencies = { - all = lib.concatAttrValues (lib.removeAttrs optional-dependencies [ "all" ]); + all = lib.concatAttrValues (lib.removeAttrs finalAttrs.optional-dependencies [ "all" ]); editable = [ editables ]; @@ -72,4 +72,4 @@ buildPythonPackage rec { homepage = "https://github.com/repo-helper/whey"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/whichcraft/default.nix b/python/pkgs/whichcraft/default.nix index 684e07cf8..7ca20df87 100644 --- a/python/pkgs/whichcraft/default.nix +++ b/python/pkgs/whichcraft/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "whichcraft"; version = "0.6.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rNu5G2PWoV771kMNHXstNuRKcWl+k+Gbfe1Hev2fzoc="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydanny/whichcraft"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/whisper/default.nix b/python/pkgs/whisper/default.nix index 2494fb25b..352ca536d 100644 --- a/python/pkgs/whisper/default.nix +++ b/python/pkgs/whisper/default.nix @@ -6,7 +6,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "whisper"; version = "1.1.10"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "graphite-project"; repo = "whisper"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CnCbRmI2jc67mTtfupoE1uHtobrAiWoUXbfX8YeEV6A="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { description = "Fixed size round-robin style database"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/whoosh/default.nix b/python/pkgs/whoosh/default.nix index f6283ea47..ba7f4bb51 100644 --- a/python/pkgs/whoosh/default.nix +++ b/python/pkgs/whoosh/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "whoosh"; version = "2.7.4"; pyproject = true; src = fetchPypi { pname = "Whoosh"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-fKVjPb+p4OD6QA0xUaigxL7FO9Ls7cCmdwWxdWXDGoM="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/mchaput/whoosh"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/widgetsnbextension/default.nix b/python/pkgs/widgetsnbextension/default.nix index b93e31ad5..e6d53cb7d 100644 --- a/python/pkgs/widgetsnbextension/default.nix +++ b/python/pkgs/widgetsnbextension/default.nix @@ -5,13 +5,13 @@ ipywidgets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "widgetsnbextension"; version = "4.0.16"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-re6grnjwhW7klF9BMpmAG4KgoBQWMDMB85pwQoKje3M="; }; @@ -20,11 +20,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "widgetsnbextension" ]; # No tests in archive - doCheck = false; meta = { description = "IPython HTML widgets for Jupyter"; homepage = "https://github.com/jupyter-widgets/ipywidgets/tree/master/python/widgetsnbextension"; license = ipywidgets.meta.license; # Build from same repo }; -} +}) diff --git a/python/pkgs/wikipedia-api/default.nix b/python/pkgs/wikipedia-api/default.nix index 68de92bbb..a8bdfa4c2 100644 --- a/python/pkgs/wikipedia-api/default.nix +++ b/python/pkgs/wikipedia-api/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wikipedia-api"; version = "0.9.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "martin-majlis"; repo = "Wikipedia-API"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kIZnKb0dzvXBgK1UNoG0gVIy5BvHnOjZbRo+xsLeQ/g="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/martin-majlis/Wikipedia-API"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/wikipedia/default.nix b/python/pkgs/wikipedia/default.nix index 894f2160e..31ba8e941 100644 --- a/python/pkgs/wikipedia/default.nix +++ b/python/pkgs/wikipedia/default.nix @@ -11,13 +11,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wikipedia"; version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2w+tGCn91EGxhSMG6YVjmCBNwHhtKZbdLgyLuOJhM7I="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/goldsmith/Wikipedia"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/winacl/default.nix b/python/pkgs/winacl/default.nix index 9a00f2642..d692b6524 100644 --- a/python/pkgs/winacl/default.nix +++ b/python/pkgs/winacl/default.nix @@ -10,13 +10,13 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "winacl"; version = "0.1.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-r3DC7DAXi/njyKHEjCXoeBI1/iwbMhrbRuLyrh+NSqs="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/skelsec/winacl"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/winsspi/default.nix b/python/pkgs/winsspi/default.nix index 26036db6e..5f143a7b1 100644 --- a/python/pkgs/winsspi/default.nix +++ b/python/pkgs/winsspi/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "0.0.11"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-AXC6SJ+iWPGqTmdgoWKEbD8tDUUcg2aD609hO2bdQfM="; diff --git a/python/pkgs/wirerope/default.nix b/python/pkgs/wirerope/default.nix index ad49f60ba..0cac20974 100644 --- a/python/pkgs/wirerope/default.nix +++ b/python/pkgs/wirerope/default.nix @@ -7,7 +7,7 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wirerope"; version = "1.0.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "youknowone"; repo = "wirerope"; - rev = version; + tag = finalAttrs.version; hash = "sha256-oojnv+2+nwL/TJhN+QZ5eiV6WGHC3SCxBQrCri0aHQc="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/youknowone/wirerope"; license = lib.licenses.bsd2WithViews; }; -} +}) diff --git a/python/pkgs/wn/default.nix b/python/pkgs/wn/default.nix index cdf833322..dfeb8c7e0 100644 --- a/python/pkgs/wn/default.nix +++ b/python/pkgs/wn/default.nix @@ -8,13 +8,13 @@ starlette, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wn"; version = "1.1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BVXqh18T32SPNDucYiFT5Pce5CvJ1XoA8mDhko+GsSg="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/goodmami/wn"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/word2number/default.nix b/python/pkgs/word2number/default.nix index c46db48d4..160b28387 100644 --- a/python/pkgs/word2number/default.nix +++ b/python/pkgs/word2number/default.nix @@ -7,7 +7,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "word2number"; version = "1.1"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "akshaynagpal"; repo = "w2n"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dgHPEfieNDZnP6+YvywvN3ZzmeICav0WMYKkWDSJ/LE="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail "version = '1.0'" "version = '${version}'" + --replace-fail "version = '1.0'" "version = '${finalAttrs.version}'" ''; build-system = [ @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "http://w2n.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/wordcloud/default.nix b/python/pkgs/wordcloud/default.nix index 3b63628f5..9bdb7dc87 100644 --- a/python/pkgs/wordcloud/default.nix +++ b/python/pkgs/wordcloud/default.nix @@ -10,7 +10,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wordcloud"; version = "1.9.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { ]; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3xfEaP+QO9CrpPh8ZUB0XROkkxIg3Uk3yzY62FpHcbk="; }; @@ -40,4 +40,4 @@ buildPythonPackage rec { homepage = "https://github.com/amueller/word_cloud"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/wrapt/default.nix b/python/pkgs/wrapt/default.nix index 82007e674..abd3762ef 100644 --- a/python/pkgs/wrapt/default.nix +++ b/python/pkgs/wrapt/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wrapt"; version = "2.4.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GrahamDumpleton"; repo = "wrapt"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LzHiX23w6idv7xV7N2XA3vcaV2tzaivP7Dut/EkvzFE="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/GrahamDumpleton/wrapt"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/ws4py/default.nix b/python/pkgs/ws4py/default.nix index c53788862..1e6433f5e 100644 --- a/python/pkgs/ws4py/default.nix +++ b/python/pkgs/ws4py/default.nix @@ -8,13 +8,13 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ws4py"; version = "0.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-n4exm3c/CgdEo486+jaoAyht0xl/C7Ndm3UpPscALRk="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://ws4py.readthedocs.org"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/wsgi-intercept/default.nix b/python/pkgs/wsgi-intercept/default.nix index 0fb07adad..6080bb6b9 100644 --- a/python/pkgs/wsgi-intercept/default.nix +++ b/python/pkgs/wsgi-intercept/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wsgi-intercept"; version = "1.13.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cdent"; repo = "wsgi-intercept"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hs5yB0+eDlh/pNPaqYIU9C+RBpyrdPOAscQGIoqzmvU="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = "https://github.com/cdent/wsgi-intercept"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/wsgiproxy2/default.nix b/python/pkgs/wsgiproxy2/default.nix index b2869caa3..39d24166f 100644 --- a/python/pkgs/wsgiproxy2/default.nix +++ b/python/pkgs/wsgiproxy2/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, webob, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wsgiproxy2"; version = "0.5.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "gawel"; repo = "WSGIProxy2"; - rev = version; + tag = finalAttrs.version; hash = "sha256-ouofw3cBQzBwSh3Pdtdl7KI2pg/T/z3qoh8zoeiKiSs="; }; - propagatedBuildInputs = [ webob ]; + build-system = [ setuptools ]; + + dependencies = [ webob ]; # Circular dependency on webtest @@ -28,4 +32,4 @@ buildPythonPackage rec { homepage = "https://wsgiproxy2.readthedocs.io/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/wsme/default.nix b/python/pkgs/wsme/default.nix index b672a5532..c024b7a8b 100644 --- a/python/pkgs/wsme/default.nix +++ b/python/pkgs/wsme/default.nix @@ -7,6 +7,8 @@ importlib-metadata, simplegeneric, netaddr, + pytz, + webob, }: buildPythonPackage (finalAttrs: { @@ -26,8 +28,10 @@ buildPythonPackage (finalAttrs: { dependencies = [ importlib-metadata - simplegeneric netaddr + pytz + simplegeneric + webob ]; meta = { diff --git a/python/pkgs/wsproto/default.nix b/python/pkgs/wsproto/default.nix index 4b3b42e22..265857d23 100644 --- a/python/pkgs/wsproto/default.nix +++ b/python/pkgs/wsproto/default.nix @@ -6,13 +6,13 @@ h11, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wsproto"; version = "1.3.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uGiF3PKU4VIEkZlQ9mbgb/xsfBFMqQCwYNbhYpNSgpQ="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-hyper/wsproto/"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/wtforms-sqlalchemy/default.nix b/python/pkgs/wtforms-sqlalchemy/default.nix index 819284e37..67abcff09 100644 --- a/python/pkgs/wtforms-sqlalchemy/default.nix +++ b/python/pkgs/wtforms-sqlalchemy/default.nix @@ -7,7 +7,7 @@ wtforms, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wtforms-sqlalchemy"; version = "0.4.2"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wtforms"; repo = "wtforms-sqlalchemy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-E2F8lOcgne2yGEyn6g8j3mHr045eOyKu77DFGwWTPkc="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/wtforms/wtforms-sqlalchemy"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/wtforms/default.nix b/python/pkgs/wtforms/default.nix index 9fcbe5c6b..967c952a0 100644 --- a/python/pkgs/wtforms/default.nix +++ b/python/pkgs/wtforms/default.nix @@ -12,13 +12,13 @@ markupsafe, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wtforms"; version = "3.3.0b3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-oRxWo1Xbp0OzRUFL8kkPw/5xUCatkNxZGBLasYXZQ30="; }; @@ -30,8 +30,6 @@ buildPythonPackage rec { dependencies = [ markupsafe ]; - doCheck = false; - pythonImportsCheck = [ "wtforms" ]; meta = { @@ -39,4 +37,4 @@ buildPythonPackage rec { homepage = "https://github.com/wtforms/wtforms"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/x-wr-timezone/default.nix b/python/pkgs/x-wr-timezone/default.nix index 6ead688eb..875f024f2 100644 --- a/python/pkgs/x-wr-timezone/default.nix +++ b/python/pkgs/x-wr-timezone/default.nix @@ -8,7 +8,7 @@ tzdata, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "x-wr-timezone"; version = "2.0.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "niccokunzmann"; repo = "x-wr-timezone"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Llpe3Z0Yfd0vRgx95D4YVrnNJk0g/VqPuNvtUrUpFk0="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/niccokunzmann/x-wr-timezone"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/python/pkgs/xattr/default.nix b/python/pkgs/xattr/default.nix index b2d13f140..7ee4177d0 100644 --- a/python/pkgs/xattr/default.nix +++ b/python/pkgs/xattr/default.nix @@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: { # https://github.com/xattr/xattr/issues/43 - propagatedBuildInputs = [ cffi ]; + dependencies = [ cffi ]; postBuild = '' ${python.pythonOnBuildForHost.interpreter} -m compileall -f xattr diff --git a/python/pkgs/xdg-base-dirs/default.nix b/python/pkgs/xdg-base-dirs/default.nix index 40bceee3d..ea5ab264e 100644 --- a/python/pkgs/xdg-base-dirs/default.nix +++ b/python/pkgs/xdg-base-dirs/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xdg-base-dirs"; version = "6.0.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "srstevenson"; repo = "xdg-base-dirs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-iXK9WURTfmpl5vd7RsT0ptwfrb5UQQFqMMCu3+vL+EY="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/srstevenson/xdg-base-dirs"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/xdg/default.nix b/python/pkgs/xdg/default.nix index 78edfb3bd..3dfc93e57 100644 --- a/python/pkgs/xdg/default.nix +++ b/python/pkgs/xdg/default.nix @@ -6,7 +6,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "6.0.0"; pname = "xdg"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { # there are actually breaking changes in xdg_base_dirs, # and libraries that want to support python 3.9 and below need to use xdg. src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JCeAlPLUXoRtHrKKLruS17Z/wMq1JJ7jzojJX2SaHJI="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ clikit ]; + dependencies = [ clikit ]; # sdist has no tests @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/srstevenson/xdg"; license = lib.licenses.isc; }; -} +}) diff --git a/python/pkgs/xdis/default.nix b/python/pkgs/xdis/default.nix index c0da41ae8..00cb718a2 100644 --- a/python/pkgs/xdis/default.nix +++ b/python/pkgs/xdis/default.nix @@ -8,7 +8,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xdis"; version = "6.3.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; - tag = version; + tag = finalAttrs.version; hash = "sha256-k1SawlgbItbWe8J2pAxYOku/4CHyzWH3UR1j3kBZy1Q="; }; @@ -51,4 +51,4 @@ buildPythonPackage rec { homepage = "https://github.com/rocky/python-xdis"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/python/pkgs/xdoctest/default.nix b/python/pkgs/xdoctest/default.nix index 22a180bc5..79e880738 100644 --- a/python/pkgs/xdoctest/default.nix +++ b/python/pkgs/xdoctest/default.nix @@ -6,7 +6,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xdoctest"; version = "1.3.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Erotemic"; repo = "xdoctest"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cwRelkADUrSbrzJ8JjgLCiPil2ynwFmaLLWByJWkXwA="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "xdoctest"; }; -} +}) diff --git a/python/pkgs/xhtml2pdf/default.nix b/python/pkgs/xhtml2pdf/default.nix index 74ae236ca..e8a2121ac 100644 --- a/python/pkgs/xhtml2pdf/default.nix +++ b/python/pkgs/xhtml2pdf/default.nix @@ -14,7 +14,7 @@ svglib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xhtml2pdf"; version = "0.2.18"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "xhtml2pdf"; repo = "xhtml2pdf"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AAFtHz1jOPmSMP3FIo9Tb5Bv0TmR2PtLsB1uSEgNLJo="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "xhtml2pdf"; }; -} +}) diff --git a/python/pkgs/xkbcommon/default.nix b/python/pkgs/xkbcommon/default.nix index cf188b723..7bd034a5e 100644 --- a/python/pkgs/xkbcommon/default.nix +++ b/python/pkgs/xkbcommon/default.nix @@ -14,8 +14,6 @@ buildPythonPackage (finalAttrs: { version = "1.5.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-rBdICNv2HTXZ2oBL8zuqx0vG8r4MEIWUrpPHnNFd3DY="; diff --git a/python/pkgs/xkcdpass/default.nix b/python/pkgs/xkcdpass/default.nix index c2845cd46..3bc501bae 100644 --- a/python/pkgs/xkcdpass/default.nix +++ b/python/pkgs/xkcdpass/default.nix @@ -6,13 +6,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xkcdpass"; version = "1.30.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ijprYCVdpA0OXIEkWCgCeMgtLBy5DkivvWd327+HlcM="; }; @@ -22,7 +22,7 @@ buildPythonPackage rec { postInstall = '' installManPage *.? - install -Dm444 -t $out/share/doc/${pname} README* + install -Dm444 -t $out/share/doc/${finalAttrs.pname} README* ''; pythonImportsCheck = [ "xkcdpass" ]; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/redacted/XKCD-password-generator"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/xlrd/default.nix b/python/pkgs/xlrd/default.nix index ec1f4119b..9560f8da3 100644 --- a/python/pkgs/xlrd/default.nix +++ b/python/pkgs/xlrd/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + # build-system + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xlrd"; version = "2.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "sha256-CLXiXeWPIc5x3H2zs7gQbB+ndvMCTFTkW0WzdOiSNMk="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "xlrd" ]; meta = { @@ -22,4 +26,4 @@ buildPythonPackage rec { mainProgram = "runxlrd.py"; license = lib.licenses.bsd0; }; -} +}) diff --git a/python/pkgs/xlsx2csv/default.nix b/python/pkgs/xlsx2csv/default.nix index 9b66602d9..5769ce5cd 100644 --- a/python/pkgs/xlsx2csv/default.nix +++ b/python/pkgs/xlsx2csv/default.nix @@ -6,13 +6,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xlsx2csv"; version = "0.8.6"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-YY/FAmEoYN6KuOPWGV6Z7zMv/8aDN/a4nllpCq0NILU="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/dilshod/xlsx2csv"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/xlsxwriter/default.nix b/python/pkgs/xlsxwriter/default.nix index c852311c8..d5ef2d011 100644 --- a/python/pkgs/xlsxwriter/default.nix +++ b/python/pkgs/xlsxwriter/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xlsxwriter"; version = "3.2.9"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jmcnamara"; repo = "XlsxWriter"; - tag = "RELEASE_${version}"; + tag = "RELEASE_${finalAttrs.version}"; hash = "sha256-nr7Qw24BzQo/qEpyM9687mUaebzzHv1FAPmsBVdMekg="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; mainProgram = "vba_extract.py"; }; -} +}) diff --git a/python/pkgs/xmldiff/default.nix b/python/pkgs/xmldiff/default.nix index c912e2913..bcc99286f 100644 --- a/python/pkgs/xmldiff/default.nix +++ b/python/pkgs/xmldiff/default.nix @@ -10,13 +10,13 @@ lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xmldiff"; version = "3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OA7E0FzvM/W3Bs94mrzISNJ3MNZ+AtwLTxEH4Wzpqq0="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = "https://github.com/Shoobx/xmldiff"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/xmlschema/default.nix b/python/pkgs/xmlschema/default.nix index 168793f36..134661d55 100644 --- a/python/pkgs/xmlschema/default.nix +++ b/python/pkgs/xmlschema/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xmlschema"; version = "4.3.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OEQUq98n9dUKR8tWokboDhozBCczYCUlqI2qUGaTHtw="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/sissaschool/xmlschema"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/xmltodict/default.nix b/python/pkgs/xmltodict/default.nix index b19defb5b..3cc414135 100644 --- a/python/pkgs/xmltodict/default.nix +++ b/python/pkgs/xmltodict/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xmltodict"; version = "1.0.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "martinblech"; repo = "xmltodict"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-G7hVtS6toUJC0YY1AXBOJSc3wnAZyWilLnT/5vvFRRw="; }; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/martinblech/xmltodict"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/xmod/default.nix b/python/pkgs/xmod/default.nix index ac0da9be5..3f7361dc7 100644 --- a/python/pkgs/xmod/default.nix +++ b/python/pkgs/xmod/default.nix @@ -5,13 +5,13 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xmod"; version = "1.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tAsqVNVmhLAeuWJ4krDBeZGOjvC9TX87rHo/26Ec1uY="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/rec/xmod"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/xmpppy/default.nix b/python/pkgs/xmpppy/default.nix index 77a665ff8..b7e748120 100644 --- a/python/pkgs/xmpppy/default.nix +++ b/python/pkgs/xmpppy/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xmpppy"; version = "0.7.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "xmpppy"; repo = "xmpppy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-wg7mxNHQ1+cFDLmHNafwQ2+45Jiqy36uZh28Ksu0k7Y="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/xmpppy/xmpppy"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/python/pkgs/xsdata/default.nix b/python/pkgs/xsdata/default.nix index 827b50a25..27d719855 100644 --- a/python/pkgs/xsdata/default.nix +++ b/python/pkgs/xsdata/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xsdata"; version = "26.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tefra"; repo = "xsdata"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-h5VGXGXQSG4o8H+Q+Z0SN9rw4mFI8EORNtB+4VAKg/k="; }; @@ -56,4 +56,4 @@ buildPythonPackage rec { homepage = "https://github.com/tefra/xsdata"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/xstatic-font-awesome/default.nix b/python/pkgs/xstatic-font-awesome/default.nix index fd1cb2fb5..de4ff695d 100644 --- a/python/pkgs/xstatic-font-awesome/default.nix +++ b/python/pkgs/xstatic-font-awesome/default.nix @@ -5,14 +5,14 @@ setuptools_80, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xstatic-font-awesome"; version = "6.2.1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "XStatic-Font-Awesome"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-8HWHEJYShjjy4VOQINgid1TD2IXdaOfubemgEjUHaCg="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { description = "Font Awesome packaged for python"; license = lib.licenses.ofl; }; -} +}) diff --git a/python/pkgs/xstatic-jquery-ui/default.nix b/python/pkgs/xstatic-jquery-ui/default.nix index f7f7499d9..8ef494422 100644 --- a/python/pkgs/xstatic-jquery-ui/default.nix +++ b/python/pkgs/xstatic-jquery-ui/default.nix @@ -11,8 +11,6 @@ buildPythonPackage (finalAttrs: { version = "1.13.0.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "XStatic-jquery-ui"; inherit (finalAttrs) version; diff --git a/python/pkgs/xstatic-jquery/default.nix b/python/pkgs/xstatic-jquery/default.nix index f43901995..ffea85080 100644 --- a/python/pkgs/xstatic-jquery/default.nix +++ b/python/pkgs/xstatic-jquery/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "3.5.1.1"; pyproject = true; - __structuredAttrs = true; - src = fetchPypi { pname = "XStatic-jQuery"; inherit (finalAttrs) version; diff --git a/python/pkgs/xstatic/default.nix b/python/pkgs/xstatic/default.nix index 6345c937b..ad439b0ca 100644 --- a/python/pkgs/xstatic/default.nix +++ b/python/pkgs/xstatic/default.nix @@ -2,20 +2,20 @@ lib, buildPythonPackage, fetchPypi, - setuptools, + setuptools_80, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "XStatic"; version = "1.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QCVEzJ4XlIlEEFTwnIB4BOEV6iRpB96HwDVftPWjEmg="; }; - build-system = [ setuptools ]; + build-system = [ setuptools_80 ]; pythonImportsCheck = [ "xstatic" ]; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/xstatic-py/xstatic"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/xxhash/default.nix b/python/pkgs/xxhash/default.nix index c850d6af6..e4a021673 100644 --- a/python/pkgs/xxhash/default.nix +++ b/python/pkgs/xxhash/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xxhash"; version = "3.8.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-sN5L86pmNjVS1SxqiQA8R5kR8SCYzUilPUSg96JffEY="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/ifduyue/python-xxhash"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/xyzservices/default.nix b/python/pkgs/xyzservices/default.nix index 5296e1d0a..c2de0085f 100644 --- a/python/pkgs/xyzservices/default.nix +++ b/python/pkgs/xyzservices/default.nix @@ -8,13 +8,13 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xyzservices"; version = "2026.9.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jRo5v2sZKUDMXbUmTu78GyDdGE+Lg7EwOweHQ3RPWUM="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/geopandas/xyzservices"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/yacs/default.nix b/python/pkgs/yacs/default.nix index d704fb523..04898fb0b 100644 --- a/python/pkgs/yacs/default.nix +++ b/python/pkgs/yacs/default.nix @@ -12,8 +12,6 @@ buildPythonPackage (finalAttrs: { version = "0.1.8"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "rbgirshick"; repo = "yacs"; diff --git a/python/pkgs/yamale/default.nix b/python/pkgs/yamale/default.nix index 4d2878bfa..50f018878 100644 --- a/python/pkgs/yamale/default.nix +++ b/python/pkgs/yamale/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yamale"; version = "6.1.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "23andMe"; repo = "yamale"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+UZJhZLJEZVGPF9D9B8blGh4pLszQnDoOl5xQMpvVl0="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "yamale"; }; -} +}) diff --git a/python/pkgs/yamllint/default.nix b/python/pkgs/yamllint/default.nix index 5adb6ee51..c6b67df53 100644 --- a/python/pkgs/yamllint/default.nix +++ b/python/pkgs/yamllint/default.nix @@ -8,7 +8,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yamllint"; version = "1.38.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adrienverge"; repo = "yamllint"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4H8tbn2TRzTGIXmP9Hnmc93rGSLsWh5A5R9KAIz0mKM="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; mainProgram = "yamllint"; }; -} +}) diff --git a/python/pkgs/yamlordereddictloader/default.nix b/python/pkgs/yamlordereddictloader/default.nix index 5fe698d6d..b744bae3a 100644 --- a/python/pkgs/yamlordereddictloader/default.nix +++ b/python/pkgs/yamlordereddictloader/default.nix @@ -6,13 +6,13 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yamlordereddictloader"; version = "0.4.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Nq8vYhD8/12k/EwS4dgV+XPc60EETnleHwYRXWNLyhM="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/fmenabe/python-yamlordereddictloader"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/yapf/default.nix b/python/pkgs/yapf/default.nix index 826798104..0d1b983bb 100644 --- a/python/pkgs/yapf/default.nix +++ b/python/pkgs/yapf/default.nix @@ -8,13 +8,13 @@ tomli, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yapf"; version = "0.43.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ANOqJL/t/5QgsuDV2fWrbZ1CaOcq+/Wbs/pUJ4HVIY4="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/google/yapf"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/yappi/default.nix b/python/pkgs/yappi/default.nix index 5671f1ed7..b7e4c29cf 100644 --- a/python/pkgs/yappi/default.nix +++ b/python/pkgs/yappi/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yappi"; version = "1.7.3"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sumerc"; repo = "yappi"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YbWPx5Wf1s1UCCiDCInw66VnZ005LfON81MN3phT+fU="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/sumerc/yappi"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/yarl/default.nix b/python/pkgs/yarl/default.nix index 2a08decb0..239ac592d 100644 --- a/python/pkgs/yarl/default.nix +++ b/python/pkgs/yarl/default.nix @@ -10,7 +10,7 @@ propcache, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yarl"; version = "1.24.5"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "yarl"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2Uqn1TwfH375CBIveEpsco4dDNrhxHwX8wIP8dKhh/M="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/aio-libs/yarl"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/yaspin/default.nix b/python/pkgs/yaspin/default.nix index 4e4c20175..95894883d 100644 --- a/python/pkgs/yaspin/default.nix +++ b/python/pkgs/yaspin/default.nix @@ -8,7 +8,7 @@ termcolor, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yaspin"; version = "3.5.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pavdmyt"; repo = "yaspin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cNxIaATqLqtDa8ComUb9knuPpJ7hE06Gvnaf14yplmg="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/pavdmyt/yaspin"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/yaswfp/default.nix b/python/pkgs/yaswfp/default.nix index 629c08c39..f46c18ddc 100644 --- a/python/pkgs/yaswfp/default.nix +++ b/python/pkgs/yaswfp/default.nix @@ -10,8 +10,6 @@ buildPythonPackage (finalAttrs: { version = "0.9.3-unstable-2014-09-11"; pyproject = true; - __structuredAttrs = true; - src = fetchFromGitHub { owner = "facundobatista"; repo = "yaswfp"; diff --git a/python/pkgs/yattag/default.nix b/python/pkgs/yattag/default.nix index 5d28ad688..8c05f1e49 100644 --- a/python/pkgs/yattag/default.nix +++ b/python/pkgs/yattag/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yattag"; version = "1.16.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uqjyVOfqXT4GGCga0v9WEODlNgs2COaVwpv7OynQUfQ="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://www.yattag.org/"; license = lib.licenses.lgpl21Only; }; -} +}) diff --git a/python/pkgs/youtube-search/default.nix b/python/pkgs/youtube-search/default.nix index 0a00df636..ab5148106 100644 --- a/python/pkgs/youtube-search/default.nix +++ b/python/pkgs/youtube-search/default.nix @@ -6,13 +6,13 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "youtube_search"; version = "2.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-U5inzWXZt1qLrCfvaJ7ARKurPL+h8g0Z2wJ3ZZrHDZg="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/joetats/youtube_search"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/youtube-transcript-api/default.nix b/python/pkgs/youtube-transcript-api/default.nix index 5ab37b988..b90b3e1f2 100644 --- a/python/pkgs/youtube-transcript-api/default.nix +++ b/python/pkgs/youtube-transcript-api/default.nix @@ -8,7 +8,7 @@ httpretty, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "youtube-transcript-api"; version = "1.2.4"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jdepoix"; repo = "youtube-transcript-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FFLbDiZJR+xqaMMjcBQFYgrdJEofTiBdSNmmlMlrNfY="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/jdepoix/youtube-transcript-api"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/yoyo-migrations/default.nix b/python/pkgs/yoyo-migrations/default.nix index acd4702f9..1e9d09496 100644 --- a/python/pkgs/yoyo-migrations/default.nix +++ b/python/pkgs/yoyo-migrations/default.nix @@ -12,13 +12,13 @@ tabulate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yoyo-migrations"; version = "8.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ggYGoD4mLPHNT1niVsKPpEZCUiTVuCo9EnX9eBeFI+Q="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://ollycope.com/software/yoyo"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/yq/default.nix b/python/pkgs/yq/default.nix index 301606bd4..ad060a87a 100644 --- a/python/pkgs/yq/default.nix +++ b/python/pkgs/yq/default.nix @@ -12,13 +12,13 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yq"; version = "3.4.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ulhqGm8wz3BbL5IgZxLfIoHNMgKAIQ57e4Cty48lbjs="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; mainProgram = "yq"; }; -} +}) diff --git a/python/pkgs/yte/default.nix b/python/pkgs/yte/default.nix index 683ff875e..fba8b7989 100644 --- a/python/pkgs/yte/default.nix +++ b/python/pkgs/yte/default.nix @@ -7,7 +7,7 @@ uv-build, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yte"; version = "1.9.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "koesterlab"; repo = "yte"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TpY13HYBZ4qL2W6sPdoM+bpHcEOi0rwubCbFa4zm2I0="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { pythonImportsCheck = [ "yte" ]; -} +}) diff --git a/python/pkgs/ytmusicapi/default.nix b/python/pkgs/ytmusicapi/default.nix index dede57649..589714019 100644 --- a/python/pkgs/ytmusicapi/default.nix +++ b/python/pkgs/ytmusicapi/default.nix @@ -6,7 +6,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ytmusicapi"; version = "1.12.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sigma67"; repo = "ytmusicapi"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kYx1pimYj+WBYgmxQUin/Af3d6o7HJzqy7DUkbDyKBI="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "ytmusicapi"; }; -} +}) diff --git a/python/pkgs/zc-lockfile/default.nix b/python/pkgs/zc-lockfile/default.nix index a34d7e343..a9995b245 100644 --- a/python/pkgs/zc-lockfile/default.nix +++ b/python/pkgs/zc-lockfile/default.nix @@ -7,14 +7,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zc-lockfile"; version = "4.0"; pyproject = true; src = fetchPypi { pname = "zc_lockfile"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-06sPU5dClqgG2zIZuRkboObVy70dqi4NFyCMubKdIQI="; }; @@ -34,4 +34,4 @@ buildPythonPackage rec { description = "Inter-process locks"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zconfig/default.nix b/python/pkgs/zconfig/default.nix index db27ddbc0..ba9edd8de 100644 --- a/python/pkgs/zconfig/default.nix +++ b/python/pkgs/zconfig/default.nix @@ -9,13 +9,13 @@ zope-testrunner, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zconfig"; version = "4.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RyIz5RX6Kb5shz54uKK0UMLNJdATPLRZYIN/M/GrT+M="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/ZConfig"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zeep/default.nix b/python/pkgs/zeep/default.nix index 69e053843..ae661e5ce 100644 --- a/python/pkgs/zeep/default.nix +++ b/python/pkgs/zeep/default.nix @@ -25,7 +25,7 @@ xmlsec, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zeep"; version = "4.3.3"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mvantellingen"; repo = "python-zeep"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0Mzvb86f1r07PCJqTy9CGUq9Zk2PtAsFfd3SmFlOayk="; }; @@ -63,4 +63,4 @@ buildPythonPackage rec { homepage = "http://docs.python-zeep.org"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/zeroconf/default.nix b/python/pkgs/zeroconf/default.nix index 38fed2a9d..a036dd44d 100644 --- a/python/pkgs/zeroconf/default.nix +++ b/python/pkgs/zeroconf/default.nix @@ -8,13 +8,13 @@ ifaddr, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zeroconf"; version = "0.151.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zmxUjmZXWbYVDO9Nuaude92JhX6QxROr1rc0C919vWo="; }; @@ -26,8 +26,6 @@ buildPythonPackage rec { dependencies = [ ifaddr ]; - doCheck = false; - pythonImportsCheck = [ "zeroconf" ]; meta = { @@ -35,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-zeroconf/python-zeroconf"; license = lib.licenses.lgpl21Only; }; -} +}) diff --git a/python/pkgs/zfec/default.nix b/python/pkgs/zfec/default.nix index 1ecc4a5fc..b78748889 100644 --- a/python/pkgs/zfec/default.nix +++ b/python/pkgs/zfec/default.nix @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ pyutil ]; + dependencies = [ pyutil ]; meta = { homepage = "https://github.com/tahoe-lafs/zfec"; diff --git a/python/pkgs/zhon/default.nix b/python/pkgs/zhon/default.nix index 28f243424..ea1a380bf 100644 --- a/python/pkgs/zhon/default.nix +++ b/python/pkgs/zhon/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zhon"; version = "2.1.1"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tsroten"; repo = "zhon"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ghZp+5YXmTWf1EJKvdSlqccnxnaLliYR5HxX5DcWXiw="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/tsroten/zhon"; license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/zict/default.nix b/python/pkgs/zict/default.nix index ad3609e91..70b813e50 100644 --- a/python/pkgs/zict/default.nix +++ b/python/pkgs/zict/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zict"; version = "3.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4yHiY7apeq/AeQw8+zwEZWtwZuZzjDf//MqV2APJ+6U="; }; @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/dask/zict"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/zipp/default.nix b/python/pkgs/zipp/default.nix index b8aed673b..4496d81ca 100644 --- a/python/pkgs/zipp/default.nix +++ b/python/pkgs/zipp/default.nix @@ -7,7 +7,7 @@ }: let - zipp = buildPythonPackage rec { + zipp = buildPythonPackage (finalAttrs: { pname = "zipp"; version = "4.1.0"; pyproject = true; @@ -15,7 +15,7 @@ let src = fetchFromGitHub { owner = "jaraco"; repo = "zipp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qFsCud+fKDULbIF3LLGh6su/Sm1YjcvKe0+R9GH/Ies="; }; @@ -30,13 +30,12 @@ let ]; # Prevent infinite recursion with pytest - doCheck = false; pythonImportsCheck = [ "zipp" ]; meta = { description = "Pathlib-compatible object wrapper for zip files"; homepage = "https://github.com/jaraco/zipp"; license = lib.licenses.mit; }; - }; + }); in zipp diff --git a/python/pkgs/zipstream-ng/default.nix b/python/pkgs/zipstream-ng/default.nix index 399e71eae..4a41853fc 100644 --- a/python/pkgs/zipstream-ng/default.nix +++ b/python/pkgs/zipstream-ng/default.nix @@ -5,7 +5,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zipstream-ng"; version = "1.9.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pR0Ps"; repo = "zipstream-ng"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1MSnabckpAwV/NmD5wKxF7k7hwve6fBiCPyw7skxdlM="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/pR0Ps/zipstream-ng"; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/python/pkgs/zodbpickle/default.nix b/python/pkgs/zodbpickle/default.nix index d5ff2fc5e..1c231f482 100644 --- a/python/pkgs/zodbpickle/default.nix +++ b/python/pkgs/zodbpickle/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zodbpickle"; version = "4.5"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Z9QpXdtoskEP5BcJT/4aiw7UGDTuMIAg9Y7htjPh91E="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { zpl21 ]; }; -} +}) diff --git a/python/pkgs/zope-cachedescriptors/default.nix b/python/pkgs/zope-cachedescriptors/default.nix index 221e7879d..af95e4fae 100644 --- a/python/pkgs/zope-cachedescriptors/default.nix +++ b/python/pkgs/zope-cachedescriptors/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-cachedescriptors"; version = "6.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.cachedescriptors"; - tag = version; + tag = finalAttrs.version; hash = "sha256-PlezUzuO4P/BOVT6Ll8dYIKssC/glmVd8SCM0afgNC0="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.cachedescriptors"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-component/default.nix b/python/pkgs/zope-component/default.nix index 55c8a6ea8..d4ba0dad5 100644 --- a/python/pkgs/zope-component/default.nix +++ b/python/pkgs/zope-component/default.nix @@ -14,7 +14,7 @@ zope-security, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-component"; version = "7.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.component"; - tag = version; + tag = finalAttrs.version; hash = "sha256-3Hl2sm2M0we+fpdt4GSjAStLSAJ1c4Za1vfm9Bj8z8s="; }; @@ -65,4 +65,4 @@ buildPythonPackage rec { description = "Zope Component Architecture"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-configuration/default.nix b/python/pkgs/zope-configuration/default.nix index cb9550702..0d91ef973 100644 --- a/python/pkgs/zope-configuration/default.nix +++ b/python/pkgs/zope-configuration/default.nix @@ -8,7 +8,7 @@ zope-schema, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-configuration"; version = "7.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.configuration"; - tag = version; + tag = finalAttrs.version; hash = "sha256-G87VAEqMxF5Y3LuDJnDcOox5+ngJuRhUGSj9K8c3mYY="; }; @@ -44,4 +44,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.configuration"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-contenttype/default.nix b/python/pkgs/zope-contenttype/default.nix index 63953189f..142d73e00 100644 --- a/python/pkgs/zope-contenttype/default.nix +++ b/python/pkgs/zope-contenttype/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.contenttype"; version = "6.0"; pyproject = true; src = fetchPypi { pname = "zope_contenttype"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-/OWKMz2blKEo3ajO2kdcl20Toa+KOxI7bHaOr+HpL2M="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.contenttype"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-copy/default.nix b/python/pkgs/zope-copy/default.nix index 86cddcfb4..7cbadd5da 100644 --- a/python/pkgs/zope-copy/default.nix +++ b/python/pkgs/zope-copy/default.nix @@ -7,7 +7,7 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-copy"; version = "6.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.copy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-hYeLUSwAq5rK4TRngvNQGR4Fdimb2k5dHtFdptMVqPo="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.copy"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-deferredimport/default.nix b/python/pkgs/zope-deferredimport/default.nix index 0017b4189..881b76a32 100644 --- a/python/pkgs/zope-deferredimport/default.nix +++ b/python/pkgs/zope-deferredimport/default.nix @@ -6,7 +6,7 @@ zope-proxy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-deferredimport"; version = "6.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.deferredimport"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7Q8+Cew5987+CjUOxqpwMFXWdw+/B28tOEXRYC0SRyI="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.deferredimport"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-deprecation/default.nix b/python/pkgs/zope-deprecation/default.nix index b5c344011..d4c9da12b 100644 --- a/python/pkgs/zope-deprecation/default.nix +++ b/python/pkgs/zope-deprecation/default.nix @@ -6,7 +6,7 @@ zope-testrunner, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-deprecation"; version = "6.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.deprecation"; - tag = version; + tag = finalAttrs.version; hash = "sha256-N/+RtilRY/8NfhUjd/Y4T6dmZHt6PW4ofP1UE8Aj1e8="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { description = "Zope Deprecation Infrastructure"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-dottedname/default.nix b/python/pkgs/zope-dottedname/default.nix index 24a120d66..3c0e050ba 100644 --- a/python/pkgs/zope-dottedname/default.nix +++ b/python/pkgs/zope-dottedname/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-dottedname"; version = "7.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.dottedname"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bWURUr+BCQsMNBYqJD2+YPdfA+FWrJuBGypQ/c8w6kA="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { description = "Resolver for Python dotted names"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-exceptions/default.nix b/python/pkgs/zope-exceptions/default.nix index 2573723d1..b94a46849 100644 --- a/python/pkgs/zope-exceptions/default.nix +++ b/python/pkgs/zope-exceptions/default.nix @@ -6,7 +6,7 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-exceptions"; version = "6.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.exceptions"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LLKS/O1sfrHRfEgbb3GO+/hBtIC9CvfNjorqiKTgujo="; }; @@ -32,7 +32,6 @@ buildPythonPackage rec { ]; # circular deps - doCheck = false; pythonImportsCheck = [ "zope.exceptions" ]; @@ -41,4 +40,4 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/zope.exceptions/"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-filerepresentation/default.nix b/python/pkgs/zope-filerepresentation/default.nix index d5186edd3..ee2283600 100644 --- a/python/pkgs/zope-filerepresentation/default.nix +++ b/python/pkgs/zope-filerepresentation/default.nix @@ -7,7 +7,7 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-filerepresentation"; version = "7.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.filerepresentation"; - tag = version; + tag = finalAttrs.version; hash = "sha256-VWi00b7m+aKwkg/Gfzo5fJWMqdMqgowBpkqsYcEO2gY="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { description = "File-system Representation Interfaces"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-hookable/default.nix b/python/pkgs/zope-hookable/default.nix index 5c2d8f5e2..dc182fcd3 100644 --- a/python/pkgs/zope-hookable/default.nix +++ b/python/pkgs/zope-hookable/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-hookable"; version = "8.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.hookable"; - tag = version; + tag = finalAttrs.version; hash = "sha256-pryx55dzvg+6jSUj4avskTnGKe6w1HkEh6v6OOlHIXY="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.hookable"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-i18nmessageid/default.nix b/python/pkgs/zope-i18nmessageid/default.nix index 1a9005033..f862e2bcd 100644 --- a/python/pkgs/zope-i18nmessageid/default.nix +++ b/python/pkgs/zope-i18nmessageid/default.nix @@ -6,7 +6,7 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-i18nmessageid"; version = "8.2"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.i18nmessageid"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JDCbk7zh+9Ic5T3Pt1apQDN1Q59cLUdk5KCAIu5mlC4="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { description = "Message Identifiers for internationalization"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-interface/default.nix b/python/pkgs/zope-interface/default.nix index 30a19f07a..69d7d278b 100644 --- a/python/pkgs/zope-interface/default.nix +++ b/python/pkgs/zope-interface/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-interface"; version = "8.2"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.interface"; - tag = version; + tag = finalAttrs.version; hash = "sha256-hOcg41lcdVWfmT2DqaYzzu4bJZYiG2y5boylJevBv6k="; }; @@ -21,8 +21,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "zope.interface" ]; - doCheck = false; # Circular deps. - pythonNamespaces = [ "zope" ]; meta = { @@ -30,4 +28,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.interface"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-lifecycleevent/default.nix b/python/pkgs/zope-lifecycleevent/default.nix index dbd64be03..ac03092ca 100644 --- a/python/pkgs/zope-lifecycleevent/default.nix +++ b/python/pkgs/zope-lifecycleevent/default.nix @@ -7,7 +7,7 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-lifecycleevent"; version = "6.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.lifecycleevent"; - tag = version; + tag = finalAttrs.version; hash = "sha256-HgxOUseRYc+mkwESUDqauoH2D2E4PL8XxM1C0FC35w8="; }; @@ -45,4 +45,4 @@ buildPythonPackage rec { description = "Object life-cycle events"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-location/default.nix b/python/pkgs/zope-location/default.nix index 015d290ca..27bd415da 100644 --- a/python/pkgs/zope-location/default.nix +++ b/python/pkgs/zope-location/default.nix @@ -11,7 +11,7 @@ zope-copy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-location"; version = "6.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.location"; - tag = version; + tag = finalAttrs.version; hash = "sha256-s7HZda+U87P62elX/KbDp2o9zAplgFVmnedDI/uq2sk="; }; @@ -53,4 +53,4 @@ buildPythonPackage rec { description = "Zope Location"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-proxy/default.nix b/python/pkgs/zope-proxy/default.nix index 98685f432..2585dd443 100644 --- a/python/pkgs/zope-proxy/default.nix +++ b/python/pkgs/zope-proxy/default.nix @@ -6,7 +6,7 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-proxy"; version = "7.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.proxy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-p5uDHNF7kZJkFibNbM0JLrw5BYqs+qnNH3t0UBt0Krg="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { description = "Generic Transparent Proxies"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-schema/default.nix b/python/pkgs/zope-schema/default.nix index 395bf89b4..607ab5416 100644 --- a/python/pkgs/zope-schema/default.nix +++ b/python/pkgs/zope-schema/default.nix @@ -7,7 +7,7 @@ zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-schema"; version = "8.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.schema"; - tag = version; + tag = finalAttrs.version; hash = "sha256-pO3yL0gej2PGD01ySiPJPU66P/9hW73T2n/ZnUPa3C0="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { description = "zope.interface extension for defining data schemas"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-security/default.nix b/python/pkgs/zope-security/default.nix index 556ccdd4b..d70aa7b08 100644 --- a/python/pkgs/zope-security/default.nix +++ b/python/pkgs/zope-security/default.nix @@ -13,7 +13,7 @@ zope-configuration, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-security"; version = "8.3"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.security"; - tag = version; + tag = finalAttrs.version; hash = "sha256-iSWSBjtJe4iEvm+VUEWDvRCBdRz1R6m9mlfPLwh01Sk="; }; @@ -57,4 +57,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.security"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-testbrowser/default.nix b/python/pkgs/zope-testbrowser/default.nix index 813b9cbe8..f3956c828 100644 --- a/python/pkgs/zope-testbrowser/default.nix +++ b/python/pkgs/zope-testbrowser/default.nix @@ -14,7 +14,7 @@ legacy-cgi, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-testbrowser"; version = "8.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.testbrowser"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CcNlK7EKYng0GKYTZ2U2slkyQ9wTqwzOXGHt9S5p3L0="; }; @@ -63,4 +63,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.testbrowser"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-testing/default.nix b/python/pkgs/zope-testing/default.nix index 4e26d95bf..ac1f6afa0 100644 --- a/python/pkgs/zope-testing/default.nix +++ b/python/pkgs/zope-testing/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-testing"; version = "6.1"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.testing"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dAUiG8DxlhQKMBXh49P0CDC9UjqAYjB+2vVCTI36cgc="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.testing"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope-testrunner/default.nix b/python/pkgs/zope-testrunner/default.nix index 9b501eaf0..d177a9e12 100644 --- a/python/pkgs/zope-testrunner/default.nix +++ b/python/pkgs/zope-testrunner/default.nix @@ -7,7 +7,7 @@ zope-exceptions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope-testrunner"; version = "8.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.testrunner"; - tag = version; + tag = finalAttrs.version; hash = "sha256-MqlS/VkLAv9M1WtJ6t2nPMZPH+Cz5wfy2VhtCx/Fwmw="; }; @@ -33,8 +33,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "zope.testrunner" ]; - doCheck = false; # custom test modifies sys.path - pythonNamespaces = [ "zope" ]; meta = { @@ -43,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.testrunner"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope_component/default.nix b/python/pkgs/zope_component/default.nix index cafc110c4..1f1241d57 100644 --- a/python/pkgs/zope_component/default.nix +++ b/python/pkgs/zope_component/default.nix @@ -8,14 +8,14 @@ zope_interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.component"; version = "7.1"; pyproject = true; src = fetchPypi { pname = "zope_component"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-Gz4GZHqL08BxxrybgNcI3tEgvOmBGFwttWR/2aDVJ50="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.component"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope_configuration/default.nix b/python/pkgs/zope_configuration/default.nix index 0823d3a51..c6f9fcac6 100644 --- a/python/pkgs/zope_configuration/default.nix +++ b/python/pkgs/zope_configuration/default.nix @@ -8,14 +8,14 @@ zope_schema, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.configuration"; version = "7.1"; pyproject = true; src = fetchPypi { pname = "zope_configuration"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-WvUc77TcxmBT5Uz+zjhIP7WTqBvhAQw4WH26kcnRVKw="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.configuration"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope_deferredimport/default.nix b/python/pkgs/zope_deferredimport/default.nix index d5afd4f41..6e3a8dfe2 100644 --- a/python/pkgs/zope_deferredimport/default.nix +++ b/python/pkgs/zope_deferredimport/default.nix @@ -6,14 +6,14 @@ zope_proxy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.deferredimport"; version = "6.1.1"; pyproject = true; src = fetchPypi { pname = "zope_deferredimport"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-lZBS0/XgXEx4VLiHFpcZheCxtEpcAWPhLZoLkOTjtsw="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.deferredimport"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope_deprecation/default.nix b/python/pkgs/zope_deprecation/default.nix index 7dafbe9dd..4dd6b73f0 100644 --- a/python/pkgs/zope_deprecation/default.nix +++ b/python/pkgs/zope_deprecation/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.deprecation"; version = "6.0"; pyproject = true; src = fetchPypi { pname = "zope_deprecation"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-GHJ+vajmOm1L0oopDotGhS6fFEc967XMQKCi3M+t8V8="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.deprecation"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope_event/default.nix b/python/pkgs/zope_event/default.nix index 6d2374afc..9c0c817dc 100644 --- a/python/pkgs/zope_event/default.nix +++ b/python/pkgs/zope_event/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.event"; version = "6.2"; pyproject = true; src = fetchPypi { pname = "zope_event"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-uX1dYycGfua538vfYGremt5wmR4ZwWLoCOo55fzw+NM="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.event"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope_exceptions/default.nix b/python/pkgs/zope_exceptions/default.nix index 4df489e5c..73d7e0002 100644 --- a/python/pkgs/zope_exceptions/default.nix +++ b/python/pkgs/zope_exceptions/default.nix @@ -6,14 +6,14 @@ zope_interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.exceptions"; version = "6.0"; pyproject = true; src = fetchPypi { pname = "zope_exceptions"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-CsDgeOzdistdojHDn8ZFS98ySSFv0cBtBXi/jqa/Mpk="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.exceptions"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope_hookable/default.nix b/python/pkgs/zope_hookable/default.nix index 0375326c1..0a5ae357c 100644 --- a/python/pkgs/zope_hookable/default.nix +++ b/python/pkgs/zope_hookable/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.hookable"; version = "8.3"; pyproject = true; src = fetchPypi { pname = "zope_hookable"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-oFyfiks/IRhMxCPa1hFjQsHFmBjuseTL34QfQkOVLU8="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.hookable"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope_i18nmessageid/default.nix b/python/pkgs/zope_i18nmessageid/default.nix index 94a8d87f7..a3300059c 100644 --- a/python/pkgs/zope_i18nmessageid/default.nix +++ b/python/pkgs/zope_i18nmessageid/default.nix @@ -6,14 +6,14 @@ zope_interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.i18nmessageid"; version = "8.3"; pyproject = true; src = fetchPypi { pname = "zope_i18nmessageid"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-f3JDoRT9sGoql9z2sWx7H5kWiCel5+4J680hDHZ0Xe4="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.i18nmessageid"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope_interface/default.nix b/python/pkgs/zope_interface/default.nix index a62b6b6ba..e78457391 100644 --- a/python/pkgs/zope_interface/default.nix +++ b/python/pkgs/zope_interface/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.interface"; version = "8.6"; pyproject = true; src = fetchPypi { pname = "zope_interface"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-tA75tIc6+10N7AK40t/eHPGMcjN7YMmctzWWHgusBcA="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.interface"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope_proxy/default.nix b/python/pkgs/zope_proxy/default.nix index 936362f76..ece492109 100644 --- a/python/pkgs/zope_proxy/default.nix +++ b/python/pkgs/zope_proxy/default.nix @@ -6,14 +6,14 @@ zope_interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.proxy"; version = "7.3"; pyproject = true; src = fetchPypi { pname = "zope_proxy"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-osAP+E1Ba1AIu83XM364AK3ovAgzEui14OzX0MDRHPY="; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.proxy"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope_schema/default.nix b/python/pkgs/zope_schema/default.nix index 448d8bf27..bc7f33c66 100644 --- a/python/pkgs/zope_schema/default.nix +++ b/python/pkgs/zope_schema/default.nix @@ -7,14 +7,14 @@ zope_interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.schema"; version = "8.1"; pyproject = true; src = fetchPypi { pname = "zope_schema"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-LZ+qf5Gnvwn8qywDnZGC/MnOcELcd+GNPfJ3kEruCUg="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.schema"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope_testing/default.nix b/python/pkgs/zope_testing/default.nix index 4ef3584ca..691c5e5f0 100644 --- a/python/pkgs/zope_testing/default.nix +++ b/python/pkgs/zope_testing/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.testing"; version = "6.2"; pyproject = true; src = fetchPypi { pname = "zope_testing"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-DeR/PBqWy+wVrnoWB9WhQuw55QFygFVDQ1jC9M8PIak="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.testing"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zope_testrunner/default.nix b/python/pkgs/zope_testrunner/default.nix index 4f33704ee..b3fc4823d 100644 --- a/python/pkgs/zope_testrunner/default.nix +++ b/python/pkgs/zope_testrunner/default.nix @@ -7,14 +7,14 @@ zope_exceptions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zope.testrunner"; version = "8.2"; pyproject = true; src = fetchPypi { pname = "zope_testrunner"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-H0AWw+6FA6BplGAApVR5ZG2wqD7UzSvI5Uz7bCfYiUY="; }; @@ -25,8 +25,6 @@ buildPythonPackage rec { zope_exceptions ]; - doCheck = false; - pythonImportsCheck = [ "zope.testrunner" ]; pythonNamespaces = [ "zope" ]; @@ -36,4 +34,4 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.testrunner"; license = lib.licenses.zpl21; }; -} +}) diff --git a/python/pkgs/zstandard/default.nix b/python/pkgs/zstandard/default.nix index 05ef79317..e7f50641f 100644 --- a/python/pkgs/zstandard/default.nix +++ b/python/pkgs/zstandard/default.nix @@ -7,13 +7,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zstandard"; version = "0.25.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dxPhF50WLPXHkG2oduwsy5w6ncvf/vDMf3DDZnogXws="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/indygreg/python-zstandard"; license = lib.licenses.bsd3; }; -} +}) diff --git a/python/pkgs/zstd/default.nix b/python/pkgs/zstd/default.nix index 8a2b83b88..99a55e0b2 100644 --- a/python/pkgs/zstd/default.nix +++ b/python/pkgs/zstd/default.nix @@ -3,20 +3,24 @@ buildPythonPackage, buildPackages, fetchPypi, + # build-system + setuptools, pkg-config, pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zstd"; version = "1.5.7.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-QD5SBfSsBLkuawzaZUvi9R3iaCKKDbAGe8CH+qzy9JU="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace setup.py \ --replace "/usr/bin/pkg-config" "${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" @@ -35,7 +39,7 @@ buildPythonPackage rec { env = { ZSTD_EXTERNAL = 1; VERSION = pkgs.zstd.version; - PKG_VERSION = version; + PKG_VERSION = finalAttrs.version; }; pythonImportsCheck = [ "zstd" ]; @@ -45,4 +49,4 @@ buildPythonPackage rec { homepage = "https://github.com/sergey-dryabzhinsky/python-zstd"; license = lib.licenses.bsd2; }; -} +}) diff --git a/python/pkgs/zulip/default.nix b/python/pkgs/zulip/default.nix index e23ea7579..2ee9e76c9 100644 --- a/python/pkgs/zulip/default.nix +++ b/python/pkgs/zulip/default.nix @@ -9,7 +9,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zulip"; version = "0.9.1"; pyproject = true; @@ -17,10 +17,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zulip"; repo = "python-zulip-api"; - tag = version; + tag = finalAttrs.version; hash = "sha256-mcqIfha+4nsqlshayLQ2Sd+XOYVKf1FkoczjiFRNybc="; }; - sourceRoot = "${src.name}/zulip"; + sourceRoot = "${finalAttrs.src.name}/zulip"; build-system = [ setuptools ]; @@ -39,4 +39,4 @@ buildPythonPackage rec { homepage = "https://github.com/zulip/python-zulip-api"; license = lib.licenses.asl20; }; -} +}) diff --git a/python/pkgs/zxcvbn-rs-py/default.nix b/python/pkgs/zxcvbn-rs-py/default.nix index b4bda3ac0..9d12abfad 100644 --- a/python/pkgs/zxcvbn-rs-py/default.nix +++ b/python/pkgs/zxcvbn-rs-py/default.nix @@ -5,7 +5,7 @@ rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zxcvbn-rs-py"; version = "0.3.0"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zxcvbn_rs_py"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-0nQmgII6F0gj8HCnNAdLvowWBPExPAgXCxWAJuNsc6A="; }; @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-S6K6ZzW24V2yFV89B+gN+Odc4h3R45lF+emZs69dzYg="; }; @@ -35,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.mit; }; -} +}) diff --git a/python/pkgs/zxcvbn/default.nix b/python/pkgs/zxcvbn/default.nix index ea9f230be..c4eaefdb0 100644 --- a/python/pkgs/zxcvbn/default.nix +++ b/python/pkgs/zxcvbn/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zxcvbn"; version = "4.5.0"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dwolfhub"; repo = "zxcvbn-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0SVJkJMEMnZVMpamDVP02kMwWRSj5zGlrMYG9kn0aXQ="; }; @@ -26,4 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/dwolfhub/zxcvbn-python"; license = lib.licenses.mit; }; -} +})