diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 1e5a1a229d54..42283f3ab40c 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -14,7 +14,7 @@ jobs: backport: name: Backport Pull Request if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index be6050456189..8698d5fff392 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -16,7 +16,7 @@ permissions: jobs: tests: name: basic-eval-checks - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml index cbd5d66c4232..71b3bff044c7 100644 --- a/.github/workflows/check-cherry-picks.yml +++ b/.github/workflows/check-cherry-picks.yml @@ -11,7 +11,7 @@ permissions: {} jobs: check: name: cherry-pick-check - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/check-maintainers-sorted.yaml b/.github/workflows/check-maintainers-sorted.yaml index 7092cf3fee38..21247e20cb9b 100644 --- a/.github/workflows/check-maintainers-sorted.yaml +++ b/.github/workflows/check-maintainers-sorted.yaml @@ -10,7 +10,7 @@ permissions: jobs: nixos: name: maintainer-list-check - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 19f80085c5cc..d0b8c84c031d 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -18,7 +18,7 @@ jobs: nixos: name: nixfmt-check - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: get-merge-commit if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')" steps: diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml index 481ae2df4c31..e18964acb7f3 100644 --- a/.github/workflows/check-nixf-tidy.yml +++ b/.github/workflows/check-nixf-tidy.yml @@ -9,7 +9,7 @@ permissions: jobs: nixos: name: exp-nixf-tidy-check - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 if: "!contains(github.event.pull_request.title, '[skip treewide]')" steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml index 316813879e81..fda7db309e75 100644 --- a/.github/workflows/check-shell.yml +++ b/.github/workflows/check-shell.yml @@ -11,7 +11,7 @@ permissions: {} jobs: x86_64-linux: name: shell-check-x86_64-linux - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: @@ -23,7 +23,7 @@ jobs: aarch64-darwin: name: shell-check-aarch64-darwin - runs-on: macos-latest + runs-on: macos-14 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index ae95fd0de05f..b5f1f88d0c88 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -41,7 +41,7 @@ jobs: # Check that code owners is valid check: name: Check - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: get-merge-commit if: needs.get-merge-commit.outputs.mergedSha steps: @@ -88,7 +88,7 @@ jobs: # Request reviews from code owners request: name: Request - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 diff --git a/.github/workflows/editorconfig-v2.yml b/.github/workflows/editorconfig-v2.yml index 07afb60bc3ae..7c79cef1aae4 100644 --- a/.github/workflows/editorconfig-v2.yml +++ b/.github/workflows/editorconfig-v2.yml @@ -16,7 +16,7 @@ jobs: tests: name: editorconfig-check - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: get-merge-commit if: "needs.get-merge-commit.outputs.mergedSha && github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: diff --git a/.github/workflows/eval-lib-tests.yml b/.github/workflows/eval-lib-tests.yml index 9321783c7996..39fb99ae0ff9 100644 --- a/.github/workflows/eval-lib-tests.yml +++ b/.github/workflows/eval-lib-tests.yml @@ -13,7 +13,7 @@ jobs: nixpkgs-lib-tests: name: nixpkgs-lib-tests - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: get-merge-commit if: needs.get-merge-commit.outputs.mergedSha steps: diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 72b2103b8720..d0e5a8781ebe 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -21,7 +21,7 @@ jobs: attrs: name: Attributes - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: get-merge-commit # Skip this and dependent steps if the PR can't be merged if: needs.get-merge-commit.outputs.mergedSha @@ -60,7 +60,7 @@ jobs: eval-aliases: name: Eval nixpkgs with aliases enabled - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: [ attrs, get-merge-commit ] steps: - name: Check out the PR at the test merge commit @@ -78,7 +78,7 @@ jobs: outpaths: name: Outpaths - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: [ attrs, get-merge-commit ] strategy: fail-fast: false @@ -118,7 +118,7 @@ jobs: process: name: Process - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: [ outpaths, attrs, get-merge-commit ] outputs: baseRunId: ${{ steps.baseRunId.outputs.baseRunId }} @@ -218,7 +218,7 @@ jobs: # Separate job to have a very tightly scoped PR write token tag: name: Tag - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: [ attrs, process ] if: needs.process.outputs.baseRunId permissions: diff --git a/.github/workflows/get-merge-commit.yml b/.github/workflows/get-merge-commit.yml index 63154d73ed9d..c76215aff60c 100644 --- a/.github/workflows/get-merge-commit.yml +++ b/.github/workflows/get-merge-commit.yml @@ -12,7 +12,7 @@ permissions: {} jobs: resolve-merge-commit: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 outputs: mergedSha: ${{ steps.merged.outputs.mergedSha }} steps: diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 724164bebdfc..5e2e3aeb3751 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -16,7 +16,7 @@ permissions: jobs: labels: name: label-pr - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml index 0678568e5271..014fef1f5924 100644 --- a/.github/workflows/manual-nixos-v2.yml +++ b/.github/workflows/manual-nixos-v2.yml @@ -13,7 +13,7 @@ on: jobs: nixos: name: nixos-manual-build - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml index 0410cfd904b2..ec8a3f6d9876 100644 --- a/.github/workflows/manual-nixpkgs-v2.yml +++ b/.github/workflows/manual-nixpkgs-v2.yml @@ -15,7 +15,7 @@ on: jobs: nixpkgs: name: nixpkgs-manual-build - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml index b6bb8fe28197..61418079e62f 100644 --- a/.github/workflows/nix-parse-v2.yml +++ b/.github/workflows/nix-parse-v2.yml @@ -16,7 +16,7 @@ jobs: tests: name: nix-files-parseable-check - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: get-merge-commit if: "needs.get-merge-commit.outputs.mergedSha && github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml index 65c1028f1059..5e39f3873b91 100644 --- a/.github/workflows/nixpkgs-vet.yml +++ b/.github/workflows/nixpkgs-vet.yml @@ -25,7 +25,7 @@ jobs: check: name: nixpkgs-vet # This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases. - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long. timeout-minutes: 10 needs: get-merge-commit diff --git a/.github/workflows/no-channel.yml b/.github/workflows/no-channel.yml index 623a011c6e73..b7b61f9d6492 100644 --- a/.github/workflows/no-channel.yml +++ b/.github/workflows/no-channel.yml @@ -13,7 +13,7 @@ permissions: {} jobs: fail: name: "This PR is is targeting a channel branch" - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - run: | cat < diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 0295deffc3d0..07c56a9b6ee0 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -283,6 +283,8 @@ [Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6) for more information. +- `nq` was updated to 1.0, which renames the `fq` and `tq` utilities to `nqtail` and `nqterm` respectively. + - `zf` was updated to 0.10.2, which includes breaking changes from the [0.10.0 release](https://github.com/natecraddock/zf/releases/tag/0.10.0). `zf` no longer does Unicode normalization of the input and no longer supports terminal escape sequences in the `ZF_PROMPT` environment variable. diff --git a/nixos/modules/hardware/pcmcia.nix b/nixos/modules/hardware/pcmcia.nix index 45022f6c124b..9f289b029463 100644 --- a/nixos/modules/hardware/pcmcia.nix +++ b/nixos/modules/hardware/pcmcia.nix @@ -5,7 +5,7 @@ ... }: let - pcmciaUtils = pkgs.pcmciaUtils.passthru.function { + pcmciaUtils = pkgs.pcmciaUtils.overrideAttrs { inherit (config.hardware.pcmcia) firmware config; }; in diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index 3d425e8e89fe..666844e2b490 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.25.0"; - hash = "sha256-oIKJsoGI2MqRZAnfroHbEiYObeATkFaw2ONC9WDFSDc="; + version = "1.27.0"; + hash = "sha256-Z7kINeq4m0XZ4wFalC0vZylMbR5dRTyFr4AZkHD+N/M="; }; postPatch = '' diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix index 8638487d135a..a3e42d9121fb 100644 --- a/pkgs/applications/misc/survex/default.nix +++ b/pkgs/applications/misc/survex/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "survex"; - version = "1.4.14"; + version = "1.4.15"; src = fetchurl { url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-TKOgbwUGE1z1PUZxfukugZWsJY1ml/VMAJ7xDIqWZWs="; + hash = "sha256-8RuVHVugJmTP3CBYXzxxZGe5GYGUxJrlkzxXFRakkWI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index b35707d421c5..33a78c5ebeba 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop-unwrapped"; - version = "5.9.0"; + version = "5.10.0"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-X29+VKY2L5kIh7eV1b3gMJ6Oi8Jjbr6uZuysKzH9roQ="; + hash = "sha256-gkwu28VWelUhjkvcosBnGuT1J0MLykOufcsn9jl7vqU="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 8c0e1ef2ca79..06208da05641 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,16 +13,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.28.0"; + version = "1.28.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; tag = "v${version}"; - hash = "sha256-JW78n/3hssH600uXn4YLxcIJylPbSpEZICtKmqfqamI="; + hash = "sha256-Xr2765+DDK7dm3WDIwB3vbMG5CrguxsFp9qGd4wwhnA="; }; - vendorHash = "sha256-9/PfiOSCInduQXZ47KbrD3ca9O0Zt+TP7XoX+HjwQgs="; + vendorHash = "sha256-V8mMvIiEaYzTIFwUsdcV5ntHklR7Cs3ZhB5nYUT0180="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 74a75ce57871..282fcac2395e 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "lima"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "lima-vm"; repo = "lima"; rev = "v${version}"; - hash = "sha256-LNsxMrbEgdosGDDUNvMZq/hpP5azNiIHjKTp0Iw/PC0="; + hash = "sha256-S0Mk7h4gH5syP/ayK5g1g8HG5f23sKCQCCbM6xOj+n0="; }; - vendorHash = "sha256-taozyQBJvkCsJAaOHg1gFK4qOnepRbzIn4jHzxfAn6A="; + vendorHash = "sha256-1SHiz+lfG4nl1qavq/Fd73UV8LkErILk7d8XZJSbHd0="; nativeBuildInputs = [ makeWrapper @@ -71,7 +71,7 @@ buildGoModule rec { ''; doInstallCheck = true; - # Workaround for: "panic: $HOME is not defined" at https://github.com/lima-vm/lima/blob/v1.0.2/pkg/limayaml/defaults.go#L52 + # Workaround for: "panic: $HOME is not defined" at https://github.com/lima-vm/lima/blob/v1.0.3/pkg/limayaml/defaults.go#L52 # Don't use versionCheckHook for this package. It cannot inject environment variables. installCheckPhase = '' if [[ "$(HOME="$(mktemp -d)" "$out/bin/limactl" --version | cut -d ' ' -f 3)" == "${version}" ]]; then diff --git a/pkgs/by-name/ad/addwater/package.nix b/pkgs/by-name/ad/addwater/package.nix index 98c4c687fd24..d79cf096aebb 100644 --- a/pkgs/by-name/ad/addwater/package.nix +++ b/pkgs/by-name/ad/addwater/package.nix @@ -10,11 +10,12 @@ python3Packages, wrapGAppsHook4, appstream, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "addwater"; - version = "1.1.6"; + version = "1.2.2"; # built with meson, not a python format pyproject = false; @@ -22,7 +23,7 @@ python3Packages.buildPythonApplication rec { owner = "largestgithubuseronearth"; repo = "addwater"; tag = "v${version}"; - hash = "sha256-5iuSRA18TWj6naw5MraGZ1Y9OUWEVg2oKqQtkC8rMWw="; + hash = "sha256-BpV4nJbJNMI0Nzzsl1NbsWTNRMFRBSrUF1+Qdd7h6eg="; }; buildInputs = [ @@ -45,6 +46,8 @@ python3Packages.buildPythonApplication rec { requests ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Installer for the fantastic GNOME for Firefox theme"; homepage = "https://github.com/largestgithubuseronearth/addwater"; diff --git a/pkgs/by-name/do/doomretro/package.nix b/pkgs/by-name/do/doomretro/package.nix index debbdce7a0d1..cc124e2ed384 100644 --- a/pkgs/by-name/do/doomretro/package.nix +++ b/pkgs/by-name/do/doomretro/package.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; - version = "5.6"; + version = "5.6.1"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-ykErEXKpd/79cUhubZiLC7u10yJy8oYCWOMeHLYRHts="; + hash = "sha256-v/a7Jc82QpH58c6pkki8xXZBi0v54oz03A2A/Oz3udU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index f1f7b5e5021d..46a77c1c568e 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -27,7 +27,7 @@ }: let - version = "1.20.0"; + version = "1.20.1"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -104,7 +104,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256-bvU8A2y/9ETqgFtBUZ5wp0dXybTCLl32yY/BB6r/pd8="; + hash = "sha256-0tnB6fCZEUAlQ3iPxXXlJ5EXPMeWSNIHsIWV4d3cuKM="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/kr/krabby/package.nix b/pkgs/by-name/kr/krabby/package.nix index 5d7455a36a46..331f2a8f1522 100644 --- a/pkgs/by-name/kr/krabby/package.nix +++ b/pkgs/by-name/kr/krabby/package.nix @@ -5,14 +5,14 @@ }: rustPlatform.buildRustPackage rec { pname = "krabby"; - version = "0.2.1"; + version = "0.2.2"; src = fetchCrate { inherit pname version; - hash = "sha256-YEY4bUZV9BpyVXzEGvnLyfG0GdE3xMN9tHlsg6RqMkk="; + hash = "sha256-BmTx2kpnibTVuutAIrpFTTOGpO6WzITb6SXwUKuMtYY="; }; - cargoHash = "sha256-6NV+kqnloEFTygE5LLuCsgMYXGiDwOTnP6/CK2c9DOs="; + cargoHash = "sha256-gZzjx4JWe3CcG8wuQRTYjyEvvhCyUBXHQSw5sYhih9o="; meta = with lib; { description = "Print pokemon sprites in your terminal"; diff --git a/pkgs/by-name/ne/net-news-wire/package.nix b/pkgs/by-name/ne/net-news-wire/package.nix index e618bace6466..3f99283f731a 100644 --- a/pkgs/by-name/ne/net-news-wire/package.nix +++ b/pkgs/by-name/ne/net-news-wire/package.nix @@ -26,9 +26,14 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^mac-(\\d+\\.\\d+\\.\\d+)$" + ]; + }; - meta = with lib; { + meta = { description = "RSS reader for macOS and iOS"; longDescription = '' It's like podcasts — but for reading. @@ -36,8 +41,12 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://github.com/Ranchero-Software/NetNewsWire"; changelog = "https://github.com/Ranchero-Software/NetNewsWire/releases/tag/mac-${version}"; - license = licenses.mit; - platforms = platforms.darwin; - maintainers = with maintainers; [ jakuzure ]; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ + jakuzure + DimitarNestorov + ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; } diff --git a/pkgs/by-name/ne/newsraft/package.nix b/pkgs/by-name/ne/newsraft/package.nix index 26a1e1f04114..5304c5e83ee9 100644 --- a/pkgs/by-name/ne/newsraft/package.nix +++ b/pkgs/by-name/ne/newsraft/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsraft"; - version = "0.27"; + version = "0.28"; src = fetchFromGitea { domain = "codeberg.org"; owner = "newsraft"; repo = "newsraft"; rev = "newsraft-${finalAttrs.version}"; - hash = "sha256-MtdFnoB6Dc3xvTCc2PMIp5VsZiU5JE58q6WctM3mDZw="; + hash = "sha256-iRoQLGmiAPpt9ZpvHpytIWHldkvV/5qVjurypCycJYI="; }; nativeBuildInputs = [ pkg-config ]; @@ -38,12 +38,15 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Feed reader for terminal"; homepage = "https://codeberg.org/grisha/newsraft"; - license = licenses.isc; - maintainers = with maintainers; [ arthsmn ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ + arthsmn + luftmensch-luftmensch + ]; mainProgram = "newsraft"; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/nq/nq/package.nix b/pkgs/by-name/nq/nq/package.nix index 03a7039259cd..28e2b1eefc7f 100644 --- a/pkgs/by-name/nq/nq/package.nix +++ b/pkgs/by-name/nq/nq/package.nix @@ -2,28 +2,39 @@ stdenv, lib, fetchFromGitHub, + perl, # for tests }: stdenv.mkDerivation rec { pname = "nq"; - version = "0.5"; + + version = "1.0"; + src = fetchFromGitHub { - owner = "chneukirchen"; + owner = "leahneukirchen"; repo = "nq"; rev = "v${version}"; - sha256 = "sha256-g14t2Wy2GwiqnfEDiLAPGehzUgK6mLC+5PAZynez62s="; + hash = "sha256-gdVBSE2a4rq46o0uO9ICww6zicVgn6ykf4CeJ/MmiF4="; }; + + nativeCheckInputs = [ perl ]; + makeFlags = [ "PREFIX=$(out)" ]; + postPatch = '' - sed -i tq \ + sed -i nqterm \ -e 's|\bnq\b|'$out'/bin/nq|g' \ - -e 's|\bfq\b|'$out'/bin/fq|g' + -e 's|\bnqtail\b|'$out'/bin/nqtail|g' ''; - meta = with lib; { + + doCheck = true; + + meta = { description = "Unix command line queue utility"; - homepage = "https://github.com/chneukirchen/nq"; - license = licenses.publicDomain; - platforms = platforms.all; + homepage = "https://github.com/leahneukirchen/nq"; + changelog = "https://github.com/leahneukirchen/nq/blob/v${version}/NEWS.md"; + license = lib.licenses.publicDomain; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/by-name/pa/packwiz/package.nix b/pkgs/by-name/pa/packwiz/package.nix index c5b3ba677089..a37e5656abeb 100644 --- a/pkgs/by-name/pa/packwiz/package.nix +++ b/pkgs/by-name/pa/packwiz/package.nix @@ -8,17 +8,17 @@ buildGoModule { pname = "packwiz"; - version = "0-unstable-2024-05-27"; + version = "0-unstable-2024-10-15"; src = fetchFromGitHub { owner = "packwiz"; repo = "packwiz"; - rev = "7b4be47578151c36e784306b36d251ec2590e50c"; - sha256 = "sha256-XBp8Xv55R8rhhsQiWnOPH8c3fCpV/yq41ozJDcGdWfs="; + rev = "0626c00149a8d9a5e9f76e5640e7b8b95c064350"; + sha256 = "sha256-eAGfLUcyjDR2oJjLK3+DiuICTqoOcIwO5wL350w6vGw="; }; passthru.updateScript = unstableGitUpdater { }; - vendorHash = "sha256-yL5pWbVqf6mEpgYsItLnv8nwSmoMP+SE0rX/s7u2vCg="; + vendorHash = "sha256-krdrLQHM///dtdlfEhvSUDV2QljvxFc2ouMVQVhN7A0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/pc/pcmciaUtils/package.nix b/pkgs/by-name/pc/pcmciaUtils/package.nix index 5ae0c4d24ab0..d6707a89d39e 100644 --- a/pkgs/by-name/pc/pcmciaUtils/package.nix +++ b/pkgs/by-name/pc/pcmciaUtils/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { sed -i " s,/sbin/modprobe,${kmod}&,; s,/lib/udev/,$out/sbin/,; + s,__UDEVHELPERDIR__/,$out/lib/udev/,; " udev/* # fix-color */ sed -i " s,/lib/firmware,$out&,; diff --git a/pkgs/by-name/ro/rocksdb/package.nix b/pkgs/by-name/ro/rocksdb/package.nix index 70de68530e82..c3273e52e95f 100644 --- a/pkgs/by-name/ro/rocksdb/package.nix +++ b/pkgs/by-name/ro/rocksdb/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "9.8.4"; + version = "9.10.0"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "v${finalAttrs.version}"; - hash = "sha256-A6Gx4FqoGlxITUUz9k6tkDjUcLtMUBK9JS8vuAS96H0="; + hash = "sha256-G+DlQwEUyd7JOCjS1Hg1cKWmA/qAiK8UpUIKcP+riGQ="; }; patches = lib.optional ( diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix index 619db76a88d8..32ca4b294d03 100644 --- a/pkgs/by-name/se/seabios/package.nix +++ b/pkgs/by-name/se/seabios/package.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "fortify" "pic" + "pie" # ld: warning: creating DT_TEXTREL in a PIE (and more) "stackprotector" ]; diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix index c4afbd084e49..0ad90479c75f 100644 --- a/pkgs/by-name/va/vale/package.nix +++ b/pkgs/by-name/va/vale/package.nix @@ -4,13 +4,14 @@ fetchFromGitHub, makeBinaryWrapper, symlinkJoin, + versionCheckHook, vale, valeStyles, }: buildGoModule rec { pname = "vale"; - version = "3.9.2"; + version = "3.9.3"; subPackages = [ "cmd/vale" ]; @@ -18,7 +19,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-2LiuzO1Fha4uS0WNs2mihE/EOSTZa0fOWPzuBw22VlM="; + hash = "sha256-2IvVF/x8n1zvVXHAJLAFuDrw0Oi/RuQDa851SBlyRIk="; }; vendorHash = "sha256-EWAgzb3ruxYqaP+owcyGDzNnkPDYp0ttHwCgNXuuTbk="; @@ -30,6 +31,9 @@ buildGoModule rec { # Tests require network access doCheck = false; + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; passthru.withStyles = selector: diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 89487bdaa362..7a8e4afe0a74 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "reason"; - version = "3.13.0"; + version = "3.14.0"; minimalOCamlVersion = "4.11"; src = fetchurl { url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; - hash = "sha256-3yVEYGvIJKZwguIBGCbnoc3nrwzLW6RX6Tf+AYw85+Q="; + hash = "sha256-HQm6JKBZR0Wrazi01fgerYVltzy2mtRq8cLCb40yTwA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index b10f8097e9b3..efc6eee5c463 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !stdenv.hostPlatform.isDarwin; # usual dynamic linker issues meta = with lib; { - homepage = "https://elastix.lumc.nl"; + homepage = "https://elastix.dev"; description = "Image registration toolkit based on ITK"; changelog = "https://github.com/SuperElastix/elastix/releases/tag/${finalAttrs.version}"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix index 2f5d5df61e3d..849dd45a617e 100644 --- a/pkgs/development/ocaml-modules/higlo/default.nix +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -8,14 +8,14 @@ buildDunePackage rec { pname = "higlo"; - version = "0.9"; + version = "0.10.0"; src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; repo = "higlo"; rev = version; - hash = "sha256-SaFFzp4FCjVLdMLH6mNIv3HzJbkXJ5Ojbku258LCfLI="; + hash = "sha256-A5Su4+eBOq/WNdY/3EBQ3KqrRQuaCI1x25cEuoZp4Mo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index 613e93c83f42..f97b90f7a344 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -6,7 +6,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); buildDunePackage rec { pname = "lacaml"; - version = "11.1.0"; + version = "11.1.1"; useDune2 = true; @@ -14,7 +14,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mmottl/lacaml/releases/download/${version}/lacaml-${version}.tbz"; - sha256 = "sha256-3wuUX942wyWWXb5MjfeHZhx2/kS/+3JFVd04Ty/ZtwA="; + sha256 = "sha256-NEs7A/lfA+8AE6k19EPW02e1pseDE7HobGSB/ZwLcoc="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/python-modules/aioacaia/default.nix b/pkgs/development/python-modules/aioacaia/default.nix index a0cb33f61d23..52fff8c8a6eb 100644 --- a/pkgs/development/python-modules/aioacaia/default.nix +++ b/pkgs/development/python-modules/aioacaia/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioacaia"; - version = "0.1.12"; + version = "0.1.13"; pyproject = true; disabled = pythonOlder "3.12"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "aioacaia"; tag = "v${version}"; - hash = "sha256-XtHze2EYLSGm3u8aG6vbogqki83k1mBKy/bC8gCCoWQ="; + hash = "sha256-c+xtVUSyH9dBz97eI+8YYG/yW08kZFLNXnHudxYchCE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 9c05c265f905..068a7c72ec05 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + aioresponses, buildPythonPackage, fetchFromGitHub, freezegun, @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.10.3"; + version = "2024.12.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; tag = version; - hash = "sha256-kLsHJBmNxh+PmJQ9Y9Ve/CACovzsRZyzVjor/VKUmYk="; + hash = "sha256-JLlmvd6Hgf1a3YU9xfbw8plEbRDNgCzxF3PpveGsrPg="; }; postPatch = '' @@ -47,6 +48,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses freezegun pytest-asyncio pytest-cov-stub @@ -56,13 +58,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "aioautomower" ]; - pytestFlagsArray = [ "--snapshot-update" ]; - disabledTests = [ # File is missing "test_standard_mower" # Call no found "test_post_commands" + # Timezone mismatches + "test_full_planner_event" + "test_sinlge_planner_event" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 3fd703919c2d..d1e7c8b53319 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -11,6 +11,7 @@ pytest-cov-stub, pytest-mock, pytestCheckHook, + pythonAtLeast, pythonOlder, redis, setuptools, @@ -54,10 +55,15 @@ buildPythonPackage rec { "--deselect=tests/ut/backends/test_redis.py::TestRedisBackend::test_close" ]; - disabledTests = [ - # Test calls apache benchmark and fails, no usable output - "test_concurrency_error_rates" - ]; + disabledTests = + [ + # Test calls apache benchmark and fails, no usable output + "test_concurrency_error_rates" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # https://github.com/aio-libs/aiocache/issues/863 + "test_cache_write_doesnt_wait_for_future" + ]; disabledTestPaths = [ # Benchmark and performance tests are not relevant for Nixpkgs diff --git a/pkgs/development/python-modules/aiohasupervisor/default.nix b/pkgs/development/python-modules/aiohasupervisor/default.nix index 2f906fef1954..500f3a848418 100644 --- a/pkgs/development/python-modules/aiohasupervisor/default.nix +++ b/pkgs/development/python-modules/aiohasupervisor/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiohasupervisor"; - version = "0.2.1"; + version = "0.2.2b5"; pyproject = true; disabled = pythonOlder "3.12"; src = fetchPypi { inherit pname version; - hash = "sha256-oSQhZf0lV5bJYdrfu4j8Hw1F+EQfivEPQomatHixy9k="; + hash = "sha256-EFVhR7L+1SVzXO4UpDrXA1EuPdeew55CV4ykO3K5BFI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 551073c5fd99..9e0d4469df3b 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "12.1.0"; + version = "12.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-QcVyWabELa1bB2MOwQNPItXLgeOXlFpRh69dS+m1FLI="; + hash = "sha256-Y6gFFo0kzdHGaRqNVHhr0vvWBwRO2kOaoR4BFUbyYUQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 60d8ef96bbf1..e1d1d69a8275 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "5.0.0"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = "aioswitcher"; tag = version; - hash = "sha256-cKHH1yXVm/kZigO1Ub0XZEv+yq4lROc4SGFLqFuwQto="; + hash = "sha256-nf4PEitfM9uYOlmm/cfILnFo/xx8g7rjYn2nkf3gjMg="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index 04574c0e2fe4..7ba63732046c 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "authlib"; - version = "1.3.2"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "lepture"; repo = "authlib"; tag = "v${version}"; - hash = "sha256-gaFnai5QzHhnyn73JB+QzybaolLWC9barBFdnlEMyMU="; + hash = "sha256-GUB/ioyeFfuuKZqsqJkDq0e6ETa1jqyr+GJHPddLRkA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index f0a06382d88c..afd111598693 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.42.5"; + version = "0.42.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; tag = version; - hash = "sha256-RdNJmIhJR4Ubb4hppFkde8EeYHtFSoJp3CJPGj0463U="; + hash = "sha256-qMODlsImGSvUkR+0jjrU23jJtM3c7JNJ7lY7Svli+ao="; }; postPatch = '' diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 99b9e3d4a36a..1440d815c338 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -9,6 +9,7 @@ pytest-vcr, pytestCheckHook, python-dateutil, + pythonAtLeast, pythonOlder, requests, vcrpy, @@ -48,11 +49,16 @@ buildPythonPackage rec { "tests/integration/api/test_*.py" ]; - disabledTests = [ - "test_default_settings_set" - # https://github.com/DataDog/datadogpy/issues/746 - "TestDogshell" - ]; + disabledTests = + [ + "test_default_settings_set" + # https://github.com/DataDog/datadogpy/issues/746 + "TestDogshell" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # https://github.com/DataDog/datadogpy/issues/880 + "test_timed_coroutine" + ]; pythonImportsCheck = [ "datadog" ]; diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index f5dc398478a7..93aaad9c0d7b 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "9.4.0"; + version = "10.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; tag = version; - hash = "sha256-hJGE9D0rsYKrd4XZIrOOnwaQlq75Qy4S8681wjr4VDs="; + hash = "sha256-qnXDr8+e13/VMFhFBbQJPdct5MjHwcBkLl+fo8xaEgY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/deid/default.nix b/pkgs/development/python-modules/deid/default.nix index 180b7a8e2947..8d60dd9aa3e9 100644 --- a/pkgs/development/python-modules/deid/default.nix +++ b/pkgs/development/python-modules/deid/default.nix @@ -14,11 +14,13 @@ let deid-data = buildPythonPackage rec { pname = "deid-data"; version = "unstable-2022-12-06"; - format = "pyproject"; + pyproject = true; + disabled = pythonOlder "3.7"; - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ pydicom ]; + build-system = [ setuptools ]; + + dependencies = [ pydicom ]; src = fetchFromGitHub { owner = "pydicom"; @@ -37,9 +39,9 @@ let in buildPythonPackage rec { pname = "deid"; - version = "0.3.22"; + version = "0.3.25"; + pyproject = true; - format = "pyproject"; disabled = pythonOlder "3.7"; # Pypi version has no tests @@ -47,11 +49,13 @@ buildPythonPackage rec { owner = "pydicom"; repo = pname; # the github repo does not contain Pypi version tags: - rev = "40dc96125daeb65856d643e12c3d6dfec756be0d"; - hash = "sha256-OtxQPF29eqt8I1Q12ga8a1IjBVO+VBk6y0DQmRtCNoU="; + rev = "830966d52846c6b721fabb4cc1c75f39eabd55cc"; + hash = "sha256-+slwnQSeRHpoCsvZ24Gq7rOBpQL37a6Iqrj4Mqj6PCo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ matplotlib pydicom python-dateutil @@ -64,11 +68,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "deid" ]; - meta = with lib; { + meta = { description = "Best-effort anonymization for medical images"; mainProgram = "deid"; + changelog = "https://github.com/pydicom/deid/blob/${version}/CHANGELOG.md"; homepage = "https://pydicom.github.io/deid"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/demetriek/default.nix b/pkgs/development/python-modules/demetriek/default.nix index 6f75104aad5f..b1a7701d9e2f 100644 --- a/pkgs/development/python-modules/demetriek/default.nix +++ b/pkgs/development/python-modules/demetriek/default.nix @@ -6,10 +6,11 @@ backoff, buildPythonPackage, fetchFromGitHub, - fetchpatch, + mashumaro, + orjson, poetry-core, - pydantic, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, yarl, @@ -17,55 +18,43 @@ buildPythonPackage rec { pname = "demetriek"; - version = "0.4.0"; + version = "1.1.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-demetriek"; tag = "v${version}"; - hash = "sha256-LCHHBcZgO9gw5jyaJiiS4lKyb0ut+PJvKTylIvIKHhc="; + hash = "sha256-MDGAhsLbJqvywQntlPfM/cPyltqsqnt2C31ACpMPn0Y="; }; - patches = [ - # https://github.com/frenck/python-demetriek/pull/531 - (fetchpatch { - name = "pydantic_2-compatibility.patch"; - url = "https://github.com/frenck/python-demetriek/commit/e677fe5b735b6b28572e3e5fd6aab56fc056f5e6.patch"; - excludes = [ - "pyproject.toml" - "poetry.lock" - ]; - hash = "sha256-oMVR45KHDhcPId/0X9obJXCPE8s1gk5IgsGsgZesdZw="; - }) - ]; - postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" + --replace-fail "0.0.0" "${version}" ''; pythonRelaxDeps = [ "pydantic" ]; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp awesomeversion backoff - pydantic + mashumaro + orjson yarl ]; nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index b3f9e73e1134..6df9a652fb6f 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dicom2nifti"; - version = "2.4.11"; + version = "2.5.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "icometrix"; repo = pname; tag = version; - hash = "sha256-/JauQZcCQDl1ukcSE3YPbf1SyhVxDNJUlqnFwdlwYQY="; + hash = "sha256-lPaBKqYO8B138fCgeKH6vpwGQhN3JCOnDj5PgaYfRPA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix index 9265e5c9ebe1..49d3b046f13a 100644 --- a/pkgs/development/python-modules/elmax-api/default.nix +++ b/pkgs/development/python-modules/elmax-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elmax-api"; - version = "0.0.6.3"; + version = "0.0.6.4rc0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = pname; tag = "v${version}"; - hash = "sha256-jnm1AFnPxZIgD815ZFxV/i9ar4cZfsYJ0+xDpM3hKmg="; + hash = "sha256-BYVfP8B+p4J4gW+64xh9bT9sDcu/lk0R+MvLsYLwRfQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 2c6224ee6faa..038b908b47d3 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "emoji"; - version = "2.13.2"; + version = "2.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "carpedm20"; repo = "emoji"; tag = "v${version}"; - hash = "sha256-1oFzuIA2HFoBw50HHYi8bGZTAAeC6fesSnLReuXUZcM="; + hash = "sha256-ubZrVw069UiUvtEk9iff5lByGXyNalsKPv3Mj2X3qxc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 905c597a8459..244d0dfdf42e 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "1.0.4"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,18 +20,12 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; tag = version; - hash = "sha256-enYo2hZ1C8jqO+8xZhSmIOJQAyrtVUJ9S/e2Bxzhv0I="; + hash = "sha256-7gWqlb2PNRI50Xe8lv2Kim7wUYVzuQMa4BAbg2a7NvM="; }; postPatch = '' substituteInPlace setup.py \ --replace-fail '"pytest-runner>=5.2",' "" - # webcolors API change, https://github.com/Danielhiversen/flux_led/issues/401 - substituteInPlace flux_led/utils.py \ - --replace-fail "CSS2_HEX_TO_NAMES.values()" 'names("css2")' \ - --replace-fail "CSS21_HEX_TO_NAMES.values()" 'names("css21")' \ - --replace-fail "CSS3_HEX_TO_NAMES.values()" 'names("css3")' \ - --replace-fail "HTML4_HEX_TO_NAMES.values()" 'names("html4")' ''; build-system = [ setuptools ]; @@ -47,11 +41,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "flux_led" ]; - # disabledTests = [ - # # AttributeError: module 'webcolors' has no attribute 'CSS2_HEX_TO_NAMES' - # "test_get_color_names_list" - # ]; - meta = with lib; { description = "Python library to communicate with the flux_led smart bulbs"; homepage = "https://github.com/Danielhiversen/flux_led"; diff --git a/pkgs/development/python-modules/guppy3/default.nix b/pkgs/development/python-modules/guppy3/default.nix index e5df11502afd..bd0c90ea8665 100644 --- a/pkgs/development/python-modules/guppy3/default.nix +++ b/pkgs/development/python-modules/guppy3/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "guppy3"; - version = "3.1.4.post1"; + version = "3.1.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zhuyifei1999"; repo = pname; tag = "v${version}"; - hash = "sha256-HHy57P6WEHZKygAbdjEh6XAApFlQueiYGr02eSQMWfc="; + hash = "sha256-hgJcy4DRfZL50dCcRv2a6GJPDabsUMfDtq7HCXXYYz8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 715a08c9f028..ee46fd1ecdbd 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.86.0"; + version = "0.87.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; tag = version; - hash = "sha256-ySo0G/Zh+KQMocMxrvUua704gt2tWQMlArqxBS/C9hs="; + hash = "sha256-V9iP/YRvxsdpYLqcRHSIULlOPQKq5fkouUXTNNeF0FY="; }; pythonRelaxDeps = [ "acme" ]; diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index 5fe012e54966..a961b278c024 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -17,19 +17,17 @@ let pname = "hassil"; - version = "2.0.5"; + version = "2.1.0"; in buildPythonPackage { inherit pname version; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "home-assistant"; repo = "hassil"; tag = "v${version}"; - hash = "sha256-e6Y0GGURGKzbX1dniBbYEJB9K3/R84n3UmnMO0HPPPo="; + hash = "sha256-CGobMgaDHcruvOzVBIc6xS0tuaMT410t62KD3Hg30EY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix index 469905525324..584858a36bd3 100644 --- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix @@ -42,8 +42,9 @@ pylint, pyperclip, pyserial, - python3, + python, python-daemon, + pythonOlder, pyyaml, requests, setuptools, @@ -85,7 +86,7 @@ stdenv.mkDerivation rec { # Initialize only necessary submodules. cd connectedhomeip - ${python3}/bin/python3 scripts/checkout_submodules.py --platform linux --shallow + ${python.interpreter} scripts/checkout_submodules.py --platform linux --shallow # Keep the output deterministic. cd $out @@ -105,7 +106,7 @@ stdenv.mkDerivation rec { zap-chip # gdbus-codegen glib - python3 + python # dependencies of build scripts click jinja2 @@ -200,7 +201,7 @@ stdenv.mkDerivation rec { pyelftools pygments pykwalify - pylint + (pylint.overridePythonAttrs { doCheck = pythonOlder "3.13"; }) pyperclip pyserial python-daemon @@ -254,7 +255,7 @@ stdenv.mkDerivation rec { ''chip_config_memory_debug_dmalloc=false'' ''chip_mdns="minimal"'' ''chip_minmdns_default_policy="libnl"'' - ''chip_python_version="${lib.versions.majorMinor python3.version}"'' + ''chip_python_version="${lib.versions.majorMinor python.version}"'' ''chip_python_platform_tag="any"'' ''chip_python_package_prefix="home-assistant-chip"'' ''custom_toolchain="custom"'' diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index f065711d53d1..e31545f3be97 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ical"; - version = "8.2.0"; + version = "8.3.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; tag = version; - hash = "sha256-9mnyhDKcZTZAGRxojQN9I9ZAgBmsSSsBPzCMZO6Rl5k="; + hash = "sha256-Hva4yCN46ACmKFZL5geR/NnEiEFHOCW/s+LOusnb1MI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/idasen-ha/default.nix b/pkgs/development/python-modules/idasen-ha/default.nix index d84fb04fffda..1475d6a85e36 100644 --- a/pkgs/development/python-modules/idasen-ha/default.nix +++ b/pkgs/development/python-modules/idasen-ha/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "idasen-ha"; - version = "2.6.2"; + version = "2.6.3"; pyproject = true; src = fetchFromGitHub { owner = "abmantis"; repo = "idasen-ha"; tag = version; - hash = "sha256-lqqSx4jxQVq2pjVv9lvaX6nNK6OqtMjPqOtLMLpVMUU="; + hash = "sha256-Z4MfJGL2uDqY1ddoV2fB+Ty/dKFhCUY8qBfP/i/naJs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/iottycloud/default.nix b/pkgs/development/python-modules/iottycloud/default.nix index 079093f6fef4..fd50d50013be 100644 --- a/pkgs/development/python-modules/iottycloud/default.nix +++ b/pkgs/development/python-modules/iottycloud/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pburgio"; repo = "iottyCloud"; - tag = "v${version}"; - hash = "sha256-EtAAUyVL7FTn0VoGmU5bU9XouMuEQUOx2t6j/wd1OEo="; + tag = version; + hash = "sha256-tsCa87BdwKumsv5N0lAPZmMIfm2W6Pw0LS3sF9c/oRA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/libusb1/ctypes.patch b/pkgs/development/python-modules/libusb1/ctypes.patch new file mode 100644 index 000000000000..5d0ad9d03d38 --- /dev/null +++ b/pkgs/development/python-modules/libusb1/ctypes.patch @@ -0,0 +1,71 @@ +diff --git a/usb1/_libusb1.py b/usb1/_libusb1.py +index 42b01e9..36f2d16 100644 +--- a/usb1/_libusb1.py ++++ b/usb1/_libusb1.py +@@ -172,64 +172,13 @@ else: + LIBUSB_CALL_FUNCTYPE = CFUNCTYPE + + def __getLibrary(): +- my_dir = os.path.dirname(__file__) + system = platform.system() +- # If this is a binary wheel, try to use an integrated libusb first. +- # To use the libusb from the Python installation or the OS, install +- # from sdist: +- # > pip install --no-binary :all: libusb1 + if system == 'Windows': + dll_loader = ctypes.WinDLL +- libusb_list = [ +- os.path.join(my_dir, 'libusb-1.0.dll'), +- 'libusb-1.0.dll', +- ] +- find_library = None + else: + dll_loader = CDLL +- if system == 'Darwin': +- libusb_list = [ +- os.path.join(my_dir, 'libusb-1.0.dylib'), +- 'libusb-1.0.dylib', +- # macport standard path +- '/opt/local/lib/libusb-1.0.dylib', +- # fink standard path +- '/sw/lib/libusb-1.0.dylib', +- # homebrew standard path for symlink (Apple M1 Silicon) +- '/opt/homebrew/opt/libusb/lib/libusb-1.0.dylib', +- ] +- find_library = None +- else: +- # .so.0 should be the optimal suffix +- # .so is for BBB, especially if libusb-1.0.so was bundled in some +- # uses of this module. +- libusb_list = [ +- os.path.join(my_dir, 'libusb-1.0.so.0'), +- os.path.join(my_dir, 'libusb-1.0.so'), +- 'libusb-1.0.so.0', +- 'libusb-1.0.so', +- ] +- find_library = ( +- # libusb.so.2 on FreeBSD: load('libusb.so') would work fine, but... +- # libusb.so.2debian on Debian GNU/kFreeBSD: here it wouldn't work. +- 'usb' +- if 'FreeBSD' in system else +- 'usb-1.0' +- ) +- for filename in libusb_list: +- try: +- return dll_loader(filename, use_errno=True, use_last_error=True) +- except OSError: +- pass +- if find_library is not None: +- filename = ctypes.util.find_library(find_library) +- if filename is not None: +- return dll_loader(filename, use_errno=True, use_last_error=True) +- raise OSError( +- errno.ENOENT, +- 'cannot find a suitable libusb-1.0', +- libusb_list, +- ) ++ ++ return dll_loader("@libusb@", use_errno=True, use_last_error=True) + + __load_lock = Lock() + __loaded = False diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 0304dd09677e..34f6c1b7636f 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,26 +2,33 @@ lib, stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + substituteAll, + setuptools, libusb1, pytestCheckHook, }: buildPythonPackage rec { pname = "libusb1"; - version = "3.1.0"; - format = "setuptools"; + version = "3.2.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "4ee9b0a55f8bd0b3ea7017ae919a6c1f439af742c4a4b04543c5fd7af89b828c"; + src = fetchFromGitHub { + owner = "vpelletier"; + repo = "python-libusb1"; + tag = version; + hash = "sha256-D2VMqrq1MQa6gp8vxDiLRAqTDyRGK3qVKo6YMmo5Zrg="; }; - postPatch = '' - substituteInPlace usb1/_libusb1.py --replace \ - "ctypes.util.find_library(base_name)" \ - "'${libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; + patches = [ + (substituteAll { + src = ./ctypes.patch; + libusb = "${lib.getLib libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + build-system = [ setuptools ]; buildInputs = [ libusb1 ]; diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix index 67005b38cf1d..65421615d17e 100644 --- a/pkgs/development/python-modules/mozart-api/default.nix +++ b/pkgs/development/python-modules/mozart-api/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mozart-api"; - version = "4.1.1.116.3"; + version = "4.1.1.116.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mozart_api"; inherit version; - hash = "sha256-ioM+l+1ab191OTKXE4Ou8OOPafAqZz9XmxO5c82KH8g="; + hash = "sha256-9yg02AQdHMR/Yz0dpjSb3umdNRNTo7S04Q2BY/vu7WQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index aa7c359cdf2e..e81fc579ce0b 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system pbr, @@ -24,6 +25,14 @@ buildPythonPackage rec { hash = "sha256-p7DvOGRhkCmtJ32EfttyKXGGmO5kfb2bQGqok/RJtU8="; }; + patches = [ + (fetchpatch2 { + # python3.13 compat + url = "https://github.com/Infinidat/munch/commit/84651ee872f9ea6dbaed986fd3818202933a8b50.patch"; + hash = "sha256-n/uBAP7pnlGZcnDuxdMKWgAEdG9gWeGoLWB97T1KloY="; + }) + ]; + env.PBR_VERSION = version; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mypermobil/default.nix b/pkgs/development/python-modules/mypermobil/default.nix index 55c47e6e0691..85c2f56be151 100644 --- a/pkgs/development/python-modules/mypermobil/default.nix +++ b/pkgs/development/python-modules/mypermobil/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, setuptools, aiocache, aiohttp, @@ -35,10 +36,15 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # requires networking - "test_region" - ]; + disabledTests = + [ + # requires networking + "test_region" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # AssertionError: MyPermobilAPIException not raised + "test_request_item_404" + ]; meta = { changelog = "https://github.com/Permobil-Software/mypermobil/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/ndms2-client/default.nix b/pkgs/development/python-modules/ndms2-client/default.nix index 573188d482ee..619cbe171cfa 100644 --- a/pkgs/development/python-modules/ndms2-client/default.nix +++ b/pkgs/development/python-modules/ndms2-client/default.nix @@ -2,7 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, setuptools, + standard-telnetlib, pytestCheckHook, }: @@ -19,6 +21,8 @@ buildPythonPackage rec { hash = "sha256-A19olC1rTHTy0xyeSP45fqvv9GUynQSrMgXBgW8ySOs="; }; + dependencies = lib.optionals (pythonAtLeast "3.13") [ standard-telnetlib ]; + nativeBuildInputs = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index 930f2e83216c..6aa365990de3 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -2,6 +2,7 @@ lib, stdenv, buildPythonPackage, + pythonAtLeast, pythonOlder, fetchFromGitHub, substituteAll, @@ -9,6 +10,7 @@ libopus, aiohttp, aiodns, + audioop-lts, brotli, faust-cchardet, orjson, @@ -42,15 +44,19 @@ buildPythonPackage rec { setuptools ]; - dependencies = [ - aiodns - aiohttp - brotli - faust-cchardet - orjson - pynacl - setuptools # for pkg_resources, remove with next release - ]; + dependencies = + [ + aiodns + aiohttp + brotli + faust-cchardet + orjson + pynacl + setuptools # for pkg_resources, remove with next release + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + audioop-lts + ]; # upstream has no tests doCheck = false; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index c51b32f1e2c7..51cf9021c22c 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, pythonOlder, # build-system @@ -36,7 +37,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.58.1"; + version = "1.59.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +46,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-QK0NNMJM4sj4u8nlNPBBQpqV0pBYUMcSwKqhna5q10c="; + hash = "sha256-gMykGfNgpTlh8LiFXL2p5ECSpeYCfS0LTsgHIzT1c1I="; }; build-system = [ @@ -92,11 +93,16 @@ buildPythonPackage rec { "ignore::DeprecationWarning" ]; - disabledTests = [ - # Tests make network requests - "test_copy_build_request" - "test_basic_attribute_access_works" - ]; + disabledTests = + [ + # Tests make network requests + "test_copy_build_request" + "test_basic_attribute_access_works" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # RuntimeWarning: coroutine method 'aclose' of 'AsyncStream._iter_events' was never awaited + "test_multi_byte_character_multiple_chunks" + ]; disabledTestPaths = [ # Test makes network requests @@ -106,7 +112,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for the OpenAI API"; homepage = "https://github.com/openai/openai-python"; - changelog = "https://github.com/openai/openai-python/releases/tag/v${version}"; + changelog = "https://github.com/openai/openai-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ malo ]; mainProgram = "openai"; diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 7c3a051c7b43..947dc7dd6b0e 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -22,7 +22,6 @@ # tests opencv4, numpy, - pympler, pytestCheckHook, }: @@ -72,7 +71,6 @@ buildPythonPackage rec { nativeCheckInputs = [ opencv4 numpy - pympler pytestCheckHook ]; diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 172415230716..9254d9e17962 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.6.3"; + version = "1.6.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; tag = "v${version}"; - hash = "sha256-REWU3ngf93HUVDnyiErML41E+nPoqphfhBKmAYvV2+U="; + hash = "sha256-mzMa+i+DESgOo67SIUBofeY+KoEWdFCcNac7oqEZFgU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyblu/default.nix b/pkgs/development/python-modules/pyblu/default.nix index 1fd0acec7288..583618944f91 100644 --- a/pkgs/development/python-modules/pyblu/default.nix +++ b/pkgs/development/python-modules/pyblu/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyblu"; - version = "1.0.4"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "LouisChrist"; repo = "pyblu"; tag = "v${version}"; - hash = "sha256-BDuptBC72XG+q/5MlbPMjYDIhWKg4gfEo2pLOflwQaM="; + hash = "sha256-Y/9mPaOgynQock8nakjQHCs9VUs7w7EysYsGsDOM87Y="; }; pythonRelaxDeps = [ "aiohttp" ]; diff --git a/pkgs/development/python-modules/pyflick/default.nix b/pkgs/development/python-modules/pyflick/default.nix index 4b11027d55f0..6d21852ca348 100644 --- a/pkgs/development/python-modules/pyflick/default.nix +++ b/pkgs/development/python-modules/pyflick/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { - pname = "py-flick"; + pname = "pyflick"; version = "1.1.2"; pyproject = true; diff --git a/pkgs/development/python-modules/pymatting/default.nix b/pkgs/development/python-modules/pymatting/default.nix index a5b22b29744b..5d67894b4929 100644 --- a/pkgs/development/python-modules/pymatting/default.nix +++ b/pkgs/development/python-modules/pymatting/default.nix @@ -8,28 +8,38 @@ pytestCheckHook, scipy, setuptools, + config, + cudaSupport ? config.cudaSupport, + cupy, + pyopencl, }: buildPythonPackage rec { pname = "pymatting"; - version = "1.1.10"; + version = "1.1.13"; pyproject = true; src = fetchFromGitHub { owner = "pymatting"; repo = "pymatting"; - tag = "v${version}"; - hash = "sha256-wHCTqcBvVN/pTXH3iW57DPpMEsnehutRQB5NaugS6Zs="; + # https://github.com/pymatting/pymatting/issues/92 + rev = "afd2dec073cb08b8119300feec18c179a9d436f3"; + hash = "sha256-AzdhRZgcT+gfLPZYKJLQUW7uLyXoRy6SP2raHWd9XUY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - numba - numpy - pillow - scipy - ]; + dependencies = + [ + numba + numpy + pillow + scipy + ] + ++ lib.optionals cudaSupport [ + cupy + pyopencl + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -47,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for alpha matting"; homepage = "https://github.com/pymatting/pymatting"; - changelog = "https://github.com/pymatting/pymatting/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/pymatting/pymatting/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ blaggacao ]; }; diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 07466ebcddcd..2949211b9b27 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "defusedxml" ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; patches = [ (fetchpatch { @@ -47,9 +47,14 @@ buildPythonPackage rec { url = "https://github.com/rytilahti/python-miio/commit/67d9d771d04d51f5bd97f361ca1c15ae4a18c274.patch"; hash = "sha256-Os9vCSKyieCqHs63oX6gcLrtv1N7hbX5WvEurelEp8w="; }) + (fetchpatch { + # Python 3.13 compat + url = "https://github.com/rytilahti/python-miio/commit/0aa4df3ab1e47d564c8312016fbcfb3a9fc06c6c.patch"; + hash = "sha256-Zydv3xqCliA/oAnjNmqh0vDrlZFPcTAIyW6vIZzijZY="; + }) ]; - propagatedBuildInputs = [ + dependencies = [ android-backup appdirs attrs diff --git a/pkgs/development/python-modules/pyws66i/default.nix b/pkgs/development/python-modules/pyws66i/default.nix index 47df29289202..aa196c646a69 100644 --- a/pkgs/development/python-modules/pyws66i/default.nix +++ b/pkgs/development/python-modules/pyws66i/default.nix @@ -3,7 +3,9 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + pythonAtLeast, pythonOlder, + standard-telnetlib, }: buildPythonPackage rec { @@ -20,6 +22,8 @@ buildPythonPackage rec { hash = "sha256-NTL2+xLqSNsz4YdUTwr0nFjhm1NNgB8qDnWSoE2sizY="; }; + dependencies = lib.optionals (pythonAtLeast "3.13") [ standard-telnetlib ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyws66i" ]; diff --git a/pkgs/development/python-modules/quart-cors/default.nix b/pkgs/development/python-modules/quart-cors/default.nix index 296a2baaf30f..aca57d8e08f7 100644 --- a/pkgs/development/python-modules/quart-cors/default.nix +++ b/pkgs/development/python-modules/quart-cors/default.nix @@ -5,7 +5,7 @@ pythonOlder, # build-system - poetry-core, + pdm-backend, # propagates quart, @@ -19,17 +19,17 @@ buildPythonPackage rec { pname = "quart-cors"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { owner = "pgjones"; repo = "quart-cors"; tag = version; - hash = "sha256-qUzs0CTZHf3fGADBXPkd3CjZ6dnz1t3cTxflMErvz/k="; + hash = "sha256-f+l+j0bjzi5FTwJzdXNyCgh3uT4zldpg22ZOgW1Wub4="; }; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; dependencies = [ quart ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/renson-endura-delta/default.nix b/pkgs/development/python-modules/renson-endura-delta/default.nix index 00f104055187..45aec971ed7e 100644 --- a/pkgs/development/python-modules/renson-endura-delta/default.nix +++ b/pkgs/development/python-modules/renson-endura-delta/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, pytestCheckHook, pythonOlder, requests, @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "renson-endura-delta"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "jimmyd-be"; - repo = "Renson-endura-delta-library"; - tag = version; - hash = "sha256-ndk0qcRUWxUimNHg62UgeYK/MRKQd3e4JQDh9x8vFj8="; + # github repo is gone + src = fetchPypi { + pname = "renson_endura_delta"; + inherit version; + hash = "sha256-bL4faNFh+ocNNspZCXE6/UZ4nH3mKkHSAEvwtN0xfoE="; }; postPatch = '' @@ -32,6 +32,8 @@ buildPythonPackage rec { dependencies = [ requests ]; + doCheck = false; # no tests in sdist + nativeCheckInputs = [ pytestCheckHook requests-mock diff --git a/pkgs/development/python-modules/sentry-sdk/1.nix b/pkgs/development/python-modules/sentry-sdk/1.nix index c09abf95944c..0141a90c8876 100644 --- a/pkgs/development/python-modules/sentry-sdk/1.nix +++ b/pkgs/development/python-modules/sentry-sdk/1.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { pytestCheckHook ]; - doCheck = !stdenv.hostPlatform.isDarwin; + doCheck = pythonOlder "3.13" && !stdenv.hostPlatform.isDarwin; disabledTests = [ # Issue with the asseration diff --git a/pkgs/development/python-modules/standard-aifc/default.nix b/pkgs/development/python-modules/standard-aifc/default.nix new file mode 100644 index 000000000000..5ef23d18f82b --- /dev/null +++ b/pkgs/development/python-modules/standard-aifc/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + audioop-lts, + standard-chunk, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "standard-aifc"; + version = "3.13.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "youknowone"; + repo = "python-deadlib"; + tag = "v${version}"; + hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg="; + }; + + sourceRoot = "${src.name}/aifc"; + + build-system = [ + setuptools + ]; + + dependencies = [ + audioop-lts + standard-chunk + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ + "aifc" + ]; + + meta = { + description = "Standard library aifc redistribution"; + homepage = "https://github.com/youknowone/python-deadlib/tree/main/aifc"; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/standard-chunk/default.nix b/pkgs/development/python-modules/standard-chunk/default.nix new file mode 100644 index 000000000000..c5a30753b7f1 --- /dev/null +++ b/pkgs/development/python-modules/standard-chunk/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "standard-chunk"; + version = "3.13.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "youknowone"; + repo = "python-deadlib"; + tag = "v${version}"; + hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg="; + }; + + sourceRoot = "${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; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/standard-telnetlib/default.nix b/pkgs/development/python-modules/standard-telnetlib/default.nix new file mode 100644 index 000000000000..c66530455ccc --- /dev/null +++ b/pkgs/development/python-modules/standard-telnetlib/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "standard-telnetlib"; + version = "3.13.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "youknowone"; + repo = "python-deadlib"; + tag = "v${version}"; + hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg="; + }; + + sourceRoot = "${src.name}/telnetlib"; + + build-system = [ setuptools ]; + + # missing "reads" fixture when using pytest + nativeCheckInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "telnetlib" ]; + + meta = { + description = "Python dead batteries. See PEP 594"; + homepage = "https://github.com/youknowone/python-deadlib"; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 311686a205c5..fa8b6c395e7d 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -20,6 +20,7 @@ platformdirs, propcache, pydantic, + pydantic-extra-types, pyjwt, rich, typer, @@ -39,7 +40,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "6.6.5"; + version = "7.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -48,7 +49,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; tag = "v${version}"; - hash = "sha256-ZohQTXOLc2E0vfD21IUh6ECTfbAd2SZOg/73lk/UMO0="; + hash = "sha256-TALjJmTI5lMXyXcJtfyMVpqLo8dBbENG22EX7B+3QKQ="; }; build-system = [ poetry-core ]; @@ -71,6 +72,7 @@ buildPythonPackage rec { platformdirs propcache pydantic + pydantic-extra-types pyjwt rich typer diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix index 550ac9319a0a..c036cccf5f90 100644 --- a/pkgs/development/python-modules/unicode-rbnf/default.nix +++ b/pkgs/development/python-modules/unicode-rbnf/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "unicode-rbnf"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "unicode-rbnf"; tag = "v${version}"; - hash = "sha256-1kq8qTzFYYRRjlxBdvIiBuXbprA0bF4zMFOVbpgCR3c="; + hash = "sha256-jVooLqy1FjCQGll53DqQ074ypjGwPRBzVmgEYXtMP+Y="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index cbbe9107c87b..e94e4f0981cf 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2024.11.1"; + version = "2024.12.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "velbus-aio"; tag = version; - hash = "sha256-hYtZgr5HJj1zjiCXBK63086ke/oWhO9CyIvnN/JUPm4="; + hash = "sha256-tRcPwbvQBy0cmavAyEvhp6SimseeBYAMH9wAfC4fpKg="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 20efe25f5911..5c5c0917f100 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "0.18.9"; + version = "0.18.11"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = "whirlpool-sixth-sense"; tag = version; - hash = "sha256-aDvUV83o/yKx15kenDGng5xh3LECLVlLWJlVe/y+1Co="; + hash = "sha256-dXLMyvNmVrc5kCozBwAIM5DKqjdiiqwwNLkhMGnH0fA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix index 931d0be5748c..07aabe725302 100644 --- a/pkgs/development/python-modules/xbox-webapi/default.nix +++ b/pkgs/development/python-modules/xbox-webapi/default.nix @@ -44,6 +44,9 @@ buildPythonPackage rec { respx ]; + # https://github.com/OpenXbox/xbox-webapi-python/issues/114 + disabledTests = [ "test_import" ]; + meta = with lib; { changelog = "https://github.com/OpenXbox/xbox-webapi-python/blob/${src.rev}/CHANGELOG.md"; description = "Library to authenticate with Windows Live/Xbox Live and use their API"; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 9f38282e8a07..4acc1dbc7b0d 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.125"; + version = "0.0.129"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; tag = version; - hash = "sha256-Tqt+ydp7Vr3pWBQ0T5B0CV+bfX+0yRXynEhD01afY/w="; + hash = "sha256-/lcF7MZrw85H5LBL8aBdaIuFRT5yJUhr+vN9gJHnPDw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 72ff96ce950f..c94b328ed646 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.42"; + version = "0.0.44"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-iju/WjndlwEZjforoVyoIb6oTJNlvkEnsoQH2d6tFlQ="; + hash = "sha256-ZgCbhezNsWZsQQViPK04UQA2mGZz47rFiMAk2oR8xR4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index dbdb5e3930c8..abc1699e12cf 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.73.1"; + version = "0.73.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; tag = version; - hash = "sha256-Fb5rZhxd93QY0TYJTTLXEaqlxk3JdlIOun5FB7wJbSE="; + hash = "sha256-+YkNV6xbM38dHVpXD264KmzozborvotZRETAncpAUEs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 73b8ea454aa8..389e8635de4d 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.59.1"; + version = "0.60.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "zwave-js-server-python"; tag = version; - hash = "sha256-7TbGRPGIpS8T0bmEIiRHChvdiKqTKccnkl0YVoQHfdE="; + hash = "sha256-+TW+6NhbtANtXf5ITAs+Mz8I7iZk93YYdUkUhp4m7pw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index c5921c694473..b9b169790688 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.24.0"; + version = "0.24.2"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-czQJqLz6rRgyh9usuhDTmgwMC6oL5UzpwNFQ3PKpKck="; + hash = "sha256-XVZNHPMl03hpGHgoaViWWj8eMDZBKDb7BfOrPGlVqEM="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 0cadd4fb20e0..dcae9d8664c4 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.17.0"; + version = "3.17.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-LDqmxB7Tnj1sGiktdfSAa9gDEIQa/FFnOqWc6cgWUHw="; + hash = "sha256-a57l7QUTeaacpFFzrGxd61a0ShwW4wt8NxNDMD2DWsY="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/development/web/netlify-cli/default.nix index d3dd38fcb2a2..e5f368684200 100644 --- a/pkgs/development/web/netlify-cli/default.nix +++ b/pkgs/development/web/netlify-cli/default.nix @@ -11,16 +11,16 @@ buildNpmPackage rec { pname = "netlify-cli"; - version = "17.37.2"; + version = "17.38.0"; src = fetchFromGitHub { owner = "netlify"; repo = "cli"; tag = "v${version}"; - hash = "sha256-1UaIPCzyHMKNJfDFILPYIrjHwzHAmlYNk+aHZM1Bp6Q="; + hash = "sha256-fK+Z6bqnaqSYXgO0lUbGALZeCiAnvMd6LkMSH7JB7J8="; }; - npmDepsHash = "sha256-pJaNdR9jyFSdfE+yLnQn9/Gbq2CbH6y3aEVbpg3Ft/o="; + npmDepsHash = "sha256-oFt+l8CigOtm3W5kiT0kFsqKLOJB9ggfiFQgUU5xQ1I="; inherit nodejs; diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index b9a6e321531c..6bc08951f3cc 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -40,4 +40,6 @@ mkKdeDerivation { qtWrapperArgs = [ "--set FREI0R_PATH ${frei0r}/lib/frei0r-1" ]; + + meta.mainProgram = "kdenlive"; } diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 8062b2ccb5de..963b683a8593 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -7,7 +7,7 @@ }: let rev-prefix = "ena_linux_"; - version = "2.13.1"; + version = "2.13.2"; in stdenv.mkDerivation { inherit version; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "amzn"; repo = "amzn-drivers"; rev = "${rev-prefix}${version}"; - hash = "sha256-oFeTaulcnp9U7Zxhf08yNxpEtyxjI5QJmfITHVHDES0="; + hash = "sha256-v4S23lG3DGcsLcxwl4F11UlN7xD69mg0yS4fWs89+kM="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 862eda8b2217..1348ce1c3ba9 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "20.1.2-55742"; + version = "20.1.3-55743"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-R7pQhmLpMOHExPwH4YM3WDnp1PcwpH5Bif3C1/N55Bg="; + hash = "sha256-5lbTTQucop/jnsVudoqTO9bESR5tdn8NFu9Nm2WphU4="; }; hardeningDisable = [ diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 85747ca2877b..cb719aea0dac 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.12.5"; + version = "2025.1.0"; components = { "3_day_blinds" = ps: with ps; [ @@ -233,11 +233,9 @@ [ adb-shell androidtv - pure-python-adb ] ++ adb-shell.optional-dependencies.async - ++ androidtv.optional-dependencies.async - ++ pure-python-adb.optional-dependencies.async; + ++ androidtv.optional-dependencies.async; "androidtv_remote" = ps: with ps; [ androidtvremote2 @@ -497,6 +495,8 @@ ]; "backup" = ps: with ps; [ + aiohasupervisor + cronsim securetar ]; "baf" = @@ -776,6 +776,7 @@ "caldav" = ps: with ps; [ caldav + icalendar ]; "calendar" = ps: with ps; [ @@ -796,6 +797,7 @@ "cast" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -810,6 +812,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar zeroconf ]; "ccm15" = @@ -860,6 +863,7 @@ "cloud" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -869,6 +873,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "cloudflare" = ps: with ps; [ @@ -934,6 +939,9 @@ hassil home-assistant-intents ]; + "cookidoo" = + ps: with ps; [ + ]; # missing inputs: cookidoo-api "coolmaster" = ps: with ps; [ pycoolmasternet-async @@ -1030,6 +1038,7 @@ bluetooth-auto-recovery bluetooth-data-tools cached-ipaddress + cronsim dbus-fast fnv-hash-fast go2rtc-client @@ -1238,9 +1247,6 @@ aiohasupervisor paho-mqtt_1 ]; - "dte_energy_bridge" = - ps: with ps; [ - ]; "dublin_bus_transport" = ps: with ps; [ ]; @@ -1275,10 +1281,12 @@ "dynalite" = ps: with ps; [ aiohasupervisor + cronsim dynalite-devices dynalite-panel home-assistant-frontend pillow + securetar ]; "eafm" = ps: with ps; [ @@ -1345,6 +1353,9 @@ ps: with ps; [ pythonegardia ]; + "eheimdigital" = + ps: with ps; [ + ]; # missing inputs: eheimdigital "eight_sleep" = ps: with ps; [ ]; @@ -1817,8 +1828,10 @@ "frontend" = ps: with ps; [ aiohasupervisor + cronsim home-assistant-frontend pillow + securetar ]; "frontier_silicon" = ps: with ps; [ @@ -1891,7 +1904,9 @@ "generic" = ps: with ps; [ av + numpy pillow + pyturbojpeg ]; "generic_hygrostat" = ps: with ps; [ @@ -2126,6 +2141,9 @@ ps: with ps; [ aioharmony ]; + "harvey" = + ps: with ps; [ + ]; "hassio" = ps: with ps; [ aiohasupervisor @@ -2598,12 +2616,14 @@ "insteon" = ps: with ps; [ aiohasupervisor + cronsim home-assistant-frontend insteon-frontend-home-assistant pillow pyinsteon pyserial pyudev + securetar ]; "integration" = ps: with ps; [ @@ -2656,7 +2676,6 @@ "iron_os" = ps: with ps; [ aioesphomeapi - aiogithubapi aioruuvigateway aioshelly bleak @@ -2719,6 +2738,10 @@ "itunes" = ps: with ps; [ ]; + "ituran" = + ps: with ps; [ + pyituran + ]; "izone" = ps: with ps; [ python-izone @@ -2857,9 +2880,11 @@ "knx" = ps: with ps; [ aiohasupervisor + cronsim home-assistant-frontend knx-frontend pillow + securetar xknx xknxproject ]; @@ -2955,10 +2980,12 @@ "lcn" = ps: with ps; [ aiohasupervisor + cronsim home-assistant-frontend lcn-frontend pillow pypck + securetar ]; "ld2410_ble" = ps: with ps; [ @@ -3118,8 +3145,7 @@ ]; "livisi" = ps: with ps; [ - aiolivisi - ]; + ]; # missing inputs: livisi "llamalab_automate" = ps: with ps; [ ]; @@ -3147,10 +3173,12 @@ "logbook" = ps: with ps; [ aiohasupervisor + cronsim fnv-hash-fast home-assistant-frontend pillow psutil-home-assistant + securetar sqlalchemy ]; "logentries" = @@ -3172,6 +3200,7 @@ "loqed" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -3182,6 +3211,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "lovelace" = ps: with ps; [ @@ -3463,6 +3493,7 @@ "mobile_app" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -3474,6 +3505,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "mochad" = ps: with ps; [ @@ -3627,8 +3659,10 @@ "my" = ps: with ps; [ aiohasupervisor + cronsim home-assistant-frontend pillow + securetar ]; "myq" = ps: with ps; [ @@ -3690,6 +3724,7 @@ "netatmo" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -3700,6 +3735,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "netdata" = ps: with ps; [ @@ -3760,8 +3796,7 @@ ]; "niko_home_control" = ps: with ps; [ - niko-home-control - ]; + ]; # missing inputs: nhc "nilu" = ps: with ps; [ niluclient @@ -3878,6 +3913,9 @@ ps: with ps; [ defusedxml ]; + "ohme" = + ps: with ps; [ + ]; # missing inputs: ohme "ollama" = ps: with ps; [ ha-ffmpeg @@ -4070,6 +4108,7 @@ "owntracks" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -4081,6 +4120,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "p1_monitor" = ps: with ps; [ @@ -4105,12 +4145,17 @@ "panel_custom" = ps: with ps; [ aiohasupervisor + cronsim home-assistant-frontend pillow + securetar ]; "pcs_lighting" = ps: with ps; [ ]; + "peblar" = + ps: with ps; [ + ]; # missing inputs: peblar "peco" = ps: with ps; [ peco @@ -4180,6 +4225,7 @@ "plaato" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -4190,6 +4236,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "plant" = ps: with ps; [ @@ -4225,6 +4272,9 @@ "portlandgeneral" = ps: with ps; [ ]; + "powerfox" = + ps: with ps; [ + ]; # missing inputs: powerfox "powerwall" = ps: with ps; [ tesla-powerwall @@ -4414,6 +4464,7 @@ "rachio" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -4424,6 +4475,7 @@ python-matter-server pyturbojpeg rachiopy + securetar ]; "radarr" = ps: with ps; [ @@ -4518,6 +4570,7 @@ "recovery_mode" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -4529,6 +4582,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "recswitch" = ps: with ps; [ @@ -4999,9 +5053,6 @@ "simu" = ps: with ps; [ ]; - "simulated" = - ps: with ps; [ - ]; "sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms @@ -5044,6 +5095,10 @@ ps: with ps; [ goslide-api ]; + "slide_local" = + ps: with ps; [ + goslide-api + ]; "slimproto" = ps: with ps; [ aioslimproto @@ -5072,6 +5127,7 @@ "smartthings" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -5083,6 +5139,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "smarttub" = ps: with ps; [ @@ -5281,10 +5338,6 @@ ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron - "stookalert" = - ps: with ps; [ - stookalert - ]; "stookwijzer" = ps: with ps; [ stookwijzer @@ -5697,6 +5750,7 @@ "toon" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -5706,6 +5760,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar toonapi ]; "torque" = @@ -5726,8 +5781,12 @@ ps: with ps; [ + av + ha-ffmpeg ifaddr + numpy python-kasa + pyturbojpeg ] ++ python-kasa.optional-dependencies.speedups; "tplink_lte" = @@ -6064,6 +6123,9 @@ ps: with ps; [ waterfurnace ]; + "watergate" = + ps: with ps; [ + ]; # missing inputs: watergate-local-api "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf @@ -6138,6 +6200,7 @@ ps: with ps; [ aiohasupervisor aiowithings + cronsim ha-ffmpeg hass-nabucasa hassil @@ -6147,6 +6210,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "wiz" = ps: with ps; [ @@ -6259,6 +6323,7 @@ "yale" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -6268,6 +6333,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar yalexs yalexs-ble ]; @@ -6353,7 +6419,7 @@ ]; "zabbix" = ps: with ps; [ - py-zabbix + zabbix-utils ]; "zamg" = ps: with ps; [ @@ -6589,7 +6655,6 @@ "drop_connect" "dsmr" "dsmr_reader" - "dte_energy_bridge" "duckdns" "duke_energy" "dunehd" @@ -6803,6 +6868,7 @@ "israel_rail" "ista_ecotrend" "isy994" + "ituran" "izone" "jellyfin" "jewish_calendar" @@ -6846,7 +6912,6 @@ "linkplay" "litejet" "litterrobot" - "livisi" "local_calendar" "local_file" "local_ip" @@ -7108,12 +7173,12 @@ "simplefin" "simplepush" "simplisafe" - "simulated" "siren" "sky_remote" "skybell" "slack" "sleepiq" + "slide_local" "slimproto" "sma" "smappee" @@ -7152,7 +7217,6 @@ "statsd" "steam_online" "steamist" - "stookalert" "stookwijzer" "stream" "streamlabswater" diff --git a/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix b/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix index 4cc44ef19db0..095fd4b5cd8c 100644 --- a/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix +++ b/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "sanjoyg"; domain = "dirigera_platform"; - version = "2.6.4"; + version = "2.6.6"; src = fetchFromGitHub { owner = "sanjoyg"; repo = "dirigera_platform"; rev = version; - hash = "sha256-ftJUmJ5UWgm22YBfCIBAxRjG+niougw5ekrQNuSRgzI="; + hash = "sha256-OoTmEVjo6pzFQ5uoZOcmpOhVUoM2DM8HBAvJA58zjAU="; }; postPatch = '' @@ -24,6 +24,8 @@ buildHomeAssistantComponent rec { dependencies = [ dirigera ]; + ignoreVersionRequirement = [ "dirigera" ]; + meta = with lib; { description = "Home-assistant integration for IKEA Dirigera hub"; homepage = "https://github.com/sanjoyg/dirigera_platform"; diff --git a/pkgs/servers/home-assistant/custom-components/mass/package.nix b/pkgs/servers/home-assistant/custom-components/mass/package.nix deleted file mode 100644 index 7ea860769956..000000000000 --- a/pkgs/servers/home-assistant/custom-components/mass/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - buildHomeAssistantComponent, - fetchFromGitHub, - toPythonModule, - async-timeout, - music-assistant, - pytestCheckHook, - pytest-asyncio, - pytest-cov-stub, - pytest-homeassistant-custom-component, -}: - -buildHomeAssistantComponent rec { - owner = "music-assistant"; - domain = "mass"; - version = "2024.9.1"; - - src = fetchFromGitHub { - owner = "music-assistant"; - repo = "hass-music-assistant"; - rev = version; - hash = "sha256-8YZ77SYv8hDsbKUjxPZnuAycLE8RkIbAq3HXk+OyAmM="; - }; - - dependencies = [ - async-timeout - (toPythonModule music-assistant) - ]; - - dontCheckManifest = true; # expects music-assistant 2.0.6, we have 2.0.7 - - nativeCheckInputs = [ - pytestCheckHook - pytest-asyncio - pytest-cov-stub - pytest-homeassistant-custom-component - ]; - - meta = with lib; { - description = "Turn your Home Assistant instance into a jukebox, hassle free streaming of your favorite media to Home Assistant media players"; - homepage = "https://github.com/music-assistant/hass-music-assistant"; - license = licenses.asl20; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f8b3d3f88bfd..7005a41f5cfc 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -4,7 +4,7 @@ callPackage, fetchFromGitHub, fetchPypi, - python312, + python313, substituteAll, ffmpeg-headless, inetutils, @@ -45,21 +45,6 @@ let ]; }); - aiopurpleair = super.aiopurpleair.overridePythonAttrs (oldAttrs: rec { - version = "2022.12.1"; - src = fetchFromGitHub { - owner = "bachya"; - repo = "aiopurpleair"; - rev = "refs/tags/${version}"; - hash = "sha256-YmJH4brWkTpgzyHwu9UnIWrY5qlDCmMtvF+KxQFXwfk="; - }; - postPatch = '' - substituteInPlace pyproject.toml --replace-fail \ - '"setuptools >= 35.0.2", "wheel >= 0.29.0", "poetry>=0.12"' \ - '"poetry-core"' - ''; - }); - aioskybell = super.aioskybell.overridePythonAttrs (oldAttrs: rec { version = "22.7.0"; src = fetchFromGitHub { @@ -115,24 +100,6 @@ let ]; }); - inline-snapshot = super.inline-snapshot.overridePythonAttrs (oldAttrs: { - disabledTests = oldAttrs.disabledTests or [ ] ++ [ - # fixture does not expect pydantic<2 - "test_pydantic_repr" - ]; - }); - - ollama = super.ollama.overridePythonAttrs (oldAttrs: rec { - version = "0.3.3"; - src = fetchFromGitHub { - owner = "ollama"; - repo = "ollama-python"; - tag = "v${version}"; - hash = "sha256-27OJwPvHBxCdaiHk8EQ2s1OeBzgsrzp1MjgKHNgvz+A="; - }; - dependencies = with self; [ httpx ]; - }); - openhomedevice = super.openhomedevice.overridePythonAttrs (oldAttrs: rec { version = "2.2"; src = fetchFromGitHub { @@ -195,18 +162,6 @@ let }; }); - pyaussiebb = super.pyaussiebb.overridePythonAttrs (oldAttrs: rec { - version = "0.0.18"; - src = fetchFromGitHub { - owner = "yaleman"; - repo = "aussiebb"; - rev = "refs/tags/v${version}"; - hash = "sha256-tEdddVsLFCHRvyLCctDakioiop2xWaJlfGE16P1ukHc="; - }; - }); - - pydantic = super.pydantic_1; - pydexcom = super.pydexcom.overridePythonAttrs (oldAttrs: rec { version = "0.2.3"; src = fetchFromGitHub { @@ -239,30 +194,6 @@ let }; }); - pylamarzocco = super.pylamarzocco.overridePythonAttrs (oldAttrs: rec { - version = "1.2.12"; - src = fetchFromGitHub { - owner = "zweckj"; - repo = "pylamarzocco"; - tag = "v${version}"; - hash = "sha256-h3Oh1y1tirOWh3I8piybLZfTKwyGk0zJJ6XmHvmbUW0="; - }; - dependencies = with self; [ - bleak - httpx - websockets - ]; - }); - - pymodbus = super.pymodbus.overridePythonAttrs (oldAttrs: rec { - version = "3.6.9"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-ScqxDO0hif8p3C6+vvm7FgSEQjCXBwUPOc7Y/3OfkoI="; - }; - }); - pyoctoprintapi = super.pyoctoprintapi.overridePythonAttrs (oldAttrs: rec { version = "0.1.12"; src = fetchFromGitHub { @@ -283,16 +214,6 @@ let }; }); - # newer versions require pydantic>=2 - python-on-whales = super.python-on-whales.overridePythonAttrs (oldAttrs: rec { - version = "0.72.0"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-oKI7zXfoUVmJXLQvyoDEmoCL4AwaYgaFcLKNlFFrC9o="; - }; - }); - pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { version = "9.0.1"; src = fetchFromGitHub { @@ -303,45 +224,6 @@ let }; }); - # newer sigstore version transitivevly require pydantic>=2 - sigstore = super.sigstore.overridePythonAttrs (oldAttrs: rec { - version = "1.1.2"; - src = fetchFromGitHub { - owner = "sigstore"; - repo = "sigstore-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-QqY5GOBS75OkbSaF5Ua5jnJAhsYfVRuWLUoWDxX8Ino="; - }; - dependencies = with self; [ - appdirs - cryptography - id - pydantic - pyjwt - pyopenssl - requests - securesystemslib - sigstore-protobuf-specs - tuf - ]; - doCheck = false; # pytest too new - }); - - sigstore-protobuf-specs = super.sigstore-protobuf-specs.overridePythonAttrs { - version = "0.1.0"; - src = fetchPypi { - pname = "sigstore-protobuf-specs"; - version = "0.1.0"; - hash = "sha256-YistIxYToo7T5mYKzYeBhnW06DSG9JoPDBmKxUdfy4E="; - }; - nativeBuildInputs = with self; [ - flit-core - ]; - pythonRelaxDeps = [ - "betterproto" - ]; - }; - slack-sdk = super.slack-sdk.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; src = fetchFromGitHub { @@ -358,31 +240,6 @@ let doCheck = false; # Tests changed a lot for > 3 }); - # pinned for sigstore - tuf = super.tuf.overridePythonAttrs rec { - version = "2.1.0"; - src = fetchFromGitHub { - owner = "theupdateframework"; - repo = "python-tuf"; - rev = "refs/tags/v${version}"; - hash = "sha256-MdPctAZuKn/YAwpMJ5gWU7PXJD3iK7bYprLXV52wNQQ="; - }; - disabledTests = [ - "test_sign_failures" - ]; - }; - - voip-utils = super.voip-utils.overridePythonAttrs (oldAttrs: rec { - version = "0.1.0"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-PG4L6KphH9JIZO76cCN8eClFE2CneEIExlXS+x79k3U="; - }; - # tests were not implemented until version 0.2.0 - doCheck = false; - }); - vulcan-api = super.vulcan-api.overridePythonAttrs (oldAttrs: rec { version = "2.3.2"; src = fetchFromGitHub { @@ -403,36 +260,6 @@ let }; }); - xbox-webapi = super.xbox-webapi.overridePythonAttrs (oldAttrs: rec { - version = "2.0.11"; - src = fetchFromGitHub { - owner = "OpenXbox"; - repo = "xbox-webapi-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-fzMB+I8+ZTJUiZovcuj+d5GdHY9BJyJd6j92EhJeIFI="; - }; - postPatch = '' - sed -i '/pytest-runner/d' setup.py - ''; - propagatedBuildInputs = with self; [ - aiohttp - appdirs - ms-cv - pydantic - ecdsa - ]; - nativeCheckInputs = with self; [ - aresponses - ]; - }); - - youtubeaio = super.youtubeaio.overridePythonAttrs (old: { - pytestFlagsArray = [ - # fails with pydantic v1 - "--deselect=tests/test_video.py::test_fetch_video" - ]; - }); - # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; @@ -443,7 +270,7 @@ let }) ]; - python = python312.override { + python = python313.override { self = python; packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); }; @@ -462,7 +289,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.12.5"; + hassVersion = "2025.1.0"; in python.pkgs.buildPythonApplication rec { @@ -483,13 +310,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-LJgwtVQvO1iUPYfzAsE6l9u4+EIzAnc3IJ5FZb3xniM="; + hash = "sha256-tkjOWJ29fvWzto3y6zV8h8yPIGyhC5sBIL5koOsw5i0="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-PfedigJWHLv2BqHOgVedDyJxxxSmdHe2CvPNYCWi6aA="; + hash = "sha256-xaHD93crz4wm3CwX5d/UxeuOQ769G+ZnA26iE7y7hU4="; }; build-system = with python.pkgs; [ @@ -533,8 +360,6 @@ python.pkgs.buildPythonApplication rec { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getExe ffmpeg-headless}"; }) - - ./patches/watchdog5-compat.patch ]; postPatch = '' @@ -555,10 +380,12 @@ python.pkgs.buildPythonApplication rec { async-interrupt atomicwrites-homeassistant attrs + audioop-lts awesomeversion bcrypt certifi ciso8601 + cronsim cryptography fnv-hash-fast hass-nabucasa @@ -579,6 +406,8 @@ python.pkgs.buildPythonApplication rec { requests securetar sqlalchemy + standard-aifc + standard-telnetlib typing-extensions ulid-transform urllib3 diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index ab8fbd714311..3551e61b0826 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20241127.8"; + version = "20250103.0"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-6VQ5IgAsPMzHlBe20EinjByGC2AzUY5mYFVHBvIdR0E="; + hash = "sha256-i+XOHFGL7UVxL+bNohhi+8pF1kZ5oOY5EpZHR3NbwL4="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 1acce31705b2..af4f2a7c32fb 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.12.9"; + version = "2025.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { repo = "intents-package"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-tjJLm3SCSKy2PWahzpEOHz1PgD1VNuxxpszhBWPrcOw="; + hash = "sha256-OeGupmeZ2KLpQHc0d50itTvlrA5XziKU8cAz9i6ztSw="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/patches/watchdog5-compat.patch b/pkgs/servers/home-assistant/patches/watchdog5-compat.patch deleted file mode 100644 index d4e27769579b..000000000000 --- a/pkgs/servers/home-assistant/patches/watchdog5-compat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/homeassistant/components/folder_watcher/__init__.py b/homeassistant/components/folder_watcher/__init__.py -index 3aeaa6f7ef2..f5c2db513b7 100644 ---- a/homeassistant/components/folder_watcher/__init__.py -+++ b/homeassistant/components/folder_watcher/__init__.py -@@ -68,7 +68,7 @@ class EventHandler(PatternMatchingEventHandler): - - def __init__(self, patterns: list[str], hass: HomeAssistant, entry_id: str) -> None: - """Initialise the EventHandler.""" -- super().__init__(patterns) -+ super().__init__(patterns=patterns) - self.hass = hass - self.entry_id = entry_id - diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 167b0e023c04..23c821a49738 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.191"; + version = "0.13.200"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-Fm7Sg5u5rkCQFGHnOWimRM4X0EB4xGwY59gdgA1ZFBA="; + hash = "sha256-aZeC003EGa8qBR+sN3EK1EbbwLZqdzNf1bjTQyQ6l9I="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 9808895b74fa..85796e4b15c5 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.12.5"; + version = "2025.1.0"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-ixDHGcs2Cvf6tIxYnn4j9Qs8MkmB1PGgIKnEN676Qs0="; + hash = "sha256-qKmHQrciezgGPHNNGy7lDM9LaCXJO/DuYIrk8qjWpDQ="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 68301faf35ec..6efd2c5195f7 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -113,9 +113,6 @@ def parse_components(version: str = "master"): specific_integrations=None, action="generate", requirements=False, - core_integrations_path=pathlib.Path( - os.path.join(core_path, "homeassistant/components") - ), ) integrations = Integration.load_dir(config.core_integrations_path, config) for domain in sorted(integrations): diff --git a/pkgs/servers/home-assistant/update.py b/pkgs/servers/home-assistant/update.py index 70eb77ce9a1c..c75bbc432aa3 100755 --- a/pkgs/servers/home-assistant/update.py +++ b/pkgs/servers/home-assistant/update.py @@ -1,6 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=channel:nixpkgs-unstable -i python3 -p "python3.withPackages (ps: with ps; [ aiohttp packaging ])" -p git nurl pyright ruff isort +import argparse import asyncio import json import os @@ -226,7 +227,7 @@ class HomeAssistant: ]) -async def main(): +async def main(target_version: Optional[str] = None): headers = {} if token := os.environ.get("GITHUB_TOKEN", None): headers.update({"GITHUB_TOKEN": token}) @@ -235,7 +236,7 @@ async def main(): hass = HomeAssistant(client) core_current = str(await Nix.eval("home-assistant.version")) - core_latest = await hass.get_latest_core_version() + core_latest = target_version or await hass.get_latest_core_version() if Version(core_latest) > Version(core_current): print(f"New Home Assistant version {core_latest} is available") @@ -257,7 +258,12 @@ async def main(): await asyncio.sleep(0) if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("version", nargs="?") + args = parser.parse_args() + run_sync(["pyright", __file__]) run_sync(["ruff", "check", "--ignore=E501", __file__]) run_sync(["isort", __file__]) - asyncio.run(main()) + + asyncio.run(main(args.version)) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9dcb43958cd0..abac140b6209 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15513,6 +15513,12 @@ self: super: with self; { stm32loader = callPackage ../development/python-modules/stm32loader { }; + standard-aifc = callPackage ../development/python-modules/standard-aifc { }; + + standard-chunk = callPackage ../development/python-modules/standard-chunk { }; + + standard-telnetlib = callPackage ../development/python-modules/standard-telnetlib { }; + stone = callPackage ../development/python-modules/stone { }; stookalert = callPackage ../development/python-modules/stookalert { };