diff --git a/.github/actions/get-merge-commit/action.yml b/.github/actions/get-merge-commit/action.yml index 1505d582efd8..a16d289cc6e0 100644 --- a/.github/actions/get-merge-commit/action.yml +++ b/.github/actions/get-merge-commit/action.yml @@ -1,23 +1,31 @@ name: Get merge commit -description: 'Checks whether the Pull Request is mergeable and returns two commit hashes: The result of a temporary merge of the head branch into the target branch ("merged"), and the parent of that commit on the target branch ("target"). Handles push events and merge conflicts gracefully.' +description: 'Checks whether the Pull Request is mergeable and checks out the repo at up to two commits: The result of a temporary merge of the head branch into the target branch ("merged"), and the parent of that commit on the target branch ("target"). Handles push events and merge conflicts gracefully.' + +inputs: + merged-as-untrusted: + description: "Whether to checkout the merge commit in the ./untrusted folder." + type: boolean + target-as-trusted: + description: "Whether to checkout the target commit in the ./trusted folder." + type: boolean outputs: mergedSha: description: "The merge commit SHA" - value: ${{ fromJSON(steps.merged.outputs.result).mergedSha }} + value: ${{ steps.commits.outputs.mergedSha }} targetSha: description: "The target commit SHA" - value: ${{ fromJSON(steps.merged.outputs.result).targetSha }} + value: ${{ steps.commits.outputs.targetSha }} runs: using: composite steps: - - id: merged + - id: commits uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 with: script: | - if (context.eventName == 'push') return { mergedSha: context.sha } + if (context.eventName == 'push') return core.setOutput('mergedSha', context.sha) for (const retryInterval of [5, 10, 20, 40, 80]) { console.log("Checking whether the pull request can be merged...") @@ -35,32 +43,46 @@ runs: continue } + let mergedSha, targetSha + if (prInfo.mergeable) { console.log("The PR can be merged.") - const mergedSha = prInfo.merge_commit_sha - const targetSha = (await github.rest.repos.getCommit({ + mergedSha = prInfo.merge_commit_sha + targetSha = (await github.rest.repos.getCommit({ owner: context.repo.owner, repo: context.repo.repo, ref: prInfo.merge_commit_sha })).data.parents[0].sha - - console.log(`Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`) - - return { mergedSha, targetSha } } else { console.log("The PR has a merge conflict.") - const mergedSha = prInfo.head.sha - const targetSha = (await github.rest.repos.compareCommitsWithBasehead({ + mergedSha = prInfo.head.sha + targetSha = (await github.rest.repos.compareCommitsWithBasehead({ owner: context.repo.owner, repo: context.repo.repo, basehead: `${prInfo.base.sha}...${prInfo.head.sha}` })).data.merge_base_commit.sha - - console.log(`Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`) - - return { mergedSha, targetSha } } + + console.log(`Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`) + core.setOutput('mergedSha', mergedSha) + core.setOutput('targetSha', targetSha) + return } throw new Error("Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.") + + # Would be great to do the checkouts in git worktrees of the existing spare checkout instead, + # but Nix is broken with them: + # https://github.com/NixOS/nix/issues/6073 + - if: inputs.merged-as-untrusted && steps.commits.outputs.mergedSha + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + ref: ${{ steps.commits.outputs.mergedSha }} + path: untrusted + + - if: inputs.target-as-trusted && steps.commits.outputs.targetSha + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + ref: ${{ steps.commits.outputs.targetSha }} + path: trusted diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml index 70dfdfba1e5f..e85fa59bb699 100644 --- a/.github/workflows/check-cherry-picks.yml +++ b/.github/workflows/check-cherry-picks.yml @@ -21,10 +21,11 @@ jobs: with: fetch-depth: 0 filter: blob:none + path: trusted - name: Check cherry-picks env: BASE_SHA: ${{ github.event.pull_request.base.sha }} HEAD_SHA: ${{ github.event.pull_request.head.sha }} run: | - ./maintainers/scripts/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA" + ./trusted/maintainers/scripts/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA" diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml index 58c76f97da6b..4216c6bd1c70 100644 --- a/.github/workflows/check-format.yml +++ b/.github/workflows/check-format.yml @@ -16,13 +16,10 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: sparse-checkout: .github/actions - - name: Check if the PR can be merged and get the test merge commit + - name: Check if the PR can be merged and checkout the merge commit uses: ./.github/actions/get-merge-commit - id: get-merge-commit - - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - ref: ${{ steps.get-merge-commit.outputs.mergedSha }} + merged-as-untrusted: true - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 with: @@ -33,7 +30,7 @@ jobs: # Note that it's fine to run this on untrusted code because: # - There's no secrets accessible here # - The build is sandboxed - if ! nix-build ci -A fmt.check; then + if ! nix-build untrusted/ci -A fmt.check; then echo "Some files are not properly formatted" echo "Please format them by going to the Nixpkgs root directory and running one of:" echo " nix-shell --run treefmt" diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml index 01dd64913b6a..014b60a492fa 100644 --- a/.github/workflows/check-shell.yml +++ b/.github/workflows/check-shell.yml @@ -33,15 +33,12 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: sparse-checkout: .github/actions - - name: Check if the PR can be merged and get the test merge commit + - name: Check if the PR can be merged and checkout the merge commit uses: ./.github/actions/get-merge-commit - id: get-merge-commit - - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - ref: ${{ steps.get-merge-commit.outputs.mergedSha }} + merged-as-untrusted: true - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 - name: Build shell - run: nix-build ci -A shell + run: nix-build untrusted/ci -A shell diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index e22ccfcea52d..e858615c0828 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -46,9 +46,11 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: sparse-checkout: .github/actions - - name: Check if the PR can be merged and get the test merge commit + - name: Check if the PR can be merged and checkout the merge and target commits uses: ./.github/actions/get-merge-commit - id: get-merge-commit + with: + merged-as-untrusted: true + target-as-trusted: true - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 @@ -58,15 +60,8 @@ jobs: name: nixpkgs-ci authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR itself. - # We later build and run code from the base branch with access to secrets, - # so it's important this is not the PRs code. - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - path: base - - name: Build codeowners validator - run: nix-build base/ci -A codeownersValidator + run: nix-build trusted/ci -A codeownersValidator - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 if: vars.OWNER_RO_APP_ID @@ -77,17 +72,12 @@ jobs: permission-administration: read permission-members: read - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ steps.get-merge-commit.outputs.mergedSha }} - path: pr - - name: Validate codeowners if: steps.app-token.outputs.token env: - OWNERS_FILE: pr/${{ env.OWNERS_FILE }} + OWNERS_FILE: untrusted/${{ env.OWNERS_FILE }} GITHUB_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }} - REPOSITORY_PATH: pr + REPOSITORY_PATH: untrusted OWNER_CHECKER_REPOSITORY: ${{ github.repository }} # Set this to "notowned,avoid-shadowing" to check that all files are owned by somebody EXPERIMENTAL_CHECKS: "avoid-shadowing" @@ -104,6 +94,8 @@ jobs: # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR head. # This is intentional, because we need to request the review of owners as declared in the base branch. - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + path: trusted - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 if: vars.OWNER_APP_ID @@ -116,7 +108,7 @@ jobs: permission-pull-requests: write - name: Build review request package - run: nix-build ci -A requestReviews + run: nix-build trusted/ci -A requestReviews - name: Request reviews if: steps.app-token.outputs.token diff --git a/.github/workflows/eval-aliases.yml b/.github/workflows/eval-aliases.yml index 941ffd378ef7..892dfe79907b 100644 --- a/.github/workflows/eval-aliases.yml +++ b/.github/workflows/eval-aliases.yml @@ -16,15 +16,10 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: sparse-checkout: .github/actions - - name: Check if the PR can be merged and get the test merge commit + - name: Check if the PR can be merged and checkout the merge commit uses: ./.github/actions/get-merge-commit - id: get-merge-commit - - - name: Check out the PR at the test merge commit - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - ref: ${{ steps.get-merge-commit.outputs.mergedSha }} - path: nixpkgs + merged-as-untrusted: true - name: Install Nix uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 @@ -32,8 +27,8 @@ jobs: extra_nix_config: sandbox = true - name: Ensure flake outputs on all systems still evaluate - run: nix flake check --all-systems --no-build ./nixpkgs + run: nix flake check --all-systems --no-build ./untrusted - name: Query nixpkgs with aliases enabled to check for basic syntax errors run: | - time nix-env -I ./nixpkgs -f ./nixpkgs -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null + time nix-env -I ./untrusted -f ./untrusted -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index bec9c23de6a0..0063ad1a12e9 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -61,7 +61,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: ref: ${{ needs.prepare.outputs.mergedSha }} - path: nixpkgs + path: untrusted - name: Install Nix uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 @@ -72,7 +72,7 @@ jobs: env: MATRIX_SYSTEM: ${{ matrix.system }} run: | - nix-build nixpkgs/ci -A eval.singleSystem \ + nix-build untrusted/ci -A eval.singleSystem \ --argstr evalSystem "$MATRIX_SYSTEM" \ --arg chunkSize 10000 # If it uses too much memory, slightly decrease chunkSize @@ -101,8 +101,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: ref: ${{ needs.prepare.outputs.mergedSha }} - fetch-depth: 2 - path: nixpkgs + path: untrusted - name: Install Nix uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 @@ -111,7 +110,7 @@ jobs: - name: Combine all output paths and eval stats run: | - nix-build nixpkgs/ci -A eval.combine \ + nix-build untrusted/ci -A eval.combine \ --arg resultsDir ./intermediate \ -o prResult @@ -168,12 +167,13 @@ jobs: env: AUTHOR_ID: ${{ github.event.pull_request.user.id }} run: | - git -C nixpkgs worktree add ../target ${{ needs.prepare.outputs.targetSha }} - git -C nixpkgs diff --name-only ${{ needs.prepare.outputs.targetSha }} \ + git -C untrusted fetch --depth 1 origin ${{ needs.prepare.outputs.targetSha }} + git -C untrusted worktree add ../trusted ${{ needs.prepare.outputs.targetSha }} + git -C untrusted diff --name-only ${{ needs.prepare.outputs.targetSha }} \ | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json # Use the target branch to get accurate maintainer info - nix-build target/ci -A eval.compare \ + nix-build trusted/ci -A eval.compare \ --arg beforeResultDir ./targetResult \ --arg afterResultDir "$(realpath prResult)" \ --arg touchedFilesJson ./touched-files.json \ @@ -222,15 +222,15 @@ jobs: # Important: This workflow job runs with extra permissions, # so we need to make sure to not run untrusted code from PRs - - name: Check out Nixpkgs at the base commit + - name: Check out Nixpkgs at the target commit uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: ref: ${{ needs.prepare.outputs.targetSha }} - path: base + path: trusted sparse-checkout: ci - name: Build the requestReviews derivation - run: nix-build base/ci -A requestReviews + run: nix-build trusted/ci -A requestReviews - name: Labelling pull request if: ${{ github.event_name == 'pull_request_target' && github.repository_owner == 'NixOS' }} diff --git a/.github/workflows/lib-tests.yml b/.github/workflows/lib-tests.yml index 345d59bb9cc4..c147d0084123 100644 --- a/.github/workflows/lib-tests.yml +++ b/.github/workflows/lib-tests.yml @@ -19,13 +19,10 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: sparse-checkout: .github/actions - - name: Check if the PR can be merged and get the test merge commit + - name: Check if the PR can be merged and checkout the merge commit uses: ./.github/actions/get-merge-commit - id: get-merge-commit - - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - ref: ${{ steps.get-merge-commit.outputs.mergedSha }} + merged-as-untrusted: true - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 with: @@ -33,4 +30,4 @@ jobs: - name: Building Nixpkgs lib-tests run: | - nix-build ci -A lib-tests + nix-build untrusted/ci -A lib-tests diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml index 5d5acdd377e7..653a5a92fbfd 100644 --- a/.github/workflows/manual-nixos-v2.yml +++ b/.github/workflows/manual-nixos-v2.yml @@ -35,13 +35,10 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: sparse-checkout: .github/actions - - name: Check if the PR can be merged and get the test merge commit + - name: Check if the PR can be merged and checkout the merge commit uses: ./.github/actions/get-merge-commit - id: get-merge-commit - - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - ref: ${{ steps.get-merge-commit.outputs.mergedSha }} + merged-as-untrusted: true - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 with: @@ -55,7 +52,7 @@ jobs: - name: Build NixOS manual id: build-manual - run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true ci -A manual-nixos --argstr system ${{ matrix.system }} + run: NIX_PATH=nixpkgs=$(pwd)/untrusted nix-build --option restrict-eval true untrusted/ci -A manual-nixos --argstr system ${{ matrix.system }} - name: Upload NixOS manual uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml index b31a6b4949e1..13949dd3c36e 100644 --- a/.github/workflows/manual-nixpkgs-v2.yml +++ b/.github/workflows/manual-nixpkgs-v2.yml @@ -22,13 +22,10 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: sparse-checkout: .github/actions - - name: Check if the PR can be merged and get the test merge commit + - name: Check if the PR can be merged and checkout the merge commit uses: ./.github/actions/get-merge-commit - id: get-merge-commit - - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - ref: ${{ steps.get-merge-commit.outputs.mergedSha }} + merged-as-untrusted: true - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 with: @@ -41,4 +38,4 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Building Nixpkgs manual - run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true ci -A manual-nixpkgs -A manual-nixpkgs-tests + run: NIX_PATH=nixpkgs=$(pwd)/untrusted nix-build --option restrict-eval true untrusted/ci -A manual-nixpkgs -A manual-nixpkgs-tests diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml index 6ae66e964474..f75a46957f5a 100644 --- a/.github/workflows/nix-parse-v2.yml +++ b/.github/workflows/nix-parse-v2.yml @@ -17,13 +17,10 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: sparse-checkout: .github/actions - - name: Check if the PR can be merged and get the test merge commit + - name: Check if the PR can be merged and checkout the merge commit uses: ./.github/actions/get-merge-commit - id: get-merge-commit - - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - ref: ${{ steps.get-merge-commit.outputs.mergedSha }} + merged-as-untrusted: true - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 with: @@ -33,4 +30,4 @@ jobs: - name: Parse all nix files run: | # Tests multiple versions at once, let's make sure all of them run, so keep-going. - nix-build ci -A parse --keep-going + nix-build untrusted/ci -A parse --keep-going diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml index 761ecbf08f2f..e4fd7aa06c92 100644 --- a/.github/workflows/nixpkgs-vet.yml +++ b/.github/workflows/nixpkgs-vet.yml @@ -19,51 +19,27 @@ permissions: {} 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-24.04 + runs-on: ubuntu-24.04-arm # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long. timeout-minutes: 10 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: sparse-checkout: .github/actions - - name: Check if the PR can be merged and get the test merge commit + - name: Check if the PR can be merged and checkout merged and target commits uses: ./.github/actions/get-merge-commit - id: get-merge-commit - - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - ref: ${{ steps.get-merge-commit.outputs.mergedSha }} - # Fetches the merge commit and its parents - fetch-depth: 2 - - - name: Checking out target branch - run: | - target=$(mktemp -d) - git worktree add "$target" "$(git rev-parse HEAD^1)" - echo "target=$target" >> "$GITHUB_ENV" + merged-as-untrusted: true + target-as-trusted: true - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 - - name: Fetching the pinned tool - # Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh - run: | - # The pinned version of the tooling to use. - toolVersion=$( main" as long this commit is the branch HEAD @@ -78,7 +78,7 @@ rustPlatform.buildRustPackage { }; useFetchCargoVendor = true; - cargoHash = "sha256-7PTrE2FA2cvOKU35qTYBr7cop65gWY+zSOVlDZiJdow="; + cargoHash = "sha256-XTtM7yU1kpzK2cspnYdgp7yrt4Xk7xeQ98rmBgu46Tg="; # set `HOME` to a temp dir for write access # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) diff --git a/pkgs/by-name/sm/smatch/package.nix b/pkgs/by-name/sm/smatch/package.nix index b373f462a365..fe6514e15d92 100644 --- a/pkgs/by-name/sm/smatch/package.nix +++ b/pkgs/by-name/sm/smatch/package.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkg-config ]; + patches = [ ./remove_const.patch ]; buildInputs = [ diff --git a/pkgs/by-name/sm/smatch/remove_const.patch b/pkgs/by-name/sm/smatch/remove_const.patch new file mode 100644 index 000000000000..6f2416d69187 --- /dev/null +++ b/pkgs/by-name/sm/smatch/remove_const.patch @@ -0,0 +1,32 @@ +diff --git a/smatch.h b/smatch.h +index 36ae3497..ceb1907c 100644 +--- a/smatch.h ++++ b/smatch.h +@@ -1375,7 +1375,7 @@ bool buf_comp_has_bytes(struct expression *buf, struct expression *var); + bool buf_comp2_has_bytes(struct expression *buf_expr, struct expression *var); + + /* smatch_untracked_param.c */ +-void mark_untracked(struct expression *expr, int param, const char *key, const char *value); ++void mark_untracked(struct expression *expr, int param, char *key, char *value); + void add_untracked_param_hook(void (func)(struct expression *call, int param)); + void add_lost_param_hook(void (func)(struct expression *call, int param)); + void mark_all_params_untracked(int return_id, char *return_ranges, struct expression *expr); +diff --git a/smatch_untracked_param.c b/smatch_untracked_param.c +index 4bb3c244..d24958e7 100644 +--- a/smatch_untracked_param.c ++++ b/smatch_untracked_param.c +@@ -120,12 +120,12 @@ free: + + } + +-void mark_untracked(struct expression *expr, int param, const char *key, const char *value) ++void mark_untracked(struct expression *expr, int param, char *key, char *value) + { + mark_untracked_lost(expr, param, key, UNTRACKED_PARAM); + } + +-void mark_lost(struct expression *expr, int param, const char *key, const char *value) ++void mark_lost(struct expression *expr, int param, char *key, char *value) + { + mark_untracked_lost(expr, param, key, LOST_PARAM); + } diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix index 120a480387e7..5f586cac6606 100644 --- a/pkgs/by-name/tf/tflint/package.nix +++ b/pkgs/by-name/tf/tflint/package.nix @@ -11,7 +11,7 @@ let pname = "tflint"; - version = "0.57.0"; + version = "0.58.0"; in buildGoModule { inherit pname version; @@ -20,10 +20,10 @@ buildGoModule { owner = "terraform-linters"; repo = pname; tag = "v${version}"; - hash = "sha256-mmrXP81CVyFObmzLveqZNwHbRTnDyKfoTPFlq1WyxxE="; + hash = "sha256-AaY2UghPvYveZ4xtUphPOnnoA6FcyO9Y2Uzz3bN8Q8I="; }; - vendorHash = "sha256-ljJnMAD+cvlq7NxrbrbE53+uPWknRqN5KD8SYqqjZ9w="; + vendorHash = "sha256-lmV23xDzBaMxV4MQeatX4sF0UwDZBlekdW21CMGtIqs="; doCheck = false; diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix index 5454d074713a..e31a44de573c 100644 --- a/pkgs/by-name/ti/tiledb/package.nix +++ b/pkgs/by-name/ti/tiledb/package.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.27.2"; + version = "2.28.0"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; tag = version; - hash = "sha256-zk4jkXJMh6wpuEKaCvuKUDod+F8B/6W5Lw8gwelcPEM="; + hash = "sha256-jNKnc8IPkXDxRUY9QJ+35qt2na1nO6RPeCVWBLb7lME="; }; patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./generate_embedded_data_header.patch ]; diff --git a/pkgs/by-name/to/touchegg/package.nix b/pkgs/by-name/to/touchegg/package.nix index 9612a91f01c5..ceb7da0e9b52 100644 --- a/pkgs/by-name/to/touchegg/package.nix +++ b/pkgs/by-name/to/touchegg/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "touchegg"; - version = "2.0.17"; + version = "2.0.18"; src = fetchFromGitHub { owner = "JoseExposito"; repo = "touchegg"; rev = version; - sha256 = "sha256-he6ERl6ZNWuD5StUqQWsUjeJ35nD0b8KddIAvntqlOI="; + sha256 = "sha256-7LJ5gD2e6e4edKDabqmsiXTdNKJ39557Q4sEGWF8H1U="; }; patches = lib.optionals withPantheon [ diff --git a/pkgs/by-name/tw/twitter-color-emoji/package.nix b/pkgs/by-name/tw/twitter-color-emoji/package.nix index 5ddcb8a7d613..ae999224b791 100644 --- a/pkgs/by-name/tw/twitter-color-emoji/package.nix +++ b/pkgs/by-name/tw/twitter-color-emoji/package.nix @@ -7,6 +7,7 @@ fetchFromGitHub, cairo, imagemagick, + nototools, pkg-config, pngquant, python3, @@ -25,14 +26,6 @@ let rev = "v${version}"; hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo="; }; - - pythonEnv = python3.withPackages ( - ps: with ps; [ - fonttools - nototools - ] - ); - in stdenv.mkDerivation rec { pname = "twitter-color-emoji"; @@ -52,10 +45,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cairo + python3.pkgs.fonttools imagemagick + nototools pkg-config pngquant - pythonEnv which zopfli ]; diff --git a/pkgs/by-name/un/unstructured-api/package.nix b/pkgs/by-name/un/unstructured-api/package.nix index adf9fa83dd96..ba94ad44bed4 100644 --- a/pkgs/by-name/un/unstructured-api/package.nix +++ b/pkgs/by-name/un/unstructured-api/package.nix @@ -5,8 +5,6 @@ python3, makeWrapper, nix-update-script, - symlinkJoin, - nltk-data, }: let pythonEnv = python3.withPackages ( @@ -147,14 +145,10 @@ let ++ unstructured.optional-dependencies.all-docs ); version = "0.0.82"; - unstructured_api_nltk_data = symlinkJoin { - name = "unstructured_api_nltk_data"; - - paths = [ - nltk-data.punkt - nltk-data.averaged-perceptron-tagger - ]; - }; + unstructured_api_nltk_data = python3.pkgs.nltk.dataDir (d: [ + d.punkt + d.averaged-perceptron-tagger + ]); in stdenvNoCC.mkDerivation { pname = "unstructured-api"; diff --git a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix index d83050188c99..cde77df69bcd 100644 --- a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix +++ b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix @@ -4,8 +4,8 @@ fetchFromGitHub, imagemagick, nix-update-script, + nototools, pngquant, - python3Packages, which, zopfli, }: @@ -29,8 +29,8 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ imagemagick + nototools pngquant - python3Packages.nototools which zopfli ]; diff --git a/pkgs/by-name/xt/xtf/package.nix b/pkgs/by-name/xt/xtf/package.nix index 6bcd5787901a..9bcf4cb8c823 100644 --- a/pkgs/by-name/xt/xtf/package.nix +++ b/pkgs/by-name/xt/xtf/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { pname = "xtf"; - version = "0-unstable-2024-11-01"; + version = "0-unstable-2025-05-19"; outputs = [ "out" # xtf-runner and test suite. @@ -20,8 +20,8 @@ stdenv.mkDerivation { src = fetchgit { url = "https://xenbits.xenproject.org/git-http/xtf.git"; - rev = "294532089d5251170abfd65a6620c8247cea729d"; - hash = "sha256-CQK7300nepZ3bNiHEJ5jrS9wkipr5JUbvtL5DNrULGI="; + rev = "419daf21e0685a1c9ca519bb744f4aadf992e007"; + hash = "sha256-yCBEUd+0c6D5InoO67p1Ip1bi8qpwPG9CKQtXN7pDIg="; }; nativeBuildInputs = diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index 2bb0d44e7c5e..2bc70110809f 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -2,10 +2,10 @@ lib, stdenv, fetchFromGitHub, - pnpm_9, - nodejs, + pnpm_10, + nodejs_24, makeWrapper, - pkgs, + prisma-engines, ffmpeg, openssl, vips, @@ -15,22 +15,6 @@ }: let - prisma-engines = pkgs.prisma-engines.overrideAttrs ( - finalAttrs: prevAttrs: { - version = "6.5.0"; - src = fetchFromGitHub { - inherit (prevAttrs.src) owner repo; - rev = finalAttrs.version; - hash = "sha256-m3LBIMIVMI5GlY0+QNw/nTlNWt2rGOZ28z+CfdP51cY="; - }; - cargoHash = "sha256-yG+omKAS1eWq3sFgKXMoZWhTP4M34dVRes7OhhTUyTQ="; - cargoDeps = pkgs.rustPlatform.fetchCargoVendor { - inherit (finalAttrs) pname version src; - hash = finalAttrs.cargoHash; - }; - } - ); - environment = { NEXT_TELEMETRY_DISABLED = "1"; FFMPEG_PATH = lib.getExe ffmpeg; @@ -45,25 +29,25 @@ in stdenv.mkDerivation (finalAttrs: { pname = "zipline"; - version = "4.0.2"; + version = "4.1.0"; src = fetchFromGitHub { owner = "diced"; repo = "zipline"; tag = "v${finalAttrs.version}"; - hash = "sha256-waUc2DzD7oQ/ZuPKvUwu3Yj6uxrZauR4phcQwh7YfKw="; + hash = "sha256-5qa2K17RmWHO5mrkz/Imoxv4ODEaJow3BMUBNzl7Dg8="; }; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-Q1PHXoiqUorAGcpIvM5iBvPINLRv+dAo0awhG4gvsrI="; + hash = "sha256-xFe1Fdsp8Tpz0r+xvPSYuPR8gXTts6iWTq0a9u+Xh3U="; }; buildInputs = [ vips ]; nativeBuildInputs = [ - pnpm_9.configHook - nodejs + pnpm_10.configHook + nodejs_24 makeWrapper ]; @@ -82,10 +66,10 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/{bin,share/zipline} - cp -r build node_modules prisma .next mimes.json code.json package.json $out/share/zipline + cp -r build generated node_modules prisma .next mimes.json code.json package.json $out/share/zipline mkBin() { - makeWrapper ${lib.getExe nodejs} "$out/bin/$1" \ + makeWrapper ${lib.getExe nodejs_24} "$out/bin/$1" \ --chdir "$out/share/zipline" \ --set NODE_ENV production \ --prefix PATH : ${lib.makeBinPath [ openssl ]} \ diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix index 9dfb27913bea..5c771772e58a 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, testers, accountsservice, @@ -49,13 +48,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-system-settings-unwrapped"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-system-settings"; - rev = finalAttrs.version; - hash = "sha256-8X5a2zJ0y8bSSnbqDvRoYm/2VPAWcfZZuiH+5p8eXi4="; + tag = finalAttrs.version; + hash = "sha256-bVBxJgOy1eXqwzcgBRUTlFoJxxw9I1Qc+Wn92U0QzA4="; }; outputs = [ @@ -64,14 +63,6 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - # Fixes compat with newer ICU - # Remove when version > 1.3.0 - (fetchpatch { - name = "0001-lomiri-system-settings-unwrapped-Unpin-Cxx-standard.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/c0b1c773237b28ea50850810b8844033b13fb666.patch"; - hash = "sha256-M73gQxstKyuzzx1VxdOiNYyfQbSZPIy2gxiCtKcdS1M="; - }) - ./2000-Support-wrapping-for-Nixpkgs.patch ]; @@ -80,8 +71,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \ # Port from lomiri-keyboard to maliit-keyboard - substituteInPlace plugins/language/CMakeLists.txt \ - --replace-fail 'LOMIRI_KEYBOARD_PLUGIN_PATH=\"''${CMAKE_INSTALL_FULL_LIBDIR}/lomiri-keyboard/plugins\"' 'LOMIRI_KEYBOARD_PLUGIN_PATH=\"${lib.getLib maliit-keyboard}/lib/maliit/keyboard2/languages\"' substituteInPlace plugins/language/{PageComponent,SpellChecking,ThemeValues}.qml plugins/language/onscreenkeyboard-plugin.cpp plugins/sound/PageComponent.qml \ --replace-fail 'com.lomiri.keyboard.maliit' 'org.maliit.keyboard.maliit' @@ -164,6 +153,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "ENABLE_LIBDEVICEINFO" true) (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeFeature "LOMIRI_KEYBOARD_PLUGIN_PATH" "${lib.getLib maliit-keyboard}/lib/maliit/keyboard2/languages") ]; # The linking for this normally ignores missing symbols, which is inconvenient for figuring out why subpages may be @@ -207,7 +197,9 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "System Settings application for Lomiri"; homepage = "https://gitlab.com/ubports/development/core/lomiri-system-settings"; - changelog = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/blob/${finalAttrs.version}/ChangeLog"; + changelog = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/blob/${ + if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + }/ChangeLog"; license = licenses.gpl3Only; mainProgram = "lomiri-system-settings"; teams = [ teams.lomiri ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix index fd379a3e2d9d..8d8f64079a5a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix @@ -3,31 +3,32 @@ stdenv, fetchurl, gettext, + meson, + ninja, pkg-config, libxfce4util, xfce4-panel, libxfce4ui, glib, gtk3, - hicolor-icon-theme, gitUpdater, }: -let - category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-timer-plugin"; - version = "1.7.3"; + version = "1.8.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-rPTIYa+IYIuegCp2pLBYRr0wGJ4AhegmaAzBebbfTNM="; + url = "mirror://xfce/src/panel-plugins/xfce4-timer-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-timer-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-HTrDqixDRUAMAlZCd452Q6q0EEdiK6+c3AC7rHjon5k="; }; + strictDeps = true; + nativeBuildInputs = [ gettext + meson + ninja pkg-config ]; @@ -37,21 +38,18 @@ stdenv.mkDerivation rec { xfce4-panel glib gtk3 - hicolor-icon-theme ]; - hardeningDisable = [ "format" ]; - passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin"; + rev-prefix = "xfce4-timer-plugin-"; }; - meta = with lib; { + meta = { homepage = "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin"; description = "Simple countdown and alarm plugin for the Xfce panel"; - platforms = platforms.linux; - license = licenses.gpl2Plus; - teams = [ teams.xfce ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.xfce ]; }; -} +}) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix index e14c710b2edc..eb046b9fd660 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix @@ -1,19 +1,40 @@ { + stdenv, lib, - mkXfceDerivation, + fetchFromGitLab, + gettext, + meson, + ninja, + pkg-config, glib, gtk3, libxfce4ui, libxfce4util, pcre2, xfce4-panel, + gitUpdater, }: -mkXfceDerivation { - category = "panel-plugins"; +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-verve-plugin"; - version = "2.0.4"; - sha256 = "sha256-j0uKYj9PeLEVaocHRw87Dz+YFqDr1BImejEpDPYObQg="; + version = "2.1.0"; + + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "panel-plugins"; + repo = "xfce4-verve-plugin"; + tag = "xfce4-verve-plugin-${finalAttrs.version}"; + hash = "sha256-mxSjYBeBc2HjdTFVdZSVdspAQTEyS+uQA6K17lJoLlc="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + ]; buildInputs = [ glib @@ -24,8 +45,13 @@ mkXfceDerivation { xfce4-panel ]; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "xfce4-verve-plugin-"; }; + + meta = { description = "Command-line plugin"; - teams = [ teams.xfce ]; + homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-verve-plugin"; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.xfce ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index 5c1e2de1533c..78fbe1ed57fc 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -4,8 +4,9 @@ fetchurl, fetchpatch, gettext, + meson, + ninja, pkg-config, - xfce4-dev-tools, glib, gtk3, json_c, @@ -19,36 +20,32 @@ gitUpdater, }: -let - category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-weather-plugin"; - version = "0.11.3"; + version = "0.12.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-AC0f5jkG0vOgEvPLWMzv8d+8xGZ1njbHbTsD3QHA3Fc="; + url = "mirror://xfce/src/panel-plugins/xfce4-weather-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-weather-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-XdkLAywG70tkuBgCMVTvlGOixpSgKQ5X80EilsdUX/Y="; }; patches = [ - # Port to libsoup-3.0 - # https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/merge_requests/28 + # meson-build: Add missing HAVE_UPOWER_GLIB definition + # https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/merge_requests/37 (fetchpatch { - url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/c0653a903c6f2cecdf41ac9eaeba4f4617656ffe.patch"; - hash = "sha256-wAowm4ppBSKvYwOowZbbs5pnTh9EQ9XX05lA81wtsRM="; - }) - (fetchpatch { - url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/279c975dc1f95bd1ce9152eee1d19122e7deb9a8.patch"; - hash = "sha256-gVfyXkE0bjBfvcQU9fDp+Gm59bD3VbAam04Jak8i31k="; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/1d8e5e5dbbc4d53e4b810f9b01a460197cd47b64.patch"; + hash = "sha256-g9AIp1iBcA3AxD1tpnv32PvxxulXYjFvQh3EqD1gmHg="; }) ]; + strictDeps = true; + nativeBuildInputs = [ gettext + glib # glib-compile-resources + meson + ninja pkg-config - xfce4-dev-tools ]; buildInputs = [ @@ -64,20 +61,16 @@ stdenv.mkDerivation rec { xfconf ]; - configureFlags = [ "--enable-maintainer-mode" ]; - - enableParallelBuilding = true; - passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin"; + rev-prefix = "xfce4-weather-plugin-"; }; - meta = with lib; { + meta = { homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"; description = "Weather plugin for the Xfce desktop environment"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - teams = [ teams.xfce ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + teams = [ lib.teams.xfce ]; }; -} +}) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 7491f8cf28e3..ca30bb25da43 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -1,11 +1,15 @@ { - mkXfceDerivation, + stdenv, lib, - cmake, + fetchFromGitLab, + gettext, + meson, + ninja, + pkg-config, + wrapGAppsHook3, accountsservice, exo, garcon, - gettext, glib, gtk-layer-shell, gtk3, @@ -13,25 +17,35 @@ libxfce4util, xfce4-panel, xfconf, + gitUpdater, }: -mkXfceDerivation { - category = "panel-plugins"; +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-whiskermenu-plugin"; - version = "2.9.2"; - rev-prefix = "v"; - odd-unstable = false; - sha256 = "sha256-M9eraJwArCrASrLz+URUOmYtulWPNxR39Sn+alfWoy4="; + version = "2.10.0"; + + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "panel-plugins"; + repo = "xfce4-whiskermenu-plugin"; + tag = "xfce4-whiskermenu-plugin-${finalAttrs.version}"; + hash = "sha256-2FACsP6mKx0k91xG3DaVS6hdvdLrjLu9Y9rVOW6PZ3M="; + }; + + strictDeps = true; nativeBuildInputs = [ - cmake + gettext + meson + ninja + pkg-config + wrapGAppsHook3 ]; buildInputs = [ accountsservice exo garcon - gettext glib gtk-layer-shell gtk3 @@ -41,9 +55,14 @@ mkXfceDerivation { xfconf ]; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "xfce4-whiskermenu-plugin-"; }; + + meta = { description = "Alternate application launcher for Xfce"; mainProgram = "xfce4-popup-whiskermenu"; - teams = [ teams.xfce ]; + homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.xfce ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index 54a32c99b5b3..409f196e9b34 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -3,7 +3,10 @@ lib, fetchurl, gettext, + meson, + ninja, pkg-config, + python3, glib, gtk3, libwnck, @@ -14,19 +17,24 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-windowck-plugin"; - version = "0.5.2"; + version = "0.6.0"; src = fetchurl { - # Use dist tarballs to avoid pulling extra deps and generating images ourselves. - url = "mirror://xfce/src/panel-plugins/xfce4-windowck-plugin/${lib.versions.majorMinor version}/xfce4-windowck-plugin-${version}.tar.bz2"; - sha256 = "sha256-3E7V3JS9Bd5UlUQfDKuyYKs+H2ziex+skuN/kJwM/go="; + url = "mirror://xfce/src/panel-plugins/xfce4-windowck-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-windowck-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-dJeSszth86ICe2VHBW5JOYqNajPgeg66hYOvnF9hdj8="; }; + strictDeps = true; + nativeBuildInputs = [ gettext + glib # glib-compile-resources + meson + ninja pkg-config + python3 ]; buildInputs = [ @@ -44,11 +52,11 @@ stdenv.mkDerivation rec { rev-prefix = "xfce4-windowck-plugin-"; }; - meta = with lib; { + meta = { description = "Xfce panel plugin for displaying window title and buttons"; homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.xfce ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + teams = [ lib.teams.xfce ]; }; -} +}) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix index 036f9c1eadcd..e10dc5a10631 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix @@ -1,6 +1,12 @@ { + stdenv, lib, - mkXfceDerivation, + fetchFromGitLab, + gettext, + meson, + ninja, + pkg-config, + glib, gtk3, libnotify, librsvg, @@ -11,18 +17,35 @@ libxfce4util, xfce4-panel, xfconf, + gitUpdater, }: -mkXfceDerivation { - category = "panel-plugins"; +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-xkb-plugin"; - version = "0.8.5"; - sha256 = "sha256-oG3+OudjJIXfGII16bYaIGy4QMno00HX3kX+8H0VUcU="; + version = "0.9.0"; + + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "panel-plugins"; + repo = "xfce4-xkb-plugin"; + tag = "xfce4-xkb-plugin-${finalAttrs.version}"; + hash = "sha256-yLlUKp7X8bylJs7ioQJ36mfqFlsiZXOgFXa0ZP7AG1E="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + ]; buildInputs = [ garcon + glib gtk3 - libnotify # optional notification support + libnotify librsvg libxfce4ui libxfce4util @@ -32,8 +55,13 @@ mkXfceDerivation { xfconf ]; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "xfce4-xkb-plugin-"; }; + + meta = { description = "Allows you to setup and use multiple keyboard layouts"; - teams = [ teams.xfce ]; + homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin"; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.xfce ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix index 08da1feadb11..02bdedcaf798 100644 --- a/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asottile"; - repo = pname; + repo = "add-trailing-comma"; rev = "v${version}"; hash = "sha256-B+wjBy42RwabVz/6qEMGpB0JmwJ9hqSskwcNj4x/B/k="; }; diff --git a/pkgs/development/python-modules/advocate/default.nix b/pkgs/development/python-modules/advocate/default.nix index a0954dae4439..bd52c01fe489 100644 --- a/pkgs/development/python-modules/advocate/default.nix +++ b/pkgs/development/python-modules/advocate/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JordanMilne"; - repo = pname; + repo = "advocate"; rev = "v${version}"; hash = "sha256-opObkjkad+yrLE2b7DULHjGuNeVhu4fEmSavgA39YPw="; }; diff --git a/pkgs/development/python-modules/aggdraw/default.nix b/pkgs/development/python-modules/aggdraw/default.nix index 5eaa52f72676..4830eb75481c 100644 --- a/pkgs/development/python-modules/aggdraw/default.nix +++ b/pkgs/development/python-modules/aggdraw/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytroll"; - repo = pname; + repo = "aggdraw"; rev = "v${version}"; hash = "sha256-J9+mxlUxOoRBFdz+p8me2T93jaov5rNvKbAZ2YX/VhA="; }; diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix index bc4534b8da61..3d961c34a4fd 100644 --- a/pkgs/development/python-modules/aider-chat/default.nix +++ b/pkgs/development/python-modules/aider-chat/default.nix @@ -6,8 +6,6 @@ gitMinimal, portaudio, playwright-driver, - symlinkJoin, - nltk-data, pythonOlder, pythonAtLeast, setuptools-scm, @@ -122,13 +120,10 @@ }: let - aider-nltk-data = symlinkJoin { - name = "aider-nltk-data"; - paths = [ - nltk-data.punkt-tab - nltk-data.stopwords - ]; - }; + aider-nltk-data = nltk.dataDir (d: [ + d.punkt-tab + d.stopwords + ]); version = "0.83.1"; aider-chat = buildPythonPackage { diff --git a/pkgs/development/python-modules/aioblescan/default.nix b/pkgs/development/python-modules/aioblescan/default.nix index a98074369074..b2e12d4d10d4 100644 --- a/pkgs/development/python-modules/aioblescan/default.nix +++ b/pkgs/development/python-modules/aioblescan/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frawau"; - repo = pname; + repo = "aioblescan"; tag = version; hash = "sha256-JeA9jX566OSRiejdnlifbcNGm0J0C+xzA6zXDUyZ6jc="; }; diff --git a/pkgs/development/python-modules/aiodocker/default.nix b/pkgs/development/python-modules/aiodocker/default.nix index 43e0e409a015..477fd65a3bfe 100644 --- a/pkgs/development/python-modules/aiodocker/default.nix +++ b/pkgs/development/python-modules/aiodocker/default.nix @@ -2,33 +2,39 @@ lib, buildPythonPackage, fetchFromGitHub, + hatchling, + hatch-vcs, aiohttp, - typing-extensions, }: buildPythonPackage rec { pname = "aiodocker"; - # unstable includes support for python 3.10+ - version = "unstable-2022-01-20"; - format = "setuptools"; + version = "0.24.0"; + pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; - rev = "f1dbdc3d42147f4c2ab5e6802acf6f7d0f885be4"; - sha256 = "RL5Ck4wsBZO88afmoojeFKbdIeCjDo/SwNqUcERH6Ls="; + repo = "aiodocker"; + tag = "v${version}"; + hash = "sha256-qCOAM4ZyJoLc91FjQpBO97Nyfo1ZOEi0nhXZ7nwLsHk="; }; - propagatedBuildInputs = [ + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ aiohttp - typing-extensions ]; # tests require docker daemon doCheck = false; + pythonImportsCheck = [ "aiodocker" ]; meta = with lib; { + changelog = "https://github.com/aio-libs/aiodocker/releases/tag/${src.tag}"; description = "Docker API client for asyncio"; homepage = "https://github.com/aio-libs/aiodocker"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/aioemonitor/default.nix b/pkgs/development/python-modules/aioemonitor/default.nix index a9fcde7fb79a..7c9a6e1c4d5e 100644 --- a/pkgs/development/python-modules/aioemonitor/default.nix +++ b/pkgs/development/python-modules/aioemonitor/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; - repo = pname; + repo = "aioemonitor"; rev = "v${version}"; sha256 = "0h8zqqy8v8r1fl9bp3m8icr2sy44p0mbfl1hbb0zni17r9r50dhn"; }; diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix index f962c82166e9..dfe6743d700f 100644 --- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix +++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "etianen"; - repo = pname; + repo = "aiohttp-wsgi"; rev = "v${version}"; hash = "sha256-3Q00FidZWV1KueuHyHKQf1PsDJGOaRW6v/kBy7lzD4Q="; }; diff --git a/pkgs/development/python-modules/aiohwenergy/default.nix b/pkgs/development/python-modules/aiohwenergy/default.nix index a5f6c852d13f..87f62352565b 100644 --- a/pkgs/development/python-modules/aiohwenergy/default.nix +++ b/pkgs/development/python-modules/aiohwenergy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DCSBL"; - repo = pname; + repo = "aiohwenergy"; rev = version; hash = "sha256-WfkwIxyDzLNzhWNWST/V3iN9Bhu2oXDwGiA5UXCq5ho="; }; diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix index ed6251b4ce04..d74e9554bf39 100644 --- a/pkgs/development/python-modules/aiokef/default.nix +++ b/pkgs/development/python-modules/aiokef/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "basnijholt"; - repo = pname; + repo = "aiokef"; rev = "v${version}"; sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9"; }; diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix index f6f5dfdc575b..a76d3a3ec8d8 100644 --- a/pkgs/development/python-modules/aiolimiter/default.nix +++ b/pkgs/development/python-modules/aiolimiter/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mjpieters"; - repo = pname; + repo = "aiolimiter"; tag = "v${version}"; hash = "sha256-wgHR0GzaPXlhL4ErklFqmWNFO49dvd5X5MgyYHVH4Eo="; }; diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index 25f843ddb5b3..677d9ba7c72e 100644 --- a/pkgs/development/python-modules/aiolookin/default.nix +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ANMalko"; - repo = pname; + repo = "aiolookin"; tag = "v${version}"; hash = "sha256-G3/lUgV60CMLskUo83TlvLLIfJtu5DEz+94mdVI4OrI="; }; diff --git a/pkgs/development/python-modules/aionanoleaf/default.nix b/pkgs/development/python-modules/aionanoleaf/default.nix index 0c0894ae1dfe..0b7e756b2fad 100644 --- a/pkgs/development/python-modules/aionanoleaf/default.nix +++ b/pkgs/development/python-modules/aionanoleaf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "milanmeu"; - repo = pname; + repo = "aionanoleaf"; tag = "v${version}"; hash = "sha256-f0TyXhuAzI0s0n6sXH9mKWA4nad2YchZkQ0+jw/Bmv0="; }; diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix index a54ce5436b7a..6225d1d9f0f6 100644 --- a/pkgs/development/python-modules/aiopg/default.nix +++ b/pkgs/development/python-modules/aiopg/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; + repo = "aiopg"; rev = "v${version}"; hash = "sha256-GD5lRSUjASTwBk5vEK8v3xD8eNyxpwSrO3HHvtwubmk="; }; diff --git a/pkgs/development/python-modules/aiopurpleair/default.nix b/pkgs/development/python-modules/aiopurpleair/default.nix index df687d46b61a..5df4ab4e7cda 100644 --- a/pkgs/development/python-modules/aiopurpleair/default.nix +++ b/pkgs/development/python-modules/aiopurpleair/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; - repo = pname; + repo = "aiopurpleair"; tag = version; hash = "sha256-2Ngo2pvzwcgQvpyW5Q97VQN/tGSVhVJwRj0DMaPn+O4="; }; diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix index 8bf48eb20ee2..f6ae771dfa8b 100644 --- a/pkgs/development/python-modules/aiopyarr/default.nix +++ b/pkgs/development/python-modules/aiopyarr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tkdrob"; - repo = pname; + repo = "aiopyarr"; tag = version; hash = "sha256-CzNB6ymvDTktiOGdcdCvWLVQ3mKmbdMpc/vezSXCpG4="; }; diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix index 8a23532f6345..34330eb02914 100644 --- a/pkgs/development/python-modules/aiopylgtv/default.nix +++ b/pkgs/development/python-modules/aiopylgtv/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bendavid"; - repo = pname; + repo = "aiopylgtv"; rev = version; hash = "sha256-NkWJGy5QUrhpbARoscrXy/ilCjAz01YxeVTH0I+IjNM="; }; diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix index b2eecc0768c2..00066f12ad4b 100644 --- a/pkgs/development/python-modules/aioqsw/default.nix +++ b/pkgs/development/python-modules/aioqsw/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Noltari"; - repo = pname; + repo = "aioqsw"; tag = version; hash = "sha256-h/rTwMF3lc/hWwpzCvK6UMq0rjq3xkw/tEY3BqOPS2s="; }; diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index 6153b430b065..4a6c1d671eb3 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; - repo = pname; + repo = "aiorecollect"; tag = version; hash = "sha256-Rj0+r7eERLY5VzmuDQH/TeVLfmvmKwPqcvd1b/To0Ts="; }; diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 0d152d1de607..0e9cbce40b04 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; - repo = pname; + repo = "aioridwell"; tag = version; hash = "sha256-B5k8uXDHq0U6fJVW8oy2sWUj5OIVGUfe9EtCjnIr3OE="; }; diff --git a/pkgs/development/python-modules/aiosenz/default.nix b/pkgs/development/python-modules/aiosenz/default.nix index 430c5ba68d63..9c3f26500bf6 100644 --- a/pkgs/development/python-modules/aiosenz/default.nix +++ b/pkgs/development/python-modules/aiosenz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "milanmeu"; - repo = pname; + repo = "aiosenz"; rev = version; hash = "sha256-ODdWPS14zzptxuS6mff51f0s1SYnIqjF40DmvT0sL0w="; }; diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix index 128e8c4f2d9b..52c29031753a 100644 --- a/pkgs/development/python-modules/aiosignal/default.nix +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; + repo = "aiosignal"; rev = "v${version}"; hash = "sha256-CvNarJpSq8EKnt+PuSerMK/ZVbxL9rp7rQ4dkWykG1M="; }; diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix index 29c7ad646fa3..4a7872e14464 100644 --- a/pkgs/development/python-modules/aiosonic/default.nix +++ b/pkgs/development/python-modules/aiosonic/default.nix @@ -10,26 +10,13 @@ h2, onecache, # test dependencies - asgiref, - black, - django, - click, httpx, - proxy-py, pytest-aiohttp, - pytest-asyncio, pytest-cov-stub, - pytest-django, pytest-mock, - pytest-sugar, - pytest-timeout, uvicorn, - httptools, - typed-ast, - uvloop, requests, aiohttp, - aiodns, pytestCheckHook, stdenv, }: @@ -66,27 +53,13 @@ buildPythonPackage rec { nativeCheckInputs = [ aiohttp - aiodns - asgiref - black - django - click httpx - proxy-py pytest-aiohttp - pytest-asyncio pytest-cov-stub - pytest-django pytest-mock - pytest-sugar - pytest-timeout uvicorn - httptools - typed-ast - uvloop requests pytestCheckHook - nodejs ]; pythonImportsCheck = [ "aiosonic" ]; diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix index 59ce8c177a84..ab55efb83960 100644 --- a/pkgs/development/python-modules/aiowatttime/default.nix +++ b/pkgs/development/python-modules/aiowatttime/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; - repo = pname; + repo = "aiowatttime"; tag = version; hash = "sha256-c5L+Nx+CoWEc6Bs61GOHPBelExe5I7EOlMQ+QV6nktI="; }; diff --git a/pkgs/development/python-modules/airtouch4pyapi/default.nix b/pkgs/development/python-modules/airtouch4pyapi/default.nix index 47bed7a289f5..bbaf53718ad1 100644 --- a/pkgs/development/python-modules/airtouch4pyapi/default.nix +++ b/pkgs/development/python-modules/airtouch4pyapi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LonePurpleWolf"; - repo = pname; + repo = "airtouch4pyapi"; tag = "v${version}"; hash = "sha256-RiRwebumidn0nijL/e9J74ZYx0DASi1up5BTNxYoGEA="; }; diff --git a/pkgs/development/python-modules/aladdin-connect/default.nix b/pkgs/development/python-modules/aladdin-connect/default.nix index 3c1361f8bdfd..bca89d55ec95 100644 --- a/pkgs/development/python-modules/aladdin-connect/default.nix +++ b/pkgs/development/python-modules/aladdin-connect/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "shoejosh"; - repo = pname; + repo = "aladdin-connect"; tag = version; hash = "sha256-kLvMpSGa5WyDOH3ejAJyFGsB9IiMXp+nvVxM/ZkxyFw="; }; diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix index 0ed7368949a5..54695555a239 100644 --- a/pkgs/development/python-modules/allpairspy/default.nix +++ b/pkgs/development/python-modules/allpairspy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thombashi"; - repo = pname; + repo = "allpairspy"; tag = "v${version}"; hash = "sha256-0wzoQDHB7Tt80ZTlKrNxFutztsgUuin5D2eb80c4PBI="; }; diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix index 0221295513b3..a04da6074231 100644 --- a/pkgs/development/python-modules/amqtt/default.nix +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -17,7 +17,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage { pname = "amqtt"; version = "unstable-2022-05-29"; format = "pyproject"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Yakifo"; - repo = pname; + repo = "amqtt"; rev = "09ac98d39a711dcff0d8f22686916e1c2495144b"; hash = "sha256-8T1XhBSOiArlUQbQ41LsUogDgOurLhf+M8mjIrrAC4s="; }; diff --git a/pkgs/development/python-modules/ancp-bids/default.nix b/pkgs/development/python-modules/ancp-bids/default.nix index 9986634140ff..ffb1c0ef7859 100644 --- a/pkgs/development/python-modules/ancp-bids/default.nix +++ b/pkgs/development/python-modules/ancp-bids/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # `tests/data` dir missing from PyPI dist src = fetchFromGitHub { owner = "ANCPLabOldenburg"; - repo = pname; + repo = "ancp-bids"; tag = version; hash = "sha256-vmw8SAikvbaHnPOthBQxTbyvDwnnZwCOV97aUogIgxw="; }; diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 088a7b8ea0fa..7349d4f5d705 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -39,8 +39,8 @@ buildPythonPackage rec { pyproject = true; src = fetchFromGitHub { - repo = pname; - owner = pname; + repo = "androguard"; + owner = "androguard"; tag = "v${version}"; sha256 = "sha256-qz6x7UgYXal1DbQGzi4iKnSGEn873rKibKme/pF7tLk="; }; diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index 17318c7dd5f8..753dc9e04cdb 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tehmaze"; - repo = pname; + repo = "ansi"; tag = "ansi-${version}"; hash = "sha256-PmgB1glksu4roQeZ1o7uilMJNm9xaYqw680N2z+tUUM="; }; diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix index 4e5a82dc3339..65244a9fe6d0 100644 --- a/pkgs/development/python-modules/ansiconv/default.nix +++ b/pkgs/development/python-modules/ansiconv/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ansible"; - repo = pname; + repo = "ansiconv"; rev = "v${version}"; sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4"; }; diff --git a/pkgs/development/python-modules/aqualogic/default.nix b/pkgs/development/python-modules/aqualogic/default.nix index 4e5ac2e73f48..a058dea6ce1d 100644 --- a/pkgs/development/python-modules/aqualogic/default.nix +++ b/pkgs/development/python-modules/aqualogic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "swilson"; - repo = pname; + repo = "aqualogic"; rev = version; hash = "sha256-hBg02Wypd+MyqM2SUD53djhm5OMP2QAmsp8Stf+UT2c="; }; diff --git a/pkgs/development/python-modules/arc4/default.nix b/pkgs/development/python-modules/arc4/default.nix index 6706519259c7..e7350569462c 100644 --- a/pkgs/development/python-modules/arc4/default.nix +++ b/pkgs/development/python-modules/arc4/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "manicmaniac"; - repo = pname; + repo = "arc4"; rev = version; hash = "sha256-DlZIygf5v3ZNY2XFmrKOA15ccMo3Rv0kf6hZJ0CskeQ="; }; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 19e589186fc9..eae13c92e2a4 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pawamoy"; - repo = pname; + repo = "aria2p"; tag = version; hash = "sha256-JEXTCDfFjxI1hooiEQq0KIGGoS2F7fyzOM0GMl+Jr7w="; }; diff --git a/pkgs/development/python-modules/arpy/default.nix b/pkgs/development/python-modules/arpy/default.nix index 819d4559dc94..bb06aa135b90 100644 --- a/pkgs/development/python-modules/arpy/default.nix +++ b/pkgs/development/python-modules/arpy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "viraptor"; - repo = pname; + repo = "arpy"; rev = version; hash = "sha256-jD1XJJhcpJymn0CwZ65U06xLKm1JjHffmx/umEO7a5s="; }; diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix index 0a1032259c84..5eab9ca74f67 100644 --- a/pkgs/development/python-modules/asn1ate/default.nix +++ b/pkgs/development/python-modules/asn1ate/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1p8hv4gsyqsdr0gafcq497n52pybiqmc22di8ai4nsj60fv0km45"; rev = "v${version}"; owner = "kimgr"; - repo = pname; + repo = "asn1ate"; }; propagatedBuildInputs = [ pyparsing ]; diff --git a/pkgs/development/python-modules/assay/default.nix b/pkgs/development/python-modules/assay/default.nix index b71a3b9be090..abd756b2acfb 100644 --- a/pkgs/development/python-modules/assay/default.nix +++ b/pkgs/development/python-modules/assay/default.nix @@ -5,14 +5,14 @@ pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage { pname = "assay"; version = "0-unstable-2024-05-09"; format = "setuptools"; src = fetchFromGitHub { owner = "brandon-rhodes"; - repo = pname; + repo = "assay"; rev = "74617d70e77afa09f58b3169cf496679ac5d5621"; hash = "sha256-zYpLtcXZ16EJWKSCqxFkSz/G9PwIZEQGBrYiJKuqnc4="; }; diff --git a/pkgs/development/python-modules/assertpy/default.nix b/pkgs/development/python-modules/assertpy/default.nix index e45e59409c72..a8e46e2ace44 100644 --- a/pkgs/development/python-modules/assertpy/default.nix +++ b/pkgs/development/python-modules/assertpy/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { format = "setuptools"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "assertpy"; + repo = "assertpy"; rev = version; sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f"; }; diff --git a/pkgs/development/python-modules/asyncio-throttle/default.nix b/pkgs/development/python-modules/asyncio-throttle/default.nix index dc8dc03599a1..af543d5df11c 100644 --- a/pkgs/development/python-modules/asyncio-throttle/default.nix +++ b/pkgs/development/python-modules/asyncio-throttle/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hallazzang"; - repo = pname; + repo = "asyncio-throttle"; rev = "v${version}"; sha256 = "1hsjcymdcm0hf4l68scf9n8j7ba89azgh96xhxrnyvwxfs5acnmv"; }; diff --git a/pkgs/development/python-modules/asyncmy/default.nix b/pkgs/development/python-modules/asyncmy/default.nix index 15a2b0b7cb97..5442c0c34d7d 100644 --- a/pkgs/development/python-modules/asyncmy/default.nix +++ b/pkgs/development/python-modules/asyncmy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "long2ice"; - repo = pname; + repo = "asyncmy"; tag = "v${version}"; hash = "sha256-HQZmt22yPYaWfJzL20+jBc855HR4dVW983Z0LrN1Xa0="; }; diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index ab4e3d41a0ed..c9bc2f65a692 100644 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "atlassian-api"; - repo = pname; + repo = "atlassian-python-api"; tag = version; hash = "sha256-m8B6t9tTlef8cdsh/wnsc0iyNLsB0RYjUhq/bA9MeII="; }; diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix index dbfa6a226b9a..011c9f58e4b5 100644 --- a/pkgs/development/python-modules/aurorapy/default.nix +++ b/pkgs/development/python-modules/aurorapy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "energievalsabbia"; - repo = pname; + repo = "aurorapy"; rev = version; hash = "sha256-rGwfGq3zdoG9NCGqVN29Q4bWApk5B6CRdsW9ctWgOec="; }; diff --git a/pkgs/development/python-modules/avea/default.nix b/pkgs/development/python-modules/avea/default.nix index 202d6e7b7742..a03f7ae97247 100644 --- a/pkgs/development/python-modules/avea/default.nix +++ b/pkgs/development/python-modules/avea/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "k0rventen"; - repo = pname; + repo = "avea"; rev = "v${version}"; sha256 = "1dirf0zdf4hb941w1dvh97vsvcy4h3w9r8jwdgr1ggmhdf9kfx4v"; }; diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix index 4a2bdbef6da5..e6044ae99d3f 100644 --- a/pkgs/development/python-modules/babelfont/default.nix +++ b/pkgs/development/python-modules/babelfont/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # PyPI source tarballs omit tests, fetch from Github instead src = fetchFromGitHub { owner = "simoncozens"; - repo = pname; + repo = "babelfont"; tag = "v${version}"; hash = "sha256-XNoyM3kjKRc0NWA94ufzC2DBzAsufJNJbzFDUbLu8Lc="; }; diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix index ff0411795c99..a068a640914b 100644 --- a/pkgs/development/python-modules/backoff/default.nix +++ b/pkgs/development/python-modules/backoff/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "litl"; - repo = pname; + repo = "backoff"; tag = "v${version}"; hash = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI="; }; diff --git a/pkgs/development/python-modules/base58check/default.nix b/pkgs/development/python-modules/base58check/default.nix index 338775bf6cee..b9e526ba2852 100644 --- a/pkgs/development/python-modules/base58check/default.nix +++ b/pkgs/development/python-modules/base58check/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "joeblackwaslike"; - repo = pname; + repo = "base58check"; rev = "v${version}"; hash = "sha256-Tig6beLRDsXC//x4+t/z2BGaJQWzcP0J+QEKx3D0rhs="; }; diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix index 17d2485c6def..0c6143f29e24 100644 --- a/pkgs/development/python-modules/bashlex/default.nix +++ b/pkgs/development/python-modules/bashlex/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "idank"; - repo = pname; + repo = "bashlex"; rev = version; hash = "sha256-ddZN91H95RiTLXx4lpES1Dmz7nNsSVUeuFuOEpJ7LQI="; }; diff --git a/pkgs/development/python-modules/bbox/default.nix b/pkgs/development/python-modules/bbox/default.nix index e46d0caf0738..41f3717c6516 100644 --- a/pkgs/development/python-modules/bbox/default.nix +++ b/pkgs/development/python-modules/bbox/default.nix @@ -12,7 +12,7 @@ pyquaternion, }: -buildPythonPackage rec { +buildPythonPackage { pname = "bbox"; version = "0.9.4"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "varunagrawal"; - repo = pname; + repo = "bbox"; # matches 0.9.4 on PyPi + tests rev = "d3f07ed0e38b6015cf4181e3b3edae6a263f8565"; hash = "sha256-FrJ8FhlqwmnEB/QvPlkDfqZncNGPhwY9aagM9yv1LGs="; diff --git a/pkgs/development/python-modules/beautifultable/default.nix b/pkgs/development/python-modules/beautifultable/default.nix index 9b1544ae2bd0..bfd6fa30bf87 100644 --- a/pkgs/development/python-modules/beautifultable/default.nix +++ b/pkgs/development/python-modules/beautifultable/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pri22296"; - repo = pname; + repo = "beautifultable"; rev = "v${version}"; hash = "sha256-/SReCEvSwiNjBoz/3tGJ9zUNBAag4mLsHlUXwm47zCw="; }; diff --git a/pkgs/development/python-modules/beautysh/default.nix b/pkgs/development/python-modules/beautysh/default.nix index 8c8af617f833..245615bd7ccd 100644 --- a/pkgs/development/python-modules/beautysh/default.nix +++ b/pkgs/development/python-modules/beautysh/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lovesegfault"; - repo = pname; + repo = "beautysh"; rev = "v${version}"; hash = "sha256-rPeGRcyNK45Y7OvtzaIH93IIzexBf/jM1SzYP0phQ1o="; }; diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index d5035321e359..75a0713efcaf 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scott-griffiths"; - repo = pname; + repo = "bitstring"; tag = "bitstring-${version}"; hash = "sha256-ZABAd42h+BqcpKTFV5PxcBN3F8FKV6Qw3rhP13eX57k="; }; diff --git a/pkgs/development/python-modules/bitvavo-aio/default.nix b/pkgs/development/python-modules/bitvavo-aio/default.nix index 0df3e7add098..f8eb0cd49734 100644 --- a/pkgs/development/python-modules/bitvavo-aio/default.nix +++ b/pkgs/development/python-modules/bitvavo-aio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cyberjunky"; - repo = pname; + repo = "bitvavo-aio"; rev = version; sha256 = "1d9nbbvv7xnkixj03sfhs2da5j3i2m7p73r7j1yb7b39zas2rbig"; }; diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index ca8663c1d656..cbcb7be585c5 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # tests are not published to pypi anymore src = fetchFromGitHub { owner = "jonashaag"; - repo = pname; + repo = "bjoern"; rev = version; hash = "sha256-d7u/lEh2Zr5NYWYu4Zr7kgyeOIQuHQLYrZeiZMHbpio="; fetchSubmodules = true; # fetch http-parser and statsd-c-client submodules diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix index 56677dd344af..307aaf38d5d0 100644 --- a/pkgs/development/python-modules/black-macchiato/default.nix +++ b/pkgs/development/python-modules/black-macchiato/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wbolster"; - repo = pname; + repo = "black-macchiato"; rev = version; sha256 = "0lc9w50nlbmlzj44krk7kxcia202fhybbnwfh77xixlc7vb4rayl"; }; diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 82fb53ce2ebf..682d474e30ff 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hbldh"; - repo = pname; + repo = "bleak"; tag = "v${version}"; hash = "sha256-kPeKQcJETZE6+btQsmCgb37yRI2Klg0lZ1ZIrm8ODow="; }; diff --git a/pkgs/development/python-modules/blobfile/default.nix b/pkgs/development/python-modules/blobfile/default.nix index 244d7676053e..ca229e42139c 100644 --- a/pkgs/development/python-modules/blobfile/default.nix +++ b/pkgs/development/python-modules/blobfile/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "christopher-hesse"; - repo = pname; + repo = "blobfile"; tag = "v${version}"; hash = "sha256-/v48rLvlN4lsfWKJvXRNuIO6jdsCgRcSPlJzdOfl3xk="; }; diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index 31e0e4e82b6a..cd6220610bab 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "duckinator"; - repo = pname; + repo = "bork"; tag = "v${version}"; hash = "sha256-YqvtOwd00TXD4I3fIQolvjHnjREvQgbdrEO9Z96v1Kk="; }; diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix index e3832e5ed550..d58dfebd9c4f 100644 --- a/pkgs/development/python-modules/bravado-core/default.nix +++ b/pkgs/development/python-modules/bravado-core/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Yelp"; - repo = pname; + repo = "bravado-core"; rev = "v${version}"; hash = "sha256-kyHmZNPl5lLKmm5i3TSi8Tfi96mQHqaiyBfceBJcOdw="; }; diff --git a/pkgs/development/python-modules/brotli-asgi/default.nix b/pkgs/development/python-modules/brotli-asgi/default.nix index 79d090f6127a..302057470abb 100644 --- a/pkgs/development/python-modules/brotli-asgi/default.nix +++ b/pkgs/development/python-modules/brotli-asgi/default.nix @@ -24,7 +24,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "fullonic"; - repo = pname; + repo = "brotli-asgi"; rev = "v${version}"; hash = "sha256-hQ6CSXnAoUSaKUSmE+2GHZemkFqd8Dc5+OvcUD7/r5Y="; }; diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index a3880604ea60..596a6983ea7e 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; - repo = pname; + repo = "brotli"; tag = "v${version}"; hash = "sha256-U1vAupUthD5W0xvlOKdgm9MAVLqsVyZUaFdeLsDAbDM="; # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix index 8de7c2194ab2..4df1f84bce77 100644 --- a/pkgs/development/python-modules/brottsplatskartan/default.nix +++ b/pkgs/development/python-modules/brottsplatskartan/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chrillux"; - repo = pname; + repo = "brottsplatskartan"; rev = version; sha256 = "07iwmnchvpw156j23yfccg4c32izbwm8b02bjr1xgmcwzbq21ks9"; }; diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix index ff64e723cdbc..84fb157a8659 100644 --- a/pkgs/development/python-modules/bunch/default.nix +++ b/pkgs/development/python-modules/bunch/default.nix @@ -5,7 +5,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage { pname = "bunch"; version = "unstable-2017-11-21"; format = "setuptools"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # Use a fork as upstream is dead src = fetchFromGitHub { owner = "olivecoder"; - repo = pname; + repo = "bunch"; rev = "71ac9d5c712becd4c502ab3099203731a0f1122e"; hash = "sha256-XOgzJkcIqkAJFsKAyt2jSEIxcc0h2gFC15xy5kAs+7s="; }; diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix index e437fcefe215..f5d0475a204b 100644 --- a/pkgs/development/python-modules/bytecode/default.nix +++ b/pkgs/development/python-modules/bytecode/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vstinner"; - repo = pname; + repo = "bytecode"; tag = version; hash = "sha256-74qEwAYHXV4HakJQ05A9K7LuO0xP28Hub6no09KO4r4="; }; diff --git a/pkgs/development/python-modules/bytewax/default.nix b/pkgs/development/python-modules/bytewax/default.nix index 8cc88f937900..204f1af73b14 100644 --- a/pkgs/development/python-modules/bytewax/default.nix +++ b/pkgs/development/python-modules/bytewax/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bytewax"; - repo = pname; + repo = "bytewax"; tag = "v${version}"; hash = "sha256-O5q1Jd3AMUaQwfQM249CUnkjqEkXybxtM9SOISoULZk="; }; diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index ca68a3401d2c..3da6feb67683 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pallets"; - repo = pname; + repo = "cachelib"; tag = version; hash = "sha256-8jg+zfdIATvu/GSFvqHl4cNMu+s2IFWC22vPZ7Q3WYI="; }; diff --git a/pkgs/development/python-modules/cachey/default.nix b/pkgs/development/python-modules/cachey/default.nix index a8cb498b2026..94301f1dfee7 100644 --- a/pkgs/development/python-modules/cachey/default.nix +++ b/pkgs/development/python-modules/cachey/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dask"; - repo = pname; + repo = "cachey"; rev = version; hash = "sha256-5USmuufrrWtmgibpfkjo9NtgN30hdl8plJfythmxM4s="; }; diff --git a/pkgs/development/python-modules/callee/default.nix b/pkgs/development/python-modules/callee/default.nix index bc3435861f5a..9bec7a99952f 100644 --- a/pkgs/development/python-modules/callee/default.nix +++ b/pkgs/development/python-modules/callee/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Xion"; - repo = pname; + repo = "callee"; tag = version; hash = "sha256-dsXMY3bW/70CmTfCuy5KjxPa+NLCzxzWv5e1aV2NEWE="; }; diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix index ddf27ae42a34..e76027a49b43 100644 --- a/pkgs/development/python-modules/cart/default.nix +++ b/pkgs/development/python-modules/cart/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CybercentreCanada"; - repo = pname; + repo = "cart"; tag = "v${version}"; hash = "sha256-oeWeay1Pr9T4oR3XSrwv9hRr/sLTel1Bt6BG6jHXxIA="; }; diff --git a/pkgs/development/python-modules/certvalidator/default.nix b/pkgs/development/python-modules/certvalidator/default.nix index c59e2b6738e0..bfcf3ee02b1c 100644 --- a/pkgs/development/python-modules/certvalidator/default.nix +++ b/pkgs/development/python-modules/certvalidator/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wbond"; - repo = pname; + repo = "certvalidator"; rev = version; hash = "sha256-yVF7t4FuU3C9fDg67JeM7LWZZh/mv5F4EKmjlO4AuBY="; }; diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 4b4ab02edc77..0feb920c81ac 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "bdraco"; - repo = pname; + repo = "chacha20poly1305-reuseable"; tag = "v${version}"; hash = "sha256-i6bhqfYo+gFTf3dqOBSQqGN4WPqbUR05StdwZvrVckI="; }; diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 9a72361a7f94..8d340ebad5b6 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws"; - repo = pname; + repo = "chalice"; tag = version; hash = "sha256-m3pSD4fahBW6Yt/w07Co4fTZD7k6as5cPwoK5QSry6M="; }; diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index acbaaf0e9bf4..b448def48013 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CheetahTemplate3"; - repo = pname; + repo = "cheetah3"; tag = version; hash = "sha256-yIdswcCuoDR3R/Subl22fKB55pgw/sDkrPy+vwNgaxI="; }; diff --git a/pkgs/development/python-modules/chirpstack-api/default.nix b/pkgs/development/python-modules/chirpstack-api/default.nix index 38ea1d8739cf..1d8cd789b3e1 100644 --- a/pkgs/development/python-modules/chirpstack-api/default.nix +++ b/pkgs/development/python-modules/chirpstack-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "brocaar"; - repo = pname; + repo = "chirpstack-api"; rev = "v${version}"; hash = "sha256-69encHMk0eXE2Av87ysKvxoiXog5o68qCUlOx/lgHFU="; }; diff --git a/pkgs/development/python-modules/circuitbreaker/default.nix b/pkgs/development/python-modules/circuitbreaker/default.nix index 11018f38e077..036f9657d222 100644 --- a/pkgs/development/python-modules/circuitbreaker/default.nix +++ b/pkgs/development/python-modules/circuitbreaker/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fabfuel"; - repo = pname; + repo = "circuitbreaker"; tag = version; hash = "sha256-7BpYGhha0PTYzsE9CsN4KxfJW/wm2i6V+uAeamBREBQ="; }; diff --git a/pkgs/development/python-modules/class-doc/default.nix b/pkgs/development/python-modules/class-doc/default.nix index 32d69f092760..70ea060fe501 100644 --- a/pkgs/development/python-modules/class-doc/default.nix +++ b/pkgs/development/python-modules/class-doc/default.nix @@ -8,14 +8,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "class-doc"; version = "0.2.6"; format = "pyproject"; src = fetchFromGitHub { owner = "danields761"; - repo = pname; + repo = "class-doc"; rev = "9b122d85ce667d096ebee75a49350bbdbd48686d"; # no 0.2.6 version tag hash = "sha256-4Sn/TuBvBpl1nvJBg327+sVrjGavkYKEYP32DwLWako="; }; diff --git a/pkgs/development/python-modules/classify-imports/default.nix b/pkgs/development/python-modules/classify-imports/default.nix index 53eaf1745231..acf532ee4d6a 100644 --- a/pkgs/development/python-modules/classify-imports/default.nix +++ b/pkgs/development/python-modules/classify-imports/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asottile"; - repo = pname; + repo = "classify-imports"; rev = "v${version}"; hash = "sha256-f5wZfisKz9WGdq6u0rd/zg2CfMwWvQeR8xZQNbD7KfU="; }; diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index c9b21515f69e..fffb99c0f4e0 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-poetry"; - repo = pname; + repo = "cleo"; tag = version; hash = "sha256-+OvE09hbF6McdXpXdv5UBdZ0LiSOTL8xyE/+bBNIFNk="; }; diff --git a/pkgs/development/python-modules/click-command-tree/default.nix b/pkgs/development/python-modules/click-command-tree/default.nix index be2ad84ece64..4935b3733db5 100644 --- a/pkgs/development/python-modules/click-command-tree/default.nix +++ b/pkgs/development/python-modules/click-command-tree/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "whwright"; - repo = pname; + repo = "click-command-tree"; tag = version; hash = "sha256-oshAHCGe8p5BQ0W21bXSxrTCEFgIxZ6BmUEiWB1xAoI="; }; diff --git a/pkgs/development/python-modules/click-shell/default.nix b/pkgs/development/python-modules/click-shell/default.nix index b51163716e5f..fa95216a3267 100644 --- a/pkgs/development/python-modules/click-shell/default.nix +++ b/pkgs/development/python-modules/click-shell/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # PyPi release is missing tests src = fetchFromGitHub { owner = "clarkperkins"; - repo = pname; + repo = "click-shell"; tag = version; hash = "sha256-4QpQzg0yFuOFymGiTI+A8o6LyX78iTJMqr0ernYbilI="; }; diff --git a/pkgs/development/python-modules/clintermission/default.nix b/pkgs/development/python-modules/clintermission/default.nix index 5ea19c7e7b1b..e9020e9d9b1a 100644 --- a/pkgs/development/python-modules/clintermission/default.nix +++ b/pkgs/development/python-modules/clintermission/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sebageek"; - repo = pname; + repo = "clintermission"; tag = "v${version}"; hash = "sha256-e7C9IDr+mhVSfU8lMywjX1BYwFo/qegPNzabak7UPcY="; }; diff --git a/pkgs/development/python-modules/clip/default.nix b/pkgs/development/python-modules/clip/default.nix index e5b193c9caa1..1ea558cc86d6 100644 --- a/pkgs/development/python-modules/clip/default.nix +++ b/pkgs/development/python-modules/clip/default.nix @@ -9,14 +9,14 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage { pname = "clip"; version = "unstable-2022-11-17"; format = "setuptools"; src = fetchFromGitHub { owner = "openai"; - repo = pname; + repo = "clip"; rev = "d50d76daa670286dd6cacf3bcd80b5e4823fc8e1"; hash = "sha256-GAitNBb5CzFVv2+Dky0VqSdrFIpKKtoAoyqeLoDaHO4="; }; diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 0018a2744d9c..71f270396258 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "clld"; - repo = pname; + repo = "clldutils"; rev = "v${version}"; hash = "sha256-OD+WJ9JuYZb/oXDgVqL4i5YlcVEt0+swq0SB3cutyRo="; }; diff --git a/pkgs/development/python-modules/codepy/default.nix b/pkgs/development/python-modules/codepy/default.nix index edcda2857bc3..cf0410cc592c 100644 --- a/pkgs/development/python-modules/codepy/default.nix +++ b/pkgs/development/python-modules/codepy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "inducer"; - repo = pname; + repo = "codepy"; rev = "v${version}"; hash = "sha256-viMfB/nDrvDA/IGRZEX+yXylxbbmqbh/fgdYXBzK0zM="; }; diff --git a/pkgs/development/python-modules/colorful/default.nix b/pkgs/development/python-modules/colorful/default.nix index 05ebb1598804..491defd0139a 100644 --- a/pkgs/development/python-modules/colorful/default.nix +++ b/pkgs/development/python-modules/colorful/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timofurrer"; - repo = pname; + repo = "colorful"; tag = "v${version}"; hash = "sha256-8rHJIsHiyfjmjlGiEyrzvEwKgi1kP4Njm731mlFDMIU="; }; diff --git a/pkgs/development/python-modules/colorzero/default.nix b/pkgs/development/python-modules/colorzero/default.nix index 2290165e639b..09a40420e1b6 100644 --- a/pkgs/development/python-modules/colorzero/default.nix +++ b/pkgs/development/python-modules/colorzero/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "waveform80"; - repo = pname; + repo = "colorzero"; tag = "release-${version}"; hash = "sha256-0NoQsy86OHQNLZsTEuF5s2MlRUoacF28jNeHgFKAH14="; }; diff --git a/pkgs/development/python-modules/colout/default.nix b/pkgs/development/python-modules/colout/default.nix index 904f3e1f4b02..b381ffc64ff0 100644 --- a/pkgs/development/python-modules/colout/default.nix +++ b/pkgs/development/python-modules/colout/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nojhan"; - repo = pname; + repo = "colout"; tag = "v${version}"; hash = "sha256-7Dtf87erBElqVgqRx8BYHYOWv1uI84JJ0LHrcneczCI="; }; diff --git a/pkgs/development/python-modules/confection/default.nix b/pkgs/development/python-modules/confection/default.nix index 6275a6963faa..8015aea9ce82 100644 --- a/pkgs/development/python-modules/confection/default.nix +++ b/pkgs/development/python-modules/confection/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "explosion"; - repo = pname; + repo = "confection"; tag = "v${version}"; hash = "sha256-1XIo9Hg4whYS1AkFeX8nVnpv+IvnpmyydHYdVYS0xZc="; }; diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix index cf5397b27472..832a98eec3f4 100644 --- a/pkgs/development/python-modules/configobj/default.nix +++ b/pkgs/development/python-modules/configobj/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DiffSK"; - repo = pname; + repo = "configobj"; tag = "v${version}"; hash = "sha256-duPCGBaHCXp4A6ZHLnyL1SZtR7K4FJ4hs5wCE1V9WB4="; }; diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index 59ba5a4b3faf..e713f0166406 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "beetbox"; - repo = pname; + repo = "confuse"; rev = "v${version}"; hash = "sha256-zdH5DNXnuAfYTuaG9EIKiXL2EbLSfzYjPSkC3G06bU8="; }; diff --git a/pkgs/development/python-modules/connio/default.nix b/pkgs/development/python-modules/connio/default.nix index ea5f7f5518fd..8cc851b8a347 100644 --- a/pkgs/development/python-modules/connio/default.nix +++ b/pkgs/development/python-modules/connio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tiagocoutinho"; - repo = pname; + repo = "connio"; tag = "v${version}"; hash = "sha256-fPM7Ya69t0jpZhKM2MTk6BwjvoW3a8SV3k000LB9Ypo="; }; diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index e4c2e9bd8ec0..bddc8486013d 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fitnr"; - repo = pname; + repo = "convertdate"; rev = "v${version}"; hash = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE="; }; diff --git a/pkgs/development/python-modules/crc32c/default.nix b/pkgs/development/python-modules/crc32c/default.nix index 1aa1b5f97f97..7b454bb8e040 100644 --- a/pkgs/development/python-modules/crc32c/default.nix +++ b/pkgs/development/python-modules/crc32c/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ICRAR"; - repo = pname; + repo = "crc32c"; tag = "v${version}"; hash = "sha256-WBFiAbdzV719vPdZkRGei2+Y33RroMZ7FeQmWo/OfE0="; }; diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix index 0639c1e021bb..0f2cf892241f 100644 --- a/pkgs/development/python-modules/cryptg/default.nix +++ b/pkgs/development/python-modules/cryptg/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cher-nov"; - repo = pname; + repo = "cryptg"; rev = "v${version}"; hash = "sha256-GCTVxCJQvpvHpzaU+OaFM/AKoRvxLyA0u6VIV+94UTY="; }; diff --git a/pkgs/development/python-modules/crysp/default.nix b/pkgs/development/python-modules/crysp/default.nix index d3a555a6d801..98bf52f12411 100644 --- a/pkgs/development/python-modules/crysp/default.nix +++ b/pkgs/development/python-modules/crysp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdcht"; - repo = pname; + repo = "crysp"; rev = "v${version}"; hash = "sha256-51SKS6OOXIFT1L3YICR6a4QGSz/rbB8V+Z0u0jMO474="; }; diff --git a/pkgs/development/python-modules/dacite/default.nix b/pkgs/development/python-modules/dacite/default.nix index 5041a06a8e16..4284b119c59d 100644 --- a/pkgs/development/python-modules/dacite/default.nix +++ b/pkgs/development/python-modules/dacite/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "konradhalas"; - repo = pname; + repo = "dacite"; tag = "v${version}"; hash = "sha256-lvObQ+jyBH2s4GOwyDXEAYmG7ZGQN9WDqL8ftNItPCQ="; }; diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 0172982442af..4f333c494567 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "databricks"; - repo = pname; + repo = "databricks-cli"; tag = version; hash = "sha256-dH95C2AY/B6F9BROr6rh+gVtKqxsg1gyEU5MzCd5aqs="; }; diff --git a/pkgs/development/python-modules/datasette-publish-fly/default.nix b/pkgs/development/python-modules/datasette-publish-fly/default.nix index 8f07081fa624..f31f9b3e9ca7 100644 --- a/pkgs/development/python-modules/datasette-publish-fly/default.nix +++ b/pkgs/development/python-modules/datasette-publish-fly/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; - repo = pname; + repo = "datasette-publish-fly"; tag = version; hash = "sha256-diaxr+fNNgkJvLGkLo+lK0ThTsXYDePFsvTetMbDRMk="; }; diff --git a/pkgs/development/python-modules/datasette-template-sql/default.nix b/pkgs/development/python-modules/datasette-template-sql/default.nix index 5bdb48aa28cb..cdc245458b43 100644 --- a/pkgs/development/python-modules/datasette-template-sql/default.nix +++ b/pkgs/development/python-modules/datasette-template-sql/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; - repo = pname; + repo = "datasette-template-sql"; rev = version; hash = "sha256-VmdIEDk3iCBFrTPMm6ud00Z5CWqO0Wk707IQ4oVx5ak="; }; diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index e963fb7e8377..10bd7e91037b 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; - repo = pname; + repo = "datasette"; tag = version; hash = "sha256-kVtldBuDy19DmyxEQLtAjs1qiNIjaT8+rnHlFfGNHec="; }; diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 27b0050763c3..5c5938de82b2 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "h2oai"; - repo = pname; + repo = "datatable"; rev = "9522f0833d3e965656396de4fffebd882d39c25d"; hash = "sha256-lEXQwhx2msnJkkRrTkAwYttlYTISyH/Z7dSalqRrOhI="; }; diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index 6164495bd4e7..e914ece39546 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dbt-labs"; - repo = pname; + repo = "dbt-common"; rev = "03e09c01f20573975e8e17776a4b7c9088b3f212"; # They don't tag releases hash = "sha256-KqnwlFZZRYuWRflMzjrqCPBnzY9q/pPhceM2DGqz5bw="; }; diff --git a/pkgs/development/python-modules/dbus-python-client-gen/default.nix b/pkgs/development/python-modules/dbus-python-client-gen/default.nix index d645149b3c21..14812cda3591 100644 --- a/pkgs/development/python-modules/dbus-python-client-gen/default.nix +++ b/pkgs/development/python-modules/dbus-python-client-gen/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stratis-storage"; - repo = pname; + repo = "dbus-python-client-gen"; tag = "v${version}"; hash = "sha256-4Y4cL254ZlZKF6d6cStIOya3J4ZfypuumwKOdDNzuNc="; }; diff --git a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix index aa3892ee9aaa..41a09d8e4a3a 100644 --- a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix +++ b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stratis-storage"; - repo = pname; + repo = "dbus-signature-pyparsing"; rev = "v${version}"; hash = "sha256-+jY8kg3jBDpZr5doih3DiyUEcSskq7TgubmW3qdBoZM="; }; diff --git a/pkgs/development/python-modules/debuglater/default.nix b/pkgs/development/python-modules/debuglater/default.nix index 83e06a5fd5e2..f5867b3a60db 100644 --- a/pkgs/development/python-modules/debuglater/default.nix +++ b/pkgs/development/python-modules/debuglater/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ploomber"; - repo = pname; + repo = "debuglater"; tag = version; hash = "sha256-o9IAk3EN8ghEft7Y7Xx+sEjWMNgoyiZ0eiBqnCyXkm8="; }; diff --git a/pkgs/development/python-modules/decli/default.nix b/pkgs/development/python-modules/decli/default.nix index d682fe826c2e..5eb381bfb1cd 100644 --- a/pkgs/development/python-modules/decli/default.nix +++ b/pkgs/development/python-modules/decli/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "woile"; - repo = pname; + repo = "decli"; tag = "v${version}"; hash = "sha256-FZYKNKkQExx/YBn5y/W0+0aMlenuwEctYTL7LAXMZGE="; }; diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 2ed542631881..1c0af2da2344 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "13.2.0"; + version = "13.2.1"; pyproject = true; disabled = pythonOlder "3.13"; @@ -29,12 +29,12 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; tag = version; - hash = "sha256-0DGOdfr6vqtgYwabhJWfxV2kACzixiCnqPNssPHyLhw="; + hash = "sha256-6R9ihxe63YMVgVk+5R9pDNT3a/c9lK28wNleVb5NcRA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-A/axIsDfpWNLQXeExshzlJfKWh5yFZYqxDQYPn1+fHg="; + hash = "sha256-GNqoP/Zz5xHl2cLz7AqRKXsfLXgdLbgXSK8EdBWtOAU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/deepwave/default.nix b/pkgs/development/python-modules/deepwave/default.nix index 56b9765686e8..1a7b07fc6507 100644 --- a/pkgs/development/python-modules/deepwave/default.nix +++ b/pkgs/development/python-modules/deepwave/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ar4"; - repo = pname; + repo = "deepwave"; rev = "v${version}"; hash = "sha256-DOOy+B12jgwJzQ90qzX50OFxYLPRcVdVYSE5gi3pqDM="; }; diff --git a/pkgs/development/python-modules/deploykit/default.nix b/pkgs/development/python-modules/deploykit/default.nix index e2882a7fa7f5..0b2b6bde553d 100644 --- a/pkgs/development/python-modules/deploykit/default.nix +++ b/pkgs/development/python-modules/deploykit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "numtide"; - repo = pname; + repo = "deploykit"; rev = version; hash = "sha256-7PiXq1bQJ1jswLHNqCDSYZabgfp8HRuRt5YPGzd5Ej0="; }; diff --git a/pkgs/development/python-modules/desktop-entry-lib/default.nix b/pkgs/development/python-modules/desktop-entry-lib/default.nix index 6582d0fd283a..1c84612d8f60 100644 --- a/pkgs/development/python-modules/desktop-entry-lib/default.nix +++ b/pkgs/development/python-modules/desktop-entry-lib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitea { domain = "codeberg.org"; owner = "JakobDev"; - repo = pname; + repo = "desktop-entry-lib"; rev = version; hash = "sha256-+c+FuLv88wc4yVw3iyFFtfbocnWzTCIe2DS0SWoj+VI="; }; diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix index d7ce89ac8412..4957308ec4e2 100644 --- a/pkgs/development/python-modules/detect-secrets/default.nix +++ b/pkgs/development/python-modules/detect-secrets/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Yelp"; - repo = pname; + repo = "detect-secrets"; tag = "v${version}"; hash = "sha256-pNLAZUJhjZ3b01XaltJUJ9O7Blv6/pHQrRvURe7MJ5A="; leaveDotGit = true; diff --git a/pkgs/development/python-modules/dicom-numpy/default.nix b/pkgs/development/python-modules/dicom-numpy/default.nix index 1c0b57397d21..d71677bcf74e 100644 --- a/pkgs/development/python-modules/dicom-numpy/default.nix +++ b/pkgs/development/python-modules/dicom-numpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "innolitics"; - repo = pname; + repo = "dicom-numpy"; tag = "v${version}"; hash = "sha256-pgmREQlstr0GY2ThIWt4hbcSWmaNWgkr2gO4PSgGHqE="; }; diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index bb426fd4d483..7d73fbebd6cf 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # no tests in PyPI dist src = fetchFromGitHub { owner = "icometrix"; - repo = pname; + repo = "dicom2nifti"; tag = version; hash = "sha256-lPaBKqYO8B138fCgeKH6vpwGQhN3JCOnDj5PgaYfRPA="; }; diff --git a/pkgs/development/python-modules/dicomweb-client/default.nix b/pkgs/development/python-modules/dicomweb-client/default.nix index 8f232be99b0f..0e886d8325b0 100644 --- a/pkgs/development/python-modules/dicomweb-client/default.nix +++ b/pkgs/development/python-modules/dicomweb-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ImagingDataCommons"; - repo = pname; + repo = "dicomweb-client"; tag = "v${version}"; hash = "sha256-D3j5EujrEdGTfR8/V3o2VJ/VkGdZ8IifPYMhP4ppXhw="; }; diff --git a/pkgs/development/python-modules/dictdiffer/default.nix b/pkgs/development/python-modules/dictdiffer/default.nix index 496c3d51af71..bea434d0d500 100644 --- a/pkgs/development/python-modules/dictdiffer/default.nix +++ b/pkgs/development/python-modules/dictdiffer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "inveniosoftware"; - repo = pname; + repo = "dictdiffer"; rev = "v${version}"; hash = "sha256-lQyPs3lQWtsvNPuvvwJUTDzrFaOX5uwGuRHe3yWUheU="; }; diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index ca2b5ae1742b..66e1a226f05d 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "uqfoundation"; - repo = pname; + repo = "dill"; tag = version; hash = "sha256-p+W0ppNMfSgplKsQjaTnTrMvQ5poF/E/xSzsiLf9h58="; }; diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix index c0cbd3bc477b..9e73d0a60013 100644 --- a/pkgs/development/python-modules/dinghy/default.nix +++ b/pkgs/development/python-modules/dinghy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nedbat"; - repo = pname; + repo = "dinghy"; tag = version; hash = "sha256-51BXQdDxlI6+3ctDSa/6tyRXBb1E9BVej9qy7WtkOGM="; }; diff --git a/pkgs/development/python-modules/django-celery-email/default.nix b/pkgs/development/python-modules/django-celery-email/default.nix index ea7608ffca47..214551453f08 100644 --- a/pkgs/development/python-modules/django-celery-email/default.nix +++ b/pkgs/development/python-modules/django-celery-email/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pmclanahan"; - repo = pname; + repo = "django-celery-email"; rev = version; hash = "sha256-LBavz5Nh2ObmIwLCem8nHvsuKgPwkzbS/OzFPmSje/M="; }; diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 5f79cec0bcf7..46fcb57a0da0 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -31,8 +31,8 @@ buildPythonPackage rec { pyproject = true; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "django-extensions"; + repo = "django-extensions"; tag = version; hash = "sha256-WgO/bDe4anQCc1q2Gdq3W70yDqDgmsvn39Qf9ZNVXuE="; }; diff --git a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix index 0f8ab4fed5ec..8569e756d5ee 100644 --- a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "flavors"; - repo = pname; + repo = "django-graphiql-debug-toolbar"; rev = version; sha256 = "0fikr7xl786jqfkjdifymqpqnxy4qj8g3nlkgfm24wwq0za719dw"; }; diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix index 8a8f7a8effe9..31c909237db2 100644 --- a/pkgs/development/python-modules/django-logentry-admin/default.nix +++ b/pkgs/development/python-modules/django-logentry-admin/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "yprez"; - repo = pname; + repo = "django-logentry-admin"; rev = "v${version}"; sha256 = "1bndxgvisw8kk52zfdifvly6dl4833wqilxf77pg473172yaf5gq"; }; diff --git a/pkgs/development/python-modules/django-login-required-middleware/default.nix b/pkgs/development/python-modules/django-login-required-middleware/default.nix index 858dc88b0ff8..05932eacd61d 100644 --- a/pkgs/development/python-modules/django-login-required-middleware/default.nix +++ b/pkgs/development/python-modules/django-login-required-middleware/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CleitonDeLima"; - repo = pname; + repo = "django-login-required-middleware"; tag = version; hash = "sha256-WFQ/JvKh6gkUxPV27QBd2TzwFS8hfQGmcTInTnmh6iA="; }; diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index cf9685e0b2ac..2d9b0cec0608 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jimfunk"; - repo = pname; + repo = "django-postgresql-netfields"; rev = "v${version}"; hash = "sha256-76vGvxxfNZQBCCsTkkSgQZ8PpFspWxJQDj/xq9iOSTU="; }; diff --git a/pkgs/development/python-modules/django-prometheus/default.nix b/pkgs/development/python-modules/django-prometheus/default.nix index e15174d56ae4..3e2c03771bf4 100644 --- a/pkgs/development/python-modules/django-prometheus/default.nix +++ b/pkgs/development/python-modules/django-prometheus/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "korfuri"; - repo = pname; + repo = "django-prometheus"; rev = "v${version}"; hash = "sha256-JiLH+4mmNdb9BN81J5YFiMPna/3gaKUK6ARjmCa3fE8="; }; diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index 83532ebac162..9d5c228222c1 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rq"; - repo = pname; + repo = "django-rq"; tag = "v${version}"; hash = "sha256-f4ilMKMWNr/NVKRhylr0fFiKFEKHXU/zIlPnq7fCYNs="; }; diff --git a/pkgs/development/python-modules/django-timezone-field/default.nix b/pkgs/development/python-modules/django-timezone-field/default.nix index 978ae2e8e39e..b0efb077d46b 100644 --- a/pkgs/development/python-modules/django-timezone-field/default.nix +++ b/pkgs/development/python-modules/django-timezone-field/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mfogel"; - repo = pname; + repo = "django-timezone-field"; rev = version; hash = "sha256-q06TuYkBA4z6tJdT3an6Z8o1i/o85XbYa1JYZBHC8lI="; }; diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix index c25c580fb741..70abed4ba86c 100644 --- a/pkgs/development/python-modules/django-vite/default.nix +++ b/pkgs/development/python-modules/django-vite/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MrBin99"; - repo = pname; + repo = "django-vite"; tag = version; hash = "sha256-S5DpU0Sw0TOY1SNici6djeTrvg4gehH/a2UCzju1e/s="; }; diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 188d0d2bc487..7e87e8aa5dc9 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; - repo = pname; + repo = "docformatter"; tag = "v${version}"; hash = "sha256-eLjaHso1p/nD9K0E+HkeBbnCnvjZ1sdpfww9tzBh0TI="; }; diff --git a/pkgs/development/python-modules/docstring-to-markdown/default.nix b/pkgs/development/python-modules/docstring-to-markdown/default.nix index 20d510e2cb4c..ae8696f13418 100644 --- a/pkgs/development/python-modules/docstring-to-markdown/default.nix +++ b/pkgs/development/python-modules/docstring-to-markdown/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-lsp"; - repo = pname; + repo = "docstring-to-markdown"; tag = "v${version}"; hash = "sha256-ykqY7LFIOTuAddYkKDzIltq8FpLVz4v2ZA3Y0cZH9ms="; }; diff --git a/pkgs/development/python-modules/doit-py/default.nix b/pkgs/development/python-modules/doit-py/default.nix index 8ebaadbcf2e7..fef956d5b07a 100644 --- a/pkgs/development/python-modules/doit-py/default.nix +++ b/pkgs/development/python-modules/doit-py/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pydoit"; - repo = pname; + repo = "doit-py"; rev = version; hash = "sha256-DBl6/no04ZGRHHmN9gkEtBmAMgmyZWcfPCcFz0uxAv4="; }; diff --git a/pkgs/development/python-modules/dparse2/default.nix b/pkgs/development/python-modules/dparse2/default.nix index 6d0b23f28c54..c035109a6034 100644 --- a/pkgs/development/python-modules/dparse2/default.nix +++ b/pkgs/development/python-modules/dparse2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nexB"; - repo = pname; + repo = "dparse2"; tag = version; hash = "sha256-JUTL+SVf1RRIXQqwFR7MnExsgGseSiO0a5YzzcqdXHw="; }; diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index 53ef911b8814..92a7d861a404 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nschloe"; - repo = pname; + repo = "dufte"; rev = "v${version}"; hash = "sha256:0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48"; }; diff --git a/pkgs/development/python-modules/dungeon-eos/default.nix b/pkgs/development/python-modules/dungeon-eos/default.nix index d4282575c88b..260a86af32fe 100644 --- a/pkgs/development/python-modules/dungeon-eos/default.nix +++ b/pkgs/development/python-modules/dungeon-eos/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; + repo = "dungeon-eos"; rev = version; hash = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY="; }; diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix index d4e7b1c43627..71bdcd1b40a4 100644 --- a/pkgs/development/python-modules/echo/default.nix +++ b/pkgs/development/python-modules/echo/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "glue-viz"; - repo = pname; + repo = "echo"; tag = "v${version}"; sha256 = "sha256-RlTscoStJQ0vjrrk14xHRsMZOJt8eJSqinc4rY/lW4k="; }; diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index f1dfca43a7d9..b2ee35c71ebe 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "olofk"; - repo = pname; + repo = "edalize"; tag = "v${version}"; hash = "sha256-5c3Szq0tXQdlyzFTFCla44qB/O6RK8vezVOaFOv8sw4="; }; diff --git a/pkgs/development/python-modules/editdistance-s/default.nix b/pkgs/development/python-modules/editdistance-s/default.nix index e0ae8a91703d..a50fe7321dfc 100644 --- a/pkgs/development/python-modules/editdistance-s/default.nix +++ b/pkgs/development/python-modules/editdistance-s/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asottile"; - repo = pname; + repo = "editdistance-s"; rev = "v${version}"; sha256 = "0w2qd5b6a3c3ahd0xy9ykq4wzqk0byqwdqrr26dyn8j2425j46lg"; }; diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix index c56e4f1d8d80..49aeb3227b13 100644 --- a/pkgs/development/python-modules/editdistance/default.nix +++ b/pkgs/development/python-modules/editdistance/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "roy-ht"; - repo = pname; + repo = "editdistance"; tag = "v${version}"; hash = "sha256-Ncdg8S/UHYqJ1uFnHk9qhHMM3Lrop00woSu3PLKvuBI="; }; diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix index a24f75f1a8ee..27ff8b695636 100644 --- a/pkgs/development/python-modules/einops/default.nix +++ b/pkgs/development/python-modules/einops/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arogozhnikov"; - repo = pname; + repo = "einops"; tag = "v${version}"; hash = "sha256-6x9AttvSvgYrHaS5ESKOwyEnXxD2BitYTGtqqSKur+0="; }; diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix index f66a80ec9908..08e93d47802d 100644 --- a/pkgs/development/python-modules/elegy/default.nix +++ b/pkgs/development/python-modules/elegy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "poets-ai"; - repo = pname; + repo = "elegy"; tag = version; hash = "sha256-FZmLriYhsX+zyQKCtCjbOy6MH+AvjzHRNUyaDSXGlLI="; }; diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix index 49d3b046f13a..1223908209ec 100644 --- a/pkgs/development/python-modules/elmax-api/default.nix +++ b/pkgs/development/python-modules/elmax-api/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "albertogeniola"; - repo = pname; + repo = "elmax-api"; tag = "v${version}"; hash = "sha256-BYVfP8B+p4J4gW+64xh9bT9sDcu/lk0R+MvLsYLwRfQ="; }; diff --git a/pkgs/development/python-modules/embedding-reader/default.nix b/pkgs/development/python-modules/embedding-reader/default.nix index b585c85fde17..72a8373ae9e3 100644 --- a/pkgs/development/python-modules/embedding-reader/default.nix +++ b/pkgs/development/python-modules/embedding-reader/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rom1504"; - repo = pname; + repo = "embedding-reader"; tag = version; hash = "sha256-paN6rAyH3L7qCfWPr5kXo9Xl57gRMhdcDnoyLJ7II2w="; }; diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index a5cd8a86f793..f276a239f6b7 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dfm"; - repo = pname; + repo = "emcee"; tag = "v${version}"; hash = "sha256-JVZK3kvDwWENho0OxZ9OxATcm3XpGmX+e7alPclRsHY="; }; diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index 9763b60108cc..29514f25f826 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nucleic"; - repo = pname; + repo = "enaml"; tag = version; hash = "sha256-XwBvPABg4DomI5JNuqaRTINsPgjn8h67rO/ZkSRQ39o="; }; diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix index cc1ee749e025..ad0e92622975 100644 --- a/pkgs/development/python-modules/enamlx/default.nix +++ b/pkgs/development/python-modules/enamlx/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frmdstryr"; - repo = pname; + repo = "enamlx"; tag = "v${version}"; hash = "sha256-C3/G0bnu1EQh0elqdrpCwkFPZU4qmkUX7WRSRK9nkM4="; }; diff --git a/pkgs/development/python-modules/energyflip-client/default.nix b/pkgs/development/python-modules/energyflip-client/default.nix index 6dc18ec4c286..032d4886884a 100644 --- a/pkgs/development/python-modules/energyflip-client/default.nix +++ b/pkgs/development/python-modules/energyflip-client/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dennisschroer"; - repo = pname; + repo = "energyflip-client"; tag = "v${version}"; hash = "sha256-neuZ6pZWW/Rgexu/iCEymjnxi5l/IuLKPFn6S9U4DgU="; }; diff --git a/pkgs/development/python-modules/enturclient/default.nix b/pkgs/development/python-modules/enturclient/default.nix index 372bdf17e075..213e5941b74b 100644 --- a/pkgs/development/python-modules/enturclient/default.nix +++ b/pkgs/development/python-modules/enturclient/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hfurubotten"; - repo = pname; + repo = "enturclient"; rev = "v${version}"; hash = "sha256-Y2sBPikCAxumylP1LUy8XgjBRCWaNryn5XHSrRjJIIo="; }; diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix index b3189941d6ba..355a4e27aee4 100644 --- a/pkgs/development/python-modules/eradicate/default.nix +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wemake-services"; - repo = pname; + repo = "eradicate"; tag = version; hash = "sha256-ikiqNe1a+OeRraNBbtAx6v3LsTajWlgxm4wR2Tcbmjk="; }; diff --git a/pkgs/development/python-modules/eternalegypt/default.nix b/pkgs/development/python-modules/eternalegypt/default.nix index 5945cdd4cdf6..e1e103482e62 100644 --- a/pkgs/development/python-modules/eternalegypt/default.nix +++ b/pkgs/development/python-modules/eternalegypt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amelchio"; - repo = pname; + repo = "eternalegypt"; tag = "v${version}"; hash = "sha256-ubKepd3yBaoYrIUe5WCt1zd4CjvU7SeftOR+2cBaEf0="; }; diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index 58c766811fe1..b43c3b0c25af 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alexmojaki"; - repo = pname; + repo = "executing"; rev = "v${version}"; hash = "sha256-2BT4VTZBAJx8Gk4qTTyhSoBMjJvKzmL4PO8IfTpN+2g="; }; diff --git a/pkgs/development/python-modules/expects/default.nix b/pkgs/development/python-modules/expects/default.nix index a36769259e36..b2115b67f000 100644 --- a/pkgs/development/python-modules/expects/default.nix +++ b/pkgs/development/python-modules/expects/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaimegildesagredo"; - repo = pname; + repo = "expects"; rev = "v${version}"; sha256 = "0mk1mhh8n9ly820krkhazn1w96f10vmgh21y2wr44sn8vwr4ngyy"; }; diff --git a/pkgs/development/python-modules/f90nml/default.nix b/pkgs/development/python-modules/f90nml/default.nix index 0a0f735e901a..ce6c584ba9f7 100644 --- a/pkgs/development/python-modules/f90nml/default.nix +++ b/pkgs/development/python-modules/f90nml/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "marshallward"; - repo = pname; + repo = "f90nml"; rev = "v" + version; hash = "sha256-nSpVBAS2VvXIQwYK/qVVzEc13bicAQ+ScXpO4Rn2O+8="; }; diff --git a/pkgs/development/python-modules/fabulous/default.nix b/pkgs/development/python-modules/fabulous/default.nix index d94227989c49..2bb4897ba45b 100644 --- a/pkgs/development/python-modules/fabulous/default.nix +++ b/pkgs/development/python-modules/fabulous/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jart"; - repo = pname; + repo = "fabulous"; rev = version; hash = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4="; }; diff --git a/pkgs/development/python-modules/fairseq/default.nix b/pkgs/development/python-modules/fairseq/default.nix index aa2932bbf91f..c5e6bcd22f20 100644 --- a/pkgs/development/python-modules/fairseq/default.nix +++ b/pkgs/development/python-modules/fairseq/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytorch"; - repo = pname; + repo = "fairseq"; rev = "v${version}"; hash = "sha256-XX/grU5ljQCwx33miGoFc/7Uj9fZDtmhm4Fz7L4U+Bc="; }; diff --git a/pkgs/development/python-modules/farama-notifications/default.nix b/pkgs/development/python-modules/farama-notifications/default.nix index c04c3a50a584..c2b4e7b4e1ac 100644 --- a/pkgs/development/python-modules/farama-notifications/default.nix +++ b/pkgs/development/python-modules/farama-notifications/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Farama-Foundation"; - repo = pname; + repo = "farama-notifications"; rev = version; hash = "sha256-UUrJ/5t5x54xs1gweNUhwqrMJQXiyrUPn1bBfTsiPcw="; }; diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 0493f6890fa2..1a6ae674d8ad 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -24,8 +24,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "fastavro"; + repo = "fastavro"; tag = version; hash = "sha256-/YZFrEs7abm+oPn9yyLMV1X/G5VZ/s+ThpvzoQtYQu0="; }; diff --git a/pkgs/development/python-modules/fastdtw/default.nix b/pkgs/development/python-modules/fastdtw/default.nix index 5d55886302b0..2164f63c51a1 100644 --- a/pkgs/development/python-modules/fastdtw/default.nix +++ b/pkgs/development/python-modules/fastdtw/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "slaypni"; - repo = pname; + repo = "fastdtw"; rev = "v${version}"; sha256 = "0irc5x4ahfp7f7q4ic97qa898s2awi0vdjznahxrfjirn8b157dw"; }; diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 92baedf38efe..3a3cc351da94 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "harlowja"; - repo = pname; + repo = "fasteners"; tag = version; hash = "sha256-XFa1ItFqkSYE940p/imWFp5e9gS6n+D1uM6Cj+Vzmmg="; }; diff --git a/pkgs/development/python-modules/fastnumbers/default.nix b/pkgs/development/python-modules/fastnumbers/default.nix index 8e5d27e4dbe9..142d3a76355c 100644 --- a/pkgs/development/python-modules/fastnumbers/default.nix +++ b/pkgs/development/python-modules/fastnumbers/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SethMMorton"; - repo = pname; + repo = "fastnumbers"; tag = version; hash = "sha256-TC9+xOvskABpChlrSJcHy6O7D7EnIKL6Ekt/vaLBX2E="; }; diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix index 27e505a24641..b9631adb65ae 100644 --- a/pkgs/development/python-modules/fastrlock/default.nix +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scoder"; - repo = pname; + repo = "fastrlock"; tag = "v${version}"; hash = "sha256-NB/AR6g1ZP5Atc0zwZNuXLsxg8BM67rWnx3Q6Pb0k5k="; }; diff --git a/pkgs/development/python-modules/fixerio/default.nix b/pkgs/development/python-modules/fixerio/default.nix index 550181765263..8d8da7ae122a 100644 --- a/pkgs/development/python-modules/fixerio/default.nix +++ b/pkgs/development/python-modules/fixerio/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amatellanes"; - repo = pname; + repo = "fixerio"; rev = "v${version}"; sha256 = "009h1mys175xdyznn5bl980vly40544s4ph1zcgqwg2i2ic93gvb"; }; diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index 4a549d78eda0..6f09f07af8f2 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; - repo = pname; + repo = "flake8-bugbear"; tag = version; hash = "sha256-ZMIpQUF+aXiq2NG0v19UwhWszrW/l50aJmG4YDV0+Wg="; }; diff --git a/pkgs/development/python-modules/flake8-docstrings/default.nix b/pkgs/development/python-modules/flake8-docstrings/default.nix index 92176f0b000a..bc2553e9555b 100644 --- a/pkgs/development/python-modules/flake8-docstrings/default.nix +++ b/pkgs/development/python-modules/flake8-docstrings/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; - repo = pname; + repo = "flake8-docstrings"; tag = version; hash = "sha256-EafLWySeHB81HRcXiDs56lbUZzGvnT87WVqln0PoLCk="; }; diff --git a/pkgs/development/python-modules/flask-bcrypt/default.nix b/pkgs/development/python-modules/flask-bcrypt/default.nix index da98864cf818..a1f4cacc0cf6 100644 --- a/pkgs/development/python-modules/flask-bcrypt/default.nix +++ b/pkgs/development/python-modules/flask-bcrypt/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "maxcountryman"; - repo = pname; + repo = "flask-bcrypt"; rev = version; hash = "sha256-WlIholi/nzq6Ikc0LS6FhG0Q5Kz0kvvAlA2YJ7EksZ4="; }; diff --git a/pkgs/development/python-modules/flask-expects-json/default.nix b/pkgs/development/python-modules/flask-expects-json/default.nix index a0598642d497..bb51592428d9 100644 --- a/pkgs/development/python-modules/flask-expects-json/default.nix +++ b/pkgs/development/python-modules/flask-expects-json/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Fischerfredl"; - repo = pname; + repo = "flask-expects-json"; rev = version; hash = "sha256-CUxuwqjjAb9Fy6xWtX1WtSANYaYr5//vY8k89KghYoQ="; }; diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 8fa9a2333561..ef9574a22581 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MongoEngine"; - repo = pname; + repo = "flask-mongoengine"; rev = "d4526139cb1e2e94111ab7de96bb629d574c1690"; hash = "sha256-oMQU9Z8boc0q+0KzIQAZ8qSyxiITDY0M9FCg75S9MEY="; }; diff --git a/pkgs/development/python-modules/flask-paranoid/default.nix b/pkgs/development/python-modules/flask-paranoid/default.nix index 0e4d49127ae9..fa63c693ba8c 100644 --- a/pkgs/development/python-modules/flask-paranoid/default.nix +++ b/pkgs/development/python-modules/flask-paranoid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miguelgrinberg"; - repo = pname; + repo = "flask-paranoid"; rev = "v${version}"; hash = "sha256-tikD8efc3Q3xIQnaC3SSBaCRQxMI1HzXxeupvYeNnE4="; }; diff --git a/pkgs/development/python-modules/flatdict/default.nix b/pkgs/development/python-modules/flatdict/default.nix index d0aacabfbbca..12efe3ac686d 100644 --- a/pkgs/development/python-modules/flatdict/default.nix +++ b/pkgs/development/python-modules/flatdict/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gmr"; - repo = pname; + repo = "flatdict"; rev = version; hash = "sha256-CWsTiCNdIKSQtjpQC07lhZoU1hXT/MGpXdj649x2GlU="; }; diff --git a/pkgs/development/python-modules/flatten-dict/default.nix b/pkgs/development/python-modules/flatten-dict/default.nix index 9f50f2c7dab9..7b03cc00fc6a 100644 --- a/pkgs/development/python-modules/flatten-dict/default.nix +++ b/pkgs/development/python-modules/flatten-dict/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ianlini"; - repo = pname; + repo = "flatten-dict"; rev = version; hash = "sha256-uHenKoD4eLm9sMREVuV0BB/oUgh4NMiuj+IWd0hlxNQ="; }; diff --git a/pkgs/development/python-modules/flowlogs-reader/default.nix b/pkgs/development/python-modules/flowlogs-reader/default.nix index fb46314afab7..b74212f95f63 100644 --- a/pkgs/development/python-modules/flowlogs-reader/default.nix +++ b/pkgs/development/python-modules/flowlogs-reader/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "obsrvbl"; - repo = pname; + repo = "flowlogs-reader"; # https://github.com/obsrvbl/flowlogs-reader/issues/57 tag = "v${version}"; hash = "sha256-9UwCRLRKuIFRTh3ntAzlXCyN175J1wobT3GSLAhl+08="; diff --git a/pkgs/development/python-modules/flyingsquid/default.nix b/pkgs/development/python-modules/flyingsquid/default.nix index 2fe656646db3..fda3ae6613f0 100644 --- a/pkgs/development/python-modules/flyingsquid/default.nix +++ b/pkgs/development/python-modules/flyingsquid/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "HazyResearch"; - repo = pname; + repo = "flyingsquid"; rev = "28a713a9ac501b7597c2489468ae189943d00685"; hash = "sha256-DPHTSxDD4EW3nrNk2fk0pKJI/8+pQ7Awywd8nxhBruo="; }; diff --git a/pkgs/development/python-modules/fontpens/default.nix b/pkgs/development/python-modules/fontpens/default.nix index 4267c7235127..8ea3cfdb7aa2 100644 --- a/pkgs/development/python-modules/fontpens/default.nix +++ b/pkgs/development/python-modules/fontpens/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robotools"; - repo = pname; + repo = "fontpens"; tag = "v${version}"; sha256 = "13msj0s7mg45klzbnd2w4f4ljb16bp9m0s872s6hczn0j7jmyz11"; }; diff --git a/pkgs/development/python-modules/formulae/default.nix b/pkgs/development/python-modules/formulae/default.nix index 278a0368e7c8..c08e987a7b65 100644 --- a/pkgs/development/python-modules/formulae/default.nix +++ b/pkgs/development/python-modules/formulae/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bambinos"; - repo = pname; + repo = "formulae"; tag = version; hash = "sha256-SSyQa7soIp+wSXX5wek9LG95q7J7K34mztzx01lPiWo="; }; diff --git a/pkgs/development/python-modules/fortiosapi/default.nix b/pkgs/development/python-modules/fortiosapi/default.nix index fce21f4c21f9..e34cdd3137ee 100644 --- a/pkgs/development/python-modules/fortiosapi/default.nix +++ b/pkgs/development/python-modules/fortiosapi/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fortinet-solutions-cse"; - repo = pname; + repo = "fortiosapi"; tag = "v${version}"; hash = "sha256-M71vleEhRYnlf+RSGT1GbCy5NEZaG0hWmJo01n9s6Rg="; }; diff --git a/pkgs/development/python-modules/fqdn/default.nix b/pkgs/development/python-modules/fqdn/default.nix index dd8f5b8d8ca8..4f896c084739 100644 --- a/pkgs/development/python-modules/fqdn/default.nix +++ b/pkgs/development/python-modules/fqdn/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ypcrts"; - repo = pname; + repo = "fqdn"; rev = "v${version}"; hash = "sha256-T0CdWWr8p3JVhp3nol5hyxsrD3951JE2EDpFt+m+3bE="; }; diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix index 4c67565fd5f3..4273647c5aba 100644 --- a/pkgs/development/python-modules/funcparserlib/default.nix +++ b/pkgs/development/python-modules/funcparserlib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vlasovskikh"; - repo = pname; + repo = "funcparserlib"; rev = version; hash = "sha256-LE9ItCaEzEGeahpM3M3sSnDBXEr6uX5ogEkO5x2Jgzc="; }; diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix index 24bf6109e8ac..e2226c211af3 100644 --- a/pkgs/development/python-modules/gbinder-python/default.nix +++ b/pkgs/development/python-modules/gbinder-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "erfanoabdi"; - repo = pname; + repo = "gbinder-python"; rev = version; sha256 = "1X9gAux9w/mCEVmE3Yqvvq3kU7hu4iAFaZWNZZZxt3E="; }; diff --git a/pkgs/development/python-modules/gekitchen/default.nix b/pkgs/development/python-modules/gekitchen/default.nix index 615be02d1785..e5fa2ed0db41 100644 --- a/pkgs/development/python-modules/gekitchen/default.nix +++ b/pkgs/development/python-modules/gekitchen/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ajmarks"; - repo = pname; + repo = "gekitchen"; rev = "v${version}"; hash = "sha256-eKGundh7j9LqFd71bx86rNBVu2iAcgLN25JfFa39+VA="; }; diff --git a/pkgs/development/python-modules/geniushub-client/default.nix b/pkgs/development/python-modules/geniushub-client/default.nix index 798a3c9e9abf..2ef2373e755a 100644 --- a/pkgs/development/python-modules/geniushub-client/default.nix +++ b/pkgs/development/python-modules/geniushub-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "manzanotti"; - repo = pname; + repo = "geniushub-client"; tag = "v${version}"; hash = "sha256-Gq2scYos7E8me1a4x7NanHRq2eYWuU2uSUwM+O1TPb8="; }; diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 8445794b392f..775044f95eef 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -17,8 +17,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "geopy"; + repo = "geopy"; tag = version; hash = "sha256-mlOXDEtYry1IUAZWrP2FuY/CGliUnCPYLULnLNN0n4Y="; }; diff --git a/pkgs/development/python-modules/ghrepo-stats/default.nix b/pkgs/development/python-modules/ghrepo-stats/default.nix index 33cbf91ca37f..f9fb5f2e166d 100644 --- a/pkgs/development/python-modules/ghrepo-stats/default.nix +++ b/pkgs/development/python-modules/ghrepo-stats/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mrbean-bremen"; - repo = pname; + repo = "ghrepo-stats"; tag = "v${version}"; hash = "sha256-zdBIX/uetkOAalg4uJPWXRL9WUgNN+hmqUwQDTdzrzA="; }; diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix index d03703b37e96..9e361e1cc81c 100644 --- a/pkgs/development/python-modules/gibberish-detector/default.nix +++ b/pkgs/development/python-modules/gibberish-detector/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "domanchi"; - repo = pname; + repo = "gibberish-detector"; rev = "v${version}"; sha256 = "1si0fkpnk9vjkwl31sq5jkyv3rz8a5f2nh3xq7591j9wv2b6dn0b"; }; diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index 3f3526b70481..47422563b928 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # Missing tests on PyPI src = fetchFromGitHub { owner = "mystor"; - repo = pname; + repo = "git-revise"; rev = "189c9fe150e5587def75c51709246c47c93e3b4d"; hash = "sha256-bqhRV0WtWRUKkBG2tEvctxdoYRkcrpL4JZSHYzox8so="; }; diff --git a/pkgs/development/python-modules/github-to-sqlite/default.nix b/pkgs/development/python-modules/github-to-sqlite/default.nix index 20ca2879ae3f..c1929acefd81 100644 --- a/pkgs/development/python-modules/github-to-sqlite/default.nix +++ b/pkgs/development/python-modules/github-to-sqlite/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dogsheep"; - repo = pname; + repo = "github-to-sqlite"; rev = version; hash = "sha256-KwLaaZxBBzRhiBv4p8Imb5XI1hyka9rmr/rxA6wDc7Q="; }; diff --git a/pkgs/development/python-modules/gpaw/default.nix b/pkgs/development/python-modules/gpaw/default.nix index 6d7791434b8e..d421dee6f0e9 100644 --- a/pkgs/development/python-modules/gpaw/default.nix +++ b/pkgs/development/python-modules/gpaw/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "gpaw"; - repo = pname; + repo = "gpaw"; rev = version; hash = "sha256-tdS383qT6hBr5hOqjoFS36nRSS2vdVkUR7sExwjWhng="; }; diff --git a/pkgs/development/python-modules/gpiozero/default.nix b/pkgs/development/python-modules/gpiozero/default.nix index b92c286aa261..30fb18a81f1d 100644 --- a/pkgs/development/python-modules/gpiozero/default.nix +++ b/pkgs/development/python-modules/gpiozero/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gpiozero"; - repo = pname; + repo = "gpiozero"; tag = "v${version}"; hash = "sha256-ifdCFcMH6SrhKQK/TJJ5lJafSfAUzd6ZT5ANUzJGwxI="; }; diff --git a/pkgs/development/python-modules/gps3/default.nix b/pkgs/development/python-modules/gps3/default.nix index 4f5cfb5d5b86..8a2a89998a96 100644 --- a/pkgs/development/python-modules/gps3/default.nix +++ b/pkgs/development/python-modules/gps3/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildPythonPackage rec { +buildPythonPackage { pname = "gps3"; version = "unstable-2017-11-01"; format = "setuptools"; src = fetchFromGitHub { owner = "wadda"; - repo = pname; + repo = "gps3"; rev = "91adcd7073b891b135b2a46d039ce2125cf09a09"; hash = "sha256-sVK61l8YunKAGFTSAq/m5aUGFfnizwhqTYbdznBIKfk="; }; diff --git a/pkgs/development/python-modules/gpxpy/default.nix b/pkgs/development/python-modules/gpxpy/default.nix index 640f2b4d6fe1..74cb4e096d91 100644 --- a/pkgs/development/python-modules/gpxpy/default.nix +++ b/pkgs/development/python-modules/gpxpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tkrajina"; - repo = pname; + repo = "gpxpy"; rev = "v${version}"; hash = "sha256-s65k0u4LIwHX9RJMJIYMkNS4/Z0wstzqYVPAjydo2iI="; }; diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix index 275dda93c06a..08db11be0e4f 100644 --- a/pkgs/development/python-modules/gpytorch/default.nix +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cornellius-gp"; - repo = pname; + repo = "gpytorch"; tag = "v${version}"; hash = "sha256-whZjqAs3nyjKMzAGi+OnyBtboq0UuV8m11A4IzkWtec="; }; diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix index 5fb7241d6431..7f35f03ac290 100644 --- a/pkgs/development/python-modules/gradient-utils/default.nix +++ b/pkgs/development/python-modules/gradient-utils/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Paperspace"; - repo = pname; + repo = "gradient-utils"; tag = "v${version}"; hash = "sha256-swnl0phdOsBSP8AX/OySI/aYI9z60Ss3SsJox/mb9KY="; }; diff --git a/pkgs/development/python-modules/grafanalib/default.nix b/pkgs/development/python-modules/grafanalib/default.nix index ba4a78746689..f25dac27ce0a 100644 --- a/pkgs/development/python-modules/grafanalib/default.nix +++ b/pkgs/development/python-modules/grafanalib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "weaveworks"; - repo = pname; + repo = "grafanalib"; tag = "v${version}"; hash = "sha256-vXnyAfC9avKz8U4+MJVnu2zoPD0nR2qarWYidhEPW5s="; }; diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix index c447d061e4a2..03f9ca4a0dbf 100644 --- a/pkgs/development/python-modules/grandalf/default.nix +++ b/pkgs/development/python-modules/grandalf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdcht"; - repo = pname; + repo = "grandalf"; rev = "v${version}"; hash = "sha256-j2SvpQvDMfwoj2PAQSxzEIyIzzJ61Eb9wgetKyni6A4="; }; diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 7cc96eab7712..bc5c4bc06614 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "graphql-python"; - repo = pname; + repo = "graphene-django"; tag = "v${version}"; hash = "sha256-uMkzgXn3YRgEU46Sv5lg60cvetHir9bv0mzJGDv79DI="; }; diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix index 7d19247c2a34..c774c8c39d88 100644 --- a/pkgs/development/python-modules/graphql-server-core/default.nix +++ b/pkgs/development/python-modules/graphql-server-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "graphql-python"; - repo = pname; + repo = "graphql-server-core"; rev = "v${version}"; sha256 = "1w3biv2za2m1brwjy0z049c2m94gm1zfwxzgc6lwrsci724jv9fr"; }; diff --git a/pkgs/development/python-modules/grpc-interceptor/default.nix b/pkgs/development/python-modules/grpc-interceptor/default.nix index 59863d735d78..7120f41222a6 100644 --- a/pkgs/development/python-modules/grpc-interceptor/default.nix +++ b/pkgs/development/python-modules/grpc-interceptor/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "d5h-foss"; - repo = pname; + repo = "grpc-interceptor"; tag = "v${version}"; hash = "sha256-GJkVCslPXShJNDrqhFtCsAK5+VaG8qFJo0RQTsiMIFY="; }; diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix index 23843c4c7d51..56e29e3272e7 100644 --- a/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/pkgs/development/python-modules/gruut-ipa/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rhasspy"; - repo = pname; + repo = "gruut-ipa"; rev = "v${version}"; hash = "sha256-Q2UKELoG8OaAPxIrZNCpXgeWZ2fCzb3g3SOVzCm/gg0="; }; diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index 48e0147f55aa..8c187be4cbba 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sckott"; - repo = pname; + repo = "habanero"; tag = "v${version}"; hash = "sha256-tEsuCOuRXJleiv02VGLVSg0ykh3Yu77uZzE6vhf5PaQ="; }; diff --git a/pkgs/development/python-modules/hachoir/default.nix b/pkgs/development/python-modules/hachoir/default.nix index ff83aaa546e6..7d371f166563 100644 --- a/pkgs/development/python-modules/hachoir/default.nix +++ b/pkgs/development/python-modules/hachoir/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vstinner"; - repo = pname; + repo = "hachoir"; tag = version; hash = "sha256-sTUJx8Xyhw4Z6juRtREw/okuVjSTSVWpSLKeZ7T8IR8="; }; diff --git a/pkgs/development/python-modules/hatch-odoo/default.nix b/pkgs/development/python-modules/hatch-odoo/default.nix index 6e4d0c500b45..86822cc28388 100644 --- a/pkgs/development/python-modules/hatch-odoo/default.nix +++ b/pkgs/development/python-modules/hatch-odoo/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "acsone"; - repo = pname; + repo = "hatch-odoo"; tag = version; sha256 = "sha256-I3jaiG0Xu8B34q30p7zTs+FeBXUQiPKTAJLSVxE9gYE="; }; diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix index f7fe24743c7b..3592cbf86d80 100644 --- a/pkgs/development/python-modules/hatch-vcs/default.nix +++ b/pkgs/development/python-modules/hatch-vcs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "hatch-vcs"; version = "0.4.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -22,9 +22,9 @@ buildPythonPackage rec { hash = "sha256-CTgQdI/gHbDUUfq88sGsJojK79Iy1O3pZwkLHBsH2fc="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ hatchling setuptools-scm ]; diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix index 930d743b7bf0..533f3c74c9cd 100644 --- a/pkgs/development/python-modules/helper/default.nix +++ b/pkgs/development/python-modules/helper/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gmr"; - repo = pname; + repo = "helper"; rev = version; sha256 = "0zypjv8rncvrsgl200v7d3bn08gs48dwqvgamfqv71h07cj6zngp"; }; diff --git a/pkgs/development/python-modules/hiyapyco/default.nix b/pkgs/development/python-modules/hiyapyco/default.nix index 20a2ea207a36..98de45b7604c 100644 --- a/pkgs/development/python-modules/hiyapyco/default.nix +++ b/pkgs/development/python-modules/hiyapyco/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zerwes"; - repo = pname; + repo = "hiyapyco"; tag = "release-${version}"; hash = "sha256-uF5DblAg4q8L1tZKopcjJ14NIQVQF5flNHdZ/jnw71M="; }; diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix index 40d2653d6c0d..023c697abaf8 100644 --- a/pkgs/development/python-modules/hocr-tools/default.nix +++ b/pkgs/development/python-modules/hocr-tools/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tmbdev"; - repo = pname; + repo = "hocr-tools"; rev = "v${version}"; sha256 = "14f9hkp7pr677085w8iidwd0la9cjzy3pyj3rdg9b03nz9pc0w6p"; }; diff --git a/pkgs/development/python-modules/hologram/default.nix b/pkgs/development/python-modules/hologram/default.nix index c78b85deeb4e..b908e4126552 100644 --- a/pkgs/development/python-modules/hologram/default.nix +++ b/pkgs/development/python-modules/hologram/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dbt-labs"; - repo = pname; + repo = "hologram"; tag = "v${version}"; hash = "sha256-DboVCvByI8bTThamGBwSiQADGxIaEnTMmwmVI+4ARgc="; }; diff --git a/pkgs/development/python-modules/homepluscontrol/default.nix b/pkgs/development/python-modules/homepluscontrol/default.nix index 7af19f73f6fe..056e26bc8f22 100644 --- a/pkgs/development/python-modules/homepluscontrol/default.nix +++ b/pkgs/development/python-modules/homepluscontrol/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chemaaa"; - repo = pname; + repo = "homepluscontrol"; rev = version; hash = "sha256-COOGqfYiR4tueQHXuCvVxShrYS0XNltcW4mclbFWcfA="; }; diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 81fb7a5199a0..6ac5440bf1c2 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kovidgoyal"; - repo = pname; + repo = "html5-parser"; tag = "v${version}"; hash = "sha256-0Qn+To/d3+HMx+KhhgJBEHVYPOfIeBnngBraY7r4uSs="; }; diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix index 47041ff971fa..83869dbe6380 100644 --- a/pkgs/development/python-modules/http-message-signatures/default.nix +++ b/pkgs/development/python-modules/http-message-signatures/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyauth"; - repo = pname; + repo = "http-message-signatures"; rev = "v${version}"; hash = "sha256-Jsivw4lNA/2oqsOGGx8D4gUPftzuys877A9RXyapnSQ="; }; diff --git a/pkgs/development/python-modules/http-parser/default.nix b/pkgs/development/python-modules/http-parser/default.nix index ba4151fb9f52..b959d65ad898 100644 --- a/pkgs/development/python-modules/http-parser/default.nix +++ b/pkgs/development/python-modules/http-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "benoitc"; - repo = pname; + repo = "http-parser"; tag = version; hash = "sha256-WHimvSaNcncwzLwwk5+ZNg7BbHF+hPr39SfidEDYfhU="; }; diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index a6c3e42a5317..f8e04b37146d 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -20,8 +20,8 @@ buildPythonPackage rec { format = "setuptools"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "httplib2"; + repo = "httplib2"; rev = "v${version}"; hash = "sha256-76gdiRbF535CEaNXwNqsVeVc0dKglovMPQpGsOkbd/4="; }; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index e63970de3118..17b2012c8b37 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; - repo = pname; + repo = "httpx"; tag = version; hash = "sha256-tB8uZm0kPRnmeOvsDdrkrHcMVIYfGanB4l/xHsTKpgE="; }; diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index 4a2534cebe84..c91c7ffd8c0b 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "coleifer"; - repo = pname; + repo = "huey"; tag = version; hash = "sha256-Avy5aMYoeIhO7Q83s2W4o6RBMaVFdRBqa7HGNIGNOqE="; }; diff --git a/pkgs/development/python-modules/humblewx/default.nix b/pkgs/development/python-modules/humblewx/default.nix index 2a60e7e97212..e027d5569591 100644 --- a/pkgs/development/python-modules/humblewx/default.nix +++ b/pkgs/development/python-modules/humblewx/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thetimelineproj"; - repo = pname; + repo = "humblewx"; rev = version; sha256 = "0fv8gwlbcj000qq34inbwgxf0xgibs590dsyqnw0mmyb7f1iq210"; }; diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix index 84ffe3bcc7e3..e7c0a71a4834 100644 --- a/pkgs/development/python-modules/hydrawiser/default.nix +++ b/pkgs/development/python-modules/hydrawiser/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ptcryan"; - repo = pname; + repo = "hydrawiser"; rev = "v${version}"; sha256 = "161hazlpvd71xcl2ja86560wm5lnrjv210ki3ji37l6c6gwmhjdj"; }; diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix index 6c0285e8cadd..f19fe0ca85d5 100644 --- a/pkgs/development/python-modules/hyperion-py/default.nix +++ b/pkgs/development/python-modules/hyperion-py/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dermotduffy"; - repo = pname; + repo = "hyperion-py"; rev = "v${version}"; hash = "sha256-arcnpCQsRuiWCrAz/t4TCjTe8DRDtRuzYp8k7nnjGDk="; }; diff --git a/pkgs/development/python-modules/ibis/default.nix b/pkgs/development/python-modules/ibis/default.nix index 2300af234784..6e3cd882dc21 100644 --- a/pkgs/development/python-modules/ibis/default.nix +++ b/pkgs/development/python-modules/ibis/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dmulholl"; - repo = pname; + repo = "ibis"; rev = version; hash = "sha256-EPz9zHnxR75WoRaiHKJNiCRWFwU1TBpC4uHz62jUOqM="; }; diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix index 1ea2b702001b..e82d4e5b87f1 100644 --- a/pkgs/development/python-modules/icmplib/default.nix +++ b/pkgs/development/python-modules/icmplib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ValentinBELYN"; - repo = pname; + repo = "icmplib"; rev = "v${version}"; hash = "sha256-PnBcGiUvftz/KYg9Qd2GaIcF3OW4lYH301uI5/M5CBI="; }; diff --git a/pkgs/development/python-modules/icnsutil/default.nix b/pkgs/development/python-modules/icnsutil/default.nix index 4385c636d17e..0eee0595f0f2 100644 --- a/pkgs/development/python-modules/icnsutil/default.nix +++ b/pkgs/development/python-modules/icnsutil/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "relikd"; - repo = pname; + repo = "icnsutil"; tag = "v${version}"; hash = "sha256-tiq8h6s2noWLBIOIWcj8jfSqJFN01ee2uoHN4aFwn7s="; }; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 2307843d00d2..85ba22b81f08 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytorch"; - repo = pname; + repo = "ignite"; tag = "v${version}"; hash = "sha256-aWm+rj/9A7oNBW5jkMg/BRuEw2gQUJ88At1wB75FgNQ="; }; diff --git a/pkgs/development/python-modules/injector/default.nix b/pkgs/development/python-modules/injector/default.nix index 6bc01c5188ff..499c40918bad 100644 --- a/pkgs/development/python-modules/injector/default.nix +++ b/pkgs/development/python-modules/injector/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-injector"; - repo = pname; + repo = "injector"; tag = version; hash = "sha256-5O4vJSXfYNTrUzmv5XuT9pSUndNSvTZTxfVwiAd+0ck="; }; diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix index 1cfec3fc9328..7170c110673e 100644 --- a/pkgs/development/python-modules/installer/default.nix +++ b/pkgs/development/python-modules/installer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pypa"; - repo = pname; + repo = "installer"; rev = version; hash = "sha256-thHghU+1Alpay5r9Dc3v7ATRFfYKV8l9qR0nbGOOX/A="; }; diff --git a/pkgs/development/python-modules/into-dbus-python/default.nix b/pkgs/development/python-modules/into-dbus-python/default.nix index 004138c13bdb..62b3448473a2 100644 --- a/pkgs/development/python-modules/into-dbus-python/default.nix +++ b/pkgs/development/python-modules/into-dbus-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stratis-storage"; - repo = pname; + repo = "into-dbus-python"; rev = "v${version}"; hash = "sha256-Ld/DyhVaDiWUXgqmvSmEHqFW2dcoRNM0O4X5DXE3UtM="; }; diff --git a/pkgs/development/python-modules/invocations/default.nix b/pkgs/development/python-modules/invocations/default.nix index 85b09a100aec..abf5299df53c 100644 --- a/pkgs/development/python-modules/invocations/default.nix +++ b/pkgs/development/python-modules/invocations/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyinvoke"; - repo = pname; + repo = "invocations"; tag = version; hash = "sha256-JnhdcxhBNsYgDMcljtGKjOT1agujlao/66QifGuh6I0="; }; diff --git a/pkgs/development/python-modules/iodata/default.nix b/pkgs/development/python-modules/iodata/default.nix index 84b6dfd0a56b..2d5619c6434c 100644 --- a/pkgs/development/python-modules/iodata/default.nix +++ b/pkgs/development/python-modules/iodata/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "theochem"; - repo = pname; + repo = "iodata"; tag = "v${version}"; hash = "sha256-ld6V+/8lg4Du6+mHU5XuXXyMpWwyepXurerScg/bf2Q="; }; diff --git a/pkgs/development/python-modules/ipyxact/default.nix b/pkgs/development/python-modules/ipyxact/default.nix index 803ed5378cb4..2f4e700cf90f 100644 --- a/pkgs/development/python-modules/ipyxact/default.nix +++ b/pkgs/development/python-modules/ipyxact/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "olofk"; - repo = pname; + repo = "ipyxact"; rev = "v${version}"; hash = "sha256-myD+NnqcxxaSAV7qZa8xqeciaiFqFePqIzd7sb/2GXA="; }; diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix index 7fcb1280987f..d8d35a093d61 100644 --- a/pkgs/development/python-modules/ircrobots/default.nix +++ b/pkgs/development/python-modules/ircrobots/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jesopo"; - repo = pname; + repo = "ircrobots"; rev = "v${version}"; hash = "sha256-slz4AH2Mi21N3aV+OrnoXoQsseS7arW2NuUZARQJsf0="; }; diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix index 3efe469fe093..61065d492f9a 100644 --- a/pkgs/development/python-modules/ircstates/default.nix +++ b/pkgs/development/python-modules/ircstates/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jesopo"; - repo = pname; + repo = "ircstates"; rev = "v${version}"; hash = "sha256-Mq9aOj6PXzPjaz3ofoPcAbur59oUWffmEg8aHt0v+0Q="; }; diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix index 1e2b962d0f6a..5c5f74d01f9c 100644 --- a/pkgs/development/python-modules/irctokens/default.nix +++ b/pkgs/development/python-modules/irctokens/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jesopo"; - repo = pname; + repo = "irctokens"; rev = "v${version}"; hash = "sha256-Y9NBqxGUkt48hnXxsmfydHkJmWWb+sRrElV8C7l9bpw="; }; diff --git a/pkgs/development/python-modules/ismartgate/default.nix b/pkgs/development/python-modules/ismartgate/default.nix index 4b879add51e1..87e1cf31bf40 100644 --- a/pkgs/development/python-modules/ismartgate/default.nix +++ b/pkgs/development/python-modules/ismartgate/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; - repo = pname; + repo = "ismartgate"; tag = "v${version}"; hash = "sha256-8c05zzDav87gTL2CI7Aoi6ALwLw76H9xj+90xH31hdE="; }; diff --git a/pkgs/development/python-modules/isoduration/default.nix b/pkgs/development/python-modules/isoduration/default.nix index 613f21105d9b..fbe3c34f8f45 100644 --- a/pkgs/development/python-modules/isoduration/default.nix +++ b/pkgs/development/python-modules/isoduration/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bolsote"; - repo = pname; + repo = "isoduration"; rev = version; hash = "sha256-6LqsH+3V/K0s2YD1gvmelo+cCH+yCAmmyTYGhUegVdk="; }; diff --git a/pkgs/development/python-modules/itemdb/default.nix b/pkgs/development/python-modules/itemdb/default.nix index d2d508b5a8f7..20148a8b6d0c 100644 --- a/pkgs/development/python-modules/itemdb/default.nix +++ b/pkgs/development/python-modules/itemdb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # PyPI tarball doesn't include tests directory src = fetchFromGitHub { owner = "almarklein"; - repo = pname; + repo = "itemdb"; tag = "v${version}"; sha256 = "sha256-egxQ1tGC6R5p1stYm4r05+b2HkuT+nBySTZPGqeAbSE="; }; diff --git a/pkgs/development/python-modules/itunespy/default.nix b/pkgs/development/python-modules/itunespy/default.nix index 5a9b5edd6fa9..367b595356f9 100644 --- a/pkgs/development/python-modules/itunespy/default.nix +++ b/pkgs/development/python-modules/itunespy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sleepyfran"; - repo = pname; + repo = "itunespy"; tag = "v${version}"; sha256 = "sha256-QvSKJAZa8v0tGURXwo4Dwo73JqsYs1xsBHW0lcaM7bk="; }; diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix index a1e83de89c12..9f74eeaf392c 100644 --- a/pkgs/development/python-modules/itypes/default.nix +++ b/pkgs/development/python-modules/itypes/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { format = "setuptools"; src = fetchFromGitHub { - repo = pname; + repo = "itypes"; owner = "tomchristie"; rev = version; sha256 = "1ljhjp9pacbrv2phs58vppz1dlxix01p98kfhyclvbml6dgjcr52"; diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix index 46fef3318315..9fc6a0e2ea92 100644 --- a/pkgs/development/python-modules/mcpadapt/default.nix +++ b/pkgs/development/python-modules/mcpadapt/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "mcpadapt"; - version = "0.1.5"; + version = "0.1.9"; pyproject = true; src = fetchFromGitHub { owner = "grll"; repo = "mcpadapt"; tag = "v${version}"; - hash = "sha256-crxruowqZ5/tLH61w+M/862rbwELEnUktFuiZCOEBfw="; + hash = "sha256-sczXScP1wDUntAwVEfiGfJe0ghBpqPQH1YaXhFGj97Y="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/nltk/data-dir.nix b/pkgs/development/python-modules/nltk/data-dir.nix new file mode 100644 index 000000000000..d18ab730597b --- /dev/null +++ b/pkgs/development/python-modules/nltk/data-dir.nix @@ -0,0 +1,15 @@ +{ + lib, + pkgs, + python3Packages, +}: +lib.makeOverridable ( + { ... }@nltkDataPkgs: + f: + pkgs.symlinkJoin { + inherit (python3Packages.nltk) meta; + name = "nltk-data-dir"; + + paths = f nltkDataPkgs; + } +) python3Packages.nltk.data diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 4493348bb6da..4571f85bf23a 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,5 +1,6 @@ { lib, + pkgs, fetchPypi, buildPythonPackage, pythonOlder, @@ -7,6 +8,16 @@ joblib, regex, tqdm, + + # preInstallCheck + nltk, + + # nativeCheckInputs + matplotlib, + numpy, + pyparsing, + pytestCheckHook, + pytest-mock, }: buildPythonPackage rec { @@ -21,28 +32,78 @@ buildPythonPackage rec { hash = "sha256-h9EnvT3kvYmk+BJl5fpZyxsZmydEAXU3D3QX0rx66Gg="; }; - propagatedBuildInputs = [ + dependencies = [ click joblib regex tqdm ]; - # Tests require some data, the downloading of which is impure. It would - # probably make sense to make the data another derivation, but then feeding - # that into the tests (given that we need nltk itself to download the data, - # unless there's an easy way to download it without nltk's downloader) might - # be complicated. For now let's just disable the tests and hope for the - # best. - doCheck = false; + # Use new passthru function to pass dependencies required for testing + preInstallCheck = '' + export NLTK_DATA=${ + nltk.dataDir ( + d: with d; [ + averaged-perceptron-tagger-eng + averaged-perceptron-tagger-rus + brown + cess-cat + cess-esp + conll2007 + floresta + gutenberg + inaugural + indian + large-grammars + nombank-1-0 + omw-1-4 + pl196x + porter-test + ptb + punkt-tab + rte + sinica-treebank + stopwords + tagsets-json + treebank + twitter-samples + udhr + universal-tagset + wmt15-eval + wordnet + wordnet-ic + words + ] + ) + } + ''; + + nativeCheckInputs = [ + pytestCheckHook + matplotlib + numpy + pyparsing + pytest-mock + + pkgs.which + ]; + + disabledTestPaths = [ + "nltk/test/unit/test_downloader.py" # Touches network + ]; pythonImportsCheck = [ "nltk" ]; + passthru = { + data = pkgs.nltk-data; + dataDir = pkgs.callPackage ./data-dir.nix { }; + }; + meta = with lib; { description = "Natural Language Processing ToolKit"; mainProgram = "nltk"; homepage = "http://nltk.org/"; license = licenses.asl20; - maintainers = [ ]; + maintainers = [ lib.maintainers.bengsparks ]; }; } diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index db4d5cbca45f..e6a202f12159 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.7.1"; + version = "2.7.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "py-synologydsm-api"; tag = "v${version}"; - hash = "sha256-Wra0H43eS6kVamavR1lUeonqSIz/BAJBlhoWshDDhZ0="; + hash = "sha256-I9Ew3rBmgG+FuT66e8VgMa0WzAwr+ng5R8uYMzSyYyg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix deleted file mode 100644 index 901a2be7484f..000000000000 --- a/pkgs/development/python-modules/pyfantom/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchgit, -}: - -buildPythonPackage { - pname = "pyfantom"; - version = "unstable-2013-12-18"; - format = "setuptools"; - - src = fetchgit { - url = "http://git.ni.fr.eu.org/pyfantom.git"; - sha256 = "1m53n8bxslq5zmvcf7i1xzsgq5bdsf1z529br5ypmj5bg0s86j4q"; - }; - - # No tests included - doCheck = false; - - meta = with lib; { - homepage = "https://pyfantom.ni.fr.eu.org/"; - description = "Wrapper for the LEGO Mindstorms Fantom Driver"; - license = licenses.gpl2; - }; -} diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix index db12c570a113..7440a43e76db 100644 --- a/pkgs/development/python-modules/pylamarzocco/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pylamarzocco"; - version = "2.0.3"; + version = "2.0.4"; pyproject = true; disabled = pythonOlder "3.12"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pylamarzocco"; tag = "v${version}"; - hash = "sha256-zQbE+GMXwmdUSOd4xqgiC2QENFdLvcUS3JLKTz4rq8s="; + hash = "sha256-ING00Xz+ipEnwX+u4M6upN5aYX2JrKZS/ho6b72QyFw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix index 21014c67d5ee..942497db0cde 100644 --- a/pkgs/development/python-modules/python-ecobee-api/default.nix +++ b/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "python-ecobee-api"; - version = "0.2.20"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nkgilley"; repo = "python-ecobee-api"; tag = version; - hash = "sha256-ffCd109hweeKJn+nnsVo/kDVg3bam/WONZWJOA2EibE="; + hash = "sha256-dJ7dVceYfmJHvk2OEXtRW/U8h2jFDc2aC58WmqhyP+k="; }; build-system = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for talking to Ecobee thermostats"; homepage = "https://github.com/nkgilley/python-ecobee-api"; - changelog = "https://github.com/nkgilley/python-ecobee-api/releases/tag/${version}"; + changelog = "https://github.com/nkgilley/python-ecobee-api/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix index c7a795e44ee1..f89b1a595f62 100644 --- a/pkgs/development/python-modules/smolagents/default.nix +++ b/pkgs/development/python-modules/smolagents/default.nix @@ -3,6 +3,7 @@ stdenv, accelerate, buildPythonPackage, + boto3, docker, duckduckgo-search, fetchFromGitHub, @@ -33,21 +34,19 @@ buildPythonPackage rec { pname = "smolagents"; - version = "1.13.0"; + version = "1.16.1"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "smolagents"; tag = "v${version}"; - hash = "sha256-LZW2MsBowr2ttl3V5J3AlIxZijo++DwT02gBVaXXBXs="; + hash = "sha256-4G55fASE8D4UfqO7/j+2VjqdQ8FxFPLkYO2pl5sSlxw="; }; build-system = [ setuptools ]; - pythonRelaxDeps = [ - "pillow" - ]; + pythonRelaxDeps = [ "pillow" ]; dependencies = [ duckduckgo-search @@ -63,6 +62,7 @@ buildPythonPackage rec { optional-dependencies = { audio = [ soundfile ]; + bedrock = [ boto3 ]; docker = [ docker websocket-client @@ -118,9 +118,10 @@ buildPythonPackage rec { "test_ddgs_with_kwargs" "test_e2b_executor_instantiation" "test_flatten_messages_as_text_for_all_models" - "test_from_mcp" + "mcp" "test_import_smolagents_without_extras" "test_vision_web_browser_main" + "test_multiple_servers" # Tests require network access "test_agent_type_output" "test_call_different_providers_without_key" diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index 4b8ef9e99d5e..371708f7d0d0 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -16,18 +16,13 @@ python-dateutil, scipy, toml, - nltk-data, - symlinkJoin, }: let - testNltkData = symlinkJoin { - name = "nltk-test-data"; - paths = [ - nltk-data.punkt - nltk-data.punkt-tab - nltk-data.stopwords - ]; - }; + testNltkData = nltk.dataDir (d: [ + d.punkt + d.punkt-tab + d.stopwords + ]); version = "0.0.21"; tag = "v${version}"; diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix deleted file mode 100644 index da5da6112d83..000000000000 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildPythonPackage, - pythonAtLeast, - fetchFromGitHub, - setuptools, - pytest, -}: - -buildPythonPackage rec { - pname = "typed-ast"; - version = "1.5.5"; - pyproject = true; - - # error: unknown type name ‘PyFutureFeatures’ - disabled = pythonAtLeast "3.13"; - - src = fetchFromGitHub { - owner = "python"; - repo = "typed_ast"; - tag = version; - hash = "sha256-A/FA6ngu8/bbpKW9coJ7unm9GQezGuDhgBWjOhAxm2o="; - }; - - build-system = [ - setuptools - ]; - - nativeCheckInputs = [ pytest ]; - - preCheck = '' - rm -rf typed_ast - ''; - - pythonImportsCheck = [ - "typed_ast" - "typed_ast.ast27" - "typed_ast.ast3" - "typed_ast.conversions" - ]; - - meta = { - description = "Python AST modules with type comment support"; - homepage = "https://github.com/python/typed_ast"; - license = lib.licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix deleted file mode 100644 index 13713c669519..000000000000 --- a/pkgs/development/python-modules/types-typed-ast/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "types-typed-ast"; - version = "1.5.8.7"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-93lfb51ZezUhIxQEC5k/ZhO1HYFzjtzjweOj6e9lUSQ="; - }; - - # Module doesn't have tests - doCheck = false; - - pythonImportsCheck = [ "typed_ast-stubs" ]; - - meta = with lib; { - description = "Typing stubs for typed-ast"; - homepage = "https://github.com/python/typeshed"; - license = licenses.asl20; - maintainers = with maintainers; [ veehaitch ]; - }; -} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b58753f2464e..24a0bc183ba3 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 = "2025.5.2"; + version = "2025.5.3"; components = { "3_day_blinds" = ps: with ps; [ @@ -4087,7 +4087,19 @@ ]; "onedrive" = ps: with ps; [ + aiohasupervisor + cronsim + ha-ffmpeg + hass-nabucasa + hassil + home-assistant-intents + mutagen onedrive-personal-sdk + pymicro-vad + pyspeex-noise + python-matter-server + pyturbojpeg + securetar ]; "onewire" = ps: with ps; [ @@ -6899,6 +6911,7 @@ "elgato" "elkm1" "elmax" + "elvia" "emoncms" "emonitor" "emulated_hue" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 37069221a449..002257de09c3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -163,12 +163,12 @@ let }; }); - openhomedevice = super.openhomedevice.overridePythonAttrs (oldAttrs: rec { - version = "2.2"; + mcp = super.mcp.overridePythonAttrs (oldAttrs: rec { + version = "1.5.0"; src = fetchFromGitHub { inherit (oldAttrs.src) owner repo; - rev = "refs/tags/${version}"; - hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw="; + tag = "v${version}"; + hash = "sha256-Z2NN6k4mD6NixDON1MUOELpBZW9JvMvFErcCbFPdg2o="; }; }); @@ -194,6 +194,15 @@ let doCheck = false; # no tests }); + openhomedevice = super.openhomedevice.overridePythonAttrs (oldAttrs: rec { + version = "2.2"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/${version}"; + hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw="; + }; + }); + plexapi = super.plexapi.overrideAttrs (oldAttrs: rec { version = "4.15.16"; src = fetchFromGitHub { @@ -377,7 +386,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.5.2"; + hassVersion = "2025.5.3"; in python.pkgs.buildPythonApplication rec { @@ -398,13 +407,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-el5s82R4MuTjUnMVXRQj4PhPxJxHoL6Jqvc6XRnJl8w="; + hash = "sha256-qqPO7dr+Sb1RKYoOV7MhT2E1FcW7lAKTTB0T+UzLwzk="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-lddnAM3fja9enPYRSonwSe1aG8t55jSJQNveWPwrhOE="; + hash = "sha256-8WusUfZEyoBPltVrDpDQVkbIFEHn1GGdA4Pt0Zb1+Fo="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 13d0d1e5df06..77e202cccae4 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.245"; + version = "0.13.246"; pyproject = true; disabled = pythonOlder "3.13"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-l/NStiw2tajXydNv9EDqRZ1ku2CeRdDOsHDFIEA9vdM="; + hash = "sha256-FTEDKnVVr6rNvUoSxOkyZrDfNYIUQGKmFt6eNKHI8FM="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 3882398665d1..7aae398e2d13 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 = "2025.5.2"; + version = "2025.5.3"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; tag = version; - hash = "sha256-jvXsGWVXviwC2KjMuRPdLy2uY5fkqsMALG1RZ3XvzvU="; + hash = "sha256-9RL6p68L3lvH5h/kBekiu1pqJ1mXEUB6nmp+qe0sAsg="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 303aff68c116..a2bb4400aa68 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -63,6 +63,10 @@ let }; extraDisabledTests = { + forecast_solar = [ + # language fixture mismatch + "test_enabling_disable_by_default" + ]; sensor = [ # Failed: Translation not found for sensor "test_validate_unit_change_convertible" @@ -78,9 +82,9 @@ let # tries to retrieve file from github "test_non_text_stdout_capture" ]; - stream = [ - # crashes with x265>=4.0 - "test_h265_video_is_hvc1" + smartthings = [ + # outdated snapshots + "test_all_entities" ]; websocket_api = [ # AssertionError: assert 'unknown_error' == 'template_error' diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index e0637893c92f..36d49ba424d9 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -9,9 +9,7 @@ jq, git, pkg-config, - yarn, - python3, - esbuild, + runCommand, nodejs, node-gyp, libsecret, @@ -20,17 +18,11 @@ ripgrep, cctools, nixosTests, + prefetch-npm-deps, }: - let - system = stdenv.hostPlatform.system; - yarn' = yarn.override { inherit nodejs; }; - defaultYarnOpts = [ - "frozen-lockfile" - "non-interactive" - "no-progress" - ]; + system = stdenv.hostPlatform.system; vsBuildTarget = { @@ -41,74 +33,76 @@ let } .${system} or (throw "Unsupported system ${system}"); - esbuild' = esbuild.override { - buildGoModule = - args: - buildGoModule ( - args - // rec { - version = "0.17.14"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - hash = "sha256-4TC1d5FOZHUMuEMTcTOBLZZM+sFUswhyblI5HVWyvPA="; - }; - vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - } - ); - }; - - # replaces esbuild's download script with a binary from nixpkgs - patchEsbuild = path: version: '' - mkdir -p ${path}/node_modules/esbuild/bin - jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json - sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js - ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild - ''; in stdenv.mkDerivation (finalAttrs: { pname = "openvscode-server"; - version = "1.88.1"; + version = "1.99.3"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${finalAttrs.version}"; - hash = "sha256-Yc16L13Z8AmsGoSFbvy+4+KBdHxvqLMwZLeU2/dAQVU="; + hash = "sha256-nA+StCJgutWjD7vgCCcj9B91QSF7dEHnlNtj7zgJRwI="; }; - yarnCache = stdenv.mkDerivation { - name = "${finalAttrs.pname}-${finalAttrs.version}-${system}-yarn-cache"; - inherit (finalAttrs) src; - nativeBuildInputs = [ - cacert - yarn' - git - ]; - buildPhase = '' - export HOME=$PWD + ## fetchNpmDeps doesn't correctly process git dependencies + ## presumably because of https://github.com/npm/cli/issues/5170 + ## therefore, we're fetching all the node_module folders into + ## a single FOD, and unpack it in configurePhase + nodeModules = + runCommand "openvscode-server-node-modules" + { + inherit (finalAttrs) src nativeBuildInputs; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "sha256-lgzNpWFAIGNxjDZ60kRw80fP1qEItk3FN1s5t7KdxGA="; + env = { + FORCE_EMPTY_CACHE = true; + FORCE_GIT_DEPS = true; + npm_config_progress = false; + npm_config_cafile = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + }; + } + '' + runPhase unpackPhase + export HOME=$TMPDIR/home + mkdir $out + for p in $(find -name package-lock.json) + do ( + ${prefetch-npm-deps}/bin/prefetch-npm-deps "$p" "$out" + local lockpath=$out/lockfiles/$p + mkdir -p "$(dirname $lockpath)" + mv $out/package-lock.json "$lockpath" + ) + done + ''; - yarn config set yarn-offline-mirror $out - find "$PWD" -name "yarn.lock" -printf "%h\n" | \ - xargs -I {} yarn --cwd {} \ - --frozen-lockfile --ignore-scripts --ignore-platform \ - --ignore-engines --no-progress --non-interactive - ''; + env = { + NODE_OPTIONS = "--openssl-legacy-provider"; + NODE_ENV = "development"; - installPhase = '' - echo yarnCache - ''; + # skip unnecessary binary downloads + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"; + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + # ensure the correct node-gyp (from nixpkgs) is used + NIX_NODEJS_BUILDNPMPACKAGE = "1"; + npm_config_nodedir = nodejs; + npm_config_node_gyp = "${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"; + + # use local npm cache (see ) + npm_config_cache = finalAttrs.nodeModules; + npm_config_offline = true; + npm_config_progress = false; + + # for --fixup-lockfile + prefetchNpmDeps = "${prefetch-npm-deps}/bin/prefetch-npm-deps"; + forceGitDeps = true; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "sha256-89c6GYLT2RzHqwxBKegYqB6g5rEJ6/nH53cnfV7b0Ts="; }; - nativeBuildInputs = [ nodejs - yarn' - python3 + nodejs.python pkg-config makeWrapper git @@ -127,111 +121,110 @@ stdenv.mkDerivation (finalAttrs: { cctools ]; - patches = [ - # Patch out remote download of nodejs from build script - ./remove-node-download.patch - ]; - - # Disable NAPI_EXPERIMENTAL to allow to build with Node.js≥18.20.0. - env.NIX_CFLAGS_COMPILE = "-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT"; - - postPatch = '' - export HOME=$PWD - - # remove all built-in extensions, as these are 3rd party extensions that - # get downloaded from vscode marketplace - jq --slurp '.[0] * .[1]' "product.json" <( - cat << EOF - { - "builtInExtensions": [] - } - EOF - ) | sponge product.json - ''; - - configurePhase = '' - runHook preConfigure - - # set default yarn opts - ${lib.concatMapStrings (option: '' - yarn --offline config set ${option} - '') defaultYarnOpts} - - # set offline mirror to yarn cache we created in previous steps - yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}" - - # set nodedir to prevent node-gyp from downloading headers - # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific - mkdir -p $HOME/.node-gyp/${nodejs.version} - echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion - ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} - export npm_config_nodedir=${nodejs} - - # use updated node-gyp. fixes the following error on Darwin: - # PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil' - export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js - - runHook postConfigure - ''; - - buildPhase = + # remove all built-in extensions, as these are 3rd party extensions that + # get downloaded from vscode marketplace + postPatch = '' - runHook preBuild + jq --slurp '.[0] * .[1]' "product.json" <( + cat << EOF + { + "builtInExtensions": [] + } + EOF + ) | sponge product.json + echo "Updated product.json" + '' + ## build/lib/node.ts picks up nodejs version from remote/.npmrc + ## and prefetches it into .build/node/v{version}/{target}/node + ## so we pre-seed it here + + '' + sed -i 's/target=.*/target="${nodejs.version}"/' remote/.npmrc + mkdir -p .build/node/v${nodejs.version}/${vsBuildTarget} + ln -s ${nodejs}/bin/node .build/node/v${nodejs.version}/${vsBuildTarget}/node + ''; - # install dependencies - yarn --offline --ignore-scripts + preConfigure = '' + export HOME=$TMPDIR/home + mkdir -p $HOME + mkdir -p $TMPDIR/cache/_cacache + # ln -s $nodeModules/_cacache/* $TMPDIR/cache/_cacache + # mkdir -p $TMPDIR/cache + cp -R $nodeModules/_cacache $TMPDIR/cache + chmod -R +w $TMPDIR/cache + export npm_config_cache=$TMPDIR/cache + ''; - # run yarn install everywhere, skipping postinstall so we can patch esbuild - find . -path "*node_modules" -prune -o \ - -path "./*/*" -name "yarn.lock" -printf "%h\n" | \ - xargs -I {} yarn --cwd {} \ - --frozen-lockfile --offline --ignore-scripts --ignore-engines - - ${patchEsbuild "./build" "0.12.6"} - ${patchEsbuild "./extensions" "0.11.23"} - - # patch shebangs of node_modules to allow binary packages to build - patchShebangs ./remote/node_modules - - # put ripgrep binary into bin so postinstall does not try to download it + configurePhase = + '' + runHook preConfigure + '' + ## unpack all of the prefetched node_modules folders + + '' + for p in $(find -name package-lock.json -exec dirname {} \;) + do ( + echo "Setting up $p/node_modules" + cd $p + if [ -e node_modules ] + then + echo >&2 "File exists $p/node_modules" + exit 0 + fi + npm ci --ignore-scripts + patchShebangs node_modules + ) + done + '' + ## put ripgrep binary into bin so postinstall does not try to download it + + '' find -path "*@vscode/ripgrep" -type d \ -execdir mkdir -p {}/bin \; \ -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+ - # (see issue #101229) - pushd ./remote/node_modules/@parcel/watcher - mkdir -p ./build/Release - mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node - jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json - popd + ## pre-seed node-gyp + + '' + mkdir -p $HOME/.node-gyp/${nodejs.version} + echo 11 > $HOME/.node-gyp/${nodejs.version}/installVersion + ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} + '' + ## node-pty build fix + + '' + substituteInPlace remote/node_modules/node-pty/scripts/post-install.js \ + --replace-fail "npx node-gyp" "$npm_config_node_gyp" + '' + ## rebuild native binaries + + '' + echo >&2 "Rebuilding from source in ./remote" + npm --offline --prefix ./remote rebuild --build-from-source + '' + ## run postinstall scripts + + '' + find -name package.json -type f -exec sh -c ' + if jq -e ".scripts.postinstall" {} >- + then + echo >&2 "Running postinstall script in $(dirname {})" + npm --offline --prefix=$(dirname {}) run postinstall + fi + exit 0 + ' \; '' + '' - export NODE_OPTIONS=--openssl-legacy-provider - - # rebuild binaries, we use npm here, as yarn does not provide an alternative - # that would not attempt to try to reinstall everything and break our - # patching attempts - npm --prefix ./remote rebuild --build-from-source - - # run postinstall scripts after patching - find . -path "*node_modules" -prune -o \ - -path "./*/*" -name "yarn.lock" -printf "%h\n" | \ - xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true' - - # build and minify - yarn --offline gulp vscode-reh-web-${vsBuildTarget}-min - - runHook postBuild + runHook postConfigure ''; + buildPhase = '' + runHook preBuild + + npm run gulp vscode-reh-web-${vsBuildTarget}-min + + runHook postBuild + ''; + installPhase = '' runHook preInstall mkdir -p $out cp -R -T ../vscode-reh-web-${vsBuildTarget} $out - ln -s ${nodejs}/bin/node $out + ln -sf ${nodejs}/bin/node $out runHook postInstall ''; @@ -259,8 +252,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-darwin" "aarch64-darwin" ]; - # Depends on nodejs_18 that has been removed. - broken = true; mainProgram = "openvscode-server"; }; }) diff --git a/pkgs/servers/openvscode-server/remove-node-download.patch b/pkgs/servers/openvscode-server/remove-node-download.patch deleted file mode 100644 index f8df53770acc..000000000000 --- a/pkgs/servers/openvscode-server/remove-node-download.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js -index 4630eaad3cc..96b165b0949 100644 ---- a/build/gulpfile.reh.js -+++ b/build/gulpfile.reh.js -@@ -271,9 +271,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa - .pipe(util.stripSourceMappingURL()) - .pipe(jsFilter.restore); - -- const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`; -- const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); -- - let web = []; - if (type === 'reh-web') { - web = [ -@@ -290,7 +287,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa - license, - sources, - deps, -- node, - ...web - ); - -@@ -408,7 +404,6 @@ function tweakProductForServerWeb(product) { - const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; - - const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( -- gulp.task(`node-${platform}-${arch}`), - util.rimraf(path.join(BUILD_ROOT, destinationFolderName)), - packageTask(type, platform, arch, sourceFolderName, destinationFolderName) - )); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a6cf0e2bdd4d..dea3111f91e8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -517,6 +517,7 @@ mapAliases { dave = throw "'dave' has been removed as it has been archived upstream. Consider using 'webdav' instead"; # Added 2025-02-03 dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16 dbench = throw "'dbench' has been removed as it is unmaintained for 14 years and broken"; # Added 2025-05-17 + dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25 dbus-map = throw "'dbus-map' has been dropped as it is unmaintained"; # Added 2024-11-01 deadpixi-sam = deadpixi-sam-unstable; @@ -737,6 +738,7 @@ mapAliases { ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18 git-annex-utils = throw "'git-annex-utiks' has been removed as it is unmaintained"; # Added 2025-05-18 git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 + gjay = throw "'gjay' has been removed as it is unmaintained upstream"; # Added 2025-05-25 gmni = throw "gmni has been removed as it is no longer maintained upstream"; # Added 2025-05-02 gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28 gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1905b8625cf..21affad468e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14464,9 +14464,7 @@ with pkgs; vscode-generic = ../applications/editors/vscode/generic.nix; }; - openvscode-server = callPackage ../servers/openvscode-server { - nodejs = nodejs_20; - }; + openvscode-server = callPackage ../servers/openvscode-server { }; code-server = callPackage ../servers/code-server { nodejs = nodejs_20; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7bdfd480f5c8..b94e26f4121e 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -538,6 +538,7 @@ mapAliases ({ pychef = throw "pychef has been removed because it's been archived upstream and abandoned since 2017."; # added 2022-11-14 PyChromecast = pychromecast; # added 2023-02-19 pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28 + pyfantom = throw "pyfantom has been removed because it does not work with python3 and has not been updated for 12 years"; # added 2025-03-25 pyfftw = throw "pyfftw has been removed because it is unmaintained and broken."; # Added 2024-06-17 pyflunearyou = pyoutbreaksnearme; # added 2023-02-11 pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 @@ -777,9 +778,11 @@ mapAliases ({ twitter-common-lang = throw "twitter-common-lang has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-log = throw "twitter-common-log has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-options = throw "twitter-common-options has been removed because it is abandoned and unmaintained"; # added 2024-07-14 + typed-ast = throw "typed-ast was removed because it went end of life in July 2023"; # added 2025-05-24 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-enum34 = throw "types-enum34 is obselete since Python 3.4"; # added 2025-02-15 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 + types-typed-ast = throw "types-typed-ast was removed because so was typed-ast"; # added 2025-05-24 ufoLib2 = ufolib2; # added 2024-01-07 ukrainealarm = throw "ukrainealarm has been removed, as it has been replaced as a home-assistant dependency by uasiren."; # added 2024-01-05 unblob-native = throw "unblob-native has been removed because its functionality is merged into unblob 25.4.14."; # Added 2025-05-02 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a42f0d30369f..7517bfd26122 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10123,8 +10123,6 @@ self: super: with self; { notobuilder = callPackage ../development/python-modules/notobuilder { }; - nototools = callPackage ../development/python-modules/nototools { }; - notus-scanner = callPackage ../development/python-modules/notus-scanner { }; nox = callPackage ../development/python-modules/nox { }; @@ -12371,8 +12369,6 @@ self: super: with self; { pyfakewebcam = callPackage ../development/python-modules/pyfakewebcam { }; - pyfantom = callPackage ../development/python-modules/pyfantom { }; - pyfatfs = callPackage ../development/python-modules/pyfatfs { }; pyfcm = callPackage ../development/python-modules/pyfcm { }; @@ -17911,8 +17907,6 @@ self: super: with self; { inherit (pkgs) file zlib; }; - typed-ast = callPackage ../development/python-modules/typed-ast { }; - typed-settings = callPackage ../development/python-modules/typed-settings { }; typedunits = callPackage ../development/python-modules/typedunits { }; @@ -18357,8 +18351,6 @@ self: super: with self; { types-tqdm = callPackage ../development/python-modules/types-tqdm { }; - types-typed-ast = callPackage ../development/python-modules/types-typed-ast { }; - types-ujson = callPackage ../development/python-modules/types-ujson { }; types-urllib3 = callPackage ../development/python-modules/types-urllib3 { };