diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 0063ad1a12e9..b9a9c7e9dcbe 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -74,59 +74,24 @@ jobs: run: | nix-build untrusted/ci -A eval.singleSystem \ --argstr evalSystem "$MATRIX_SYSTEM" \ - --arg chunkSize 10000 + --arg chunkSize 10000 \ + --out-link merged # If it uses too much memory, slightly decrease chunkSize - name: Upload the output paths and eval stats uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: - name: intermediate-${{ matrix.system }} - path: result/* - - process: - name: Process - runs-on: ubuntu-24.04-arm - needs: [ prepare, outpaths ] - outputs: - targetRunId: ${{ steps.targetRunId.outputs.targetRunId }} - steps: - - name: Download output paths and eval stats for all systems - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 - with: - pattern: intermediate-* - path: intermediate - merge-multiple: true - - - name: Check out the PR at the test merge commit - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ needs.prepare.outputs.mergedSha }} - path: untrusted - - - name: Install Nix - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 - with: - extra_nix_config: sandbox = true - - - name: Combine all output paths and eval stats - run: | - nix-build untrusted/ci -A eval.combine \ - --arg resultsDir ./intermediate \ - -o prResult - - - name: Upload the combined results - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 - with: - name: result - path: prResult/* + name: merged-${{ matrix.system }} + path: merged/* - name: Get target run id if: needs.prepare.outputs.targetSha id: targetRunId env: + GH_TOKEN: ${{ github.token }} + MATRIX_SYSTEM: ${{ matrix.system }} REPOSITORY: ${{ github.repository }} TARGET_SHA: ${{ needs.prepare.outputs.targetSha }} - GH_TOKEN: ${{ github.token }} run: | # Get the latest eval.yml workflow run for the PR's target commit if ! run=$(gh api --method GET /repos/"$REPOSITORY"/actions/workflows/eval.yml/runs \ @@ -138,16 +103,24 @@ jobs: fi echo "Comparing against $(jq .html_url <<< "$run")" runId=$(jq .id <<< "$run") - conclusion=$(jq -r .conclusion <<< "$run") + + if ! job=$(gh api --method GET /repos/"$REPOSITORY"/actions/runs/"$runId"/jobs \ + --jq ".jobs[] | select (.name == \"Outpaths ($MATRIX_SYSTEM)\")") \ + || [[ -z "$job" ]]; then + echo "Could not find the Outpaths ($MATRIX_SYSTEM) job for workflow run $runId, cannot make comparison" + exit 1 + fi + jobId=$(jq .id <<< "$job") + conclusion=$(jq -r .conclusion <<< "$job") while [[ "$conclusion" == null || "$conclusion" == "" ]]; do - echo "Workflow not done, waiting 10 seconds before checking again" + echo "Job not done, waiting 10 seconds before checking again" sleep 10 - conclusion=$(gh api /repos/"$REPOSITORY"/actions/runs/"$runId" --jq '.conclusion') + conclusion=$(gh api /repos/"$REPOSITORY"/actions/jobs/"$jobId" --jq '.conclusion') done if [[ "$conclusion" != "success" ]]; then - echo "Workflow was not successful (conclusion: $conclusion), cannot make comparison" + echo "Job was not successful (conclusion: $conclusion), cannot make comparison" exit 1 fi @@ -156,78 +129,85 @@ jobs: - uses: actions/download-artifact@v4 if: steps.targetRunId.outputs.targetRunId with: - name: result - path: targetResult - merge-multiple: true - github-token: ${{ github.token }} run-id: ${{ steps.targetRunId.outputs.targetRunId }} + name: merged-${{ matrix.system }} + path: target + github-token: ${{ github.token }} + merge-multiple: true - - name: Compare against the target branch + - name: Compare outpaths against the target branch if: steps.targetRunId.outputs.targetRunId env: - AUTHOR_ID: ${{ github.event.pull_request.user.id }} + MATRIX_SYSTEM: ${{ matrix.system }} run: | - 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 + nix-build untrusted/ci -A eval.diff \ + --arg beforeDir ./target \ + --arg afterDir "$(readlink ./merged)" \ + --argstr evalSystem "$MATRIX_SYSTEM" \ + --out-link diff - # Use the target branch to get accurate maintainer info - nix-build trusted/ci -A eval.compare \ - --arg beforeResultDir ./targetResult \ - --arg afterResultDir "$(realpath prResult)" \ - --arg touchedFilesJson ./touched-files.json \ - --argstr githubAuthorId "$AUTHOR_ID" \ - -o comparison - - cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY" - - - name: Upload the combined results + - name: Upload outpaths diff and stats if: steps.targetRunId.outputs.targetRunId uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: - name: comparison - path: comparison/* + name: diff-${{ matrix.system }} + path: diff/* - # Separate job to have a very tightly scoped PR write token tag: name: Tag runs-on: ubuntu-24.04-arm - needs: [ prepare, process ] - if: needs.process.outputs.targetRunId + needs: [ prepare, outpaths ] + if: needs.prepare.outputs.targetSha permissions: pull-requests: write statuses: write steps: - # See ./codeowners-v2.yml, reuse the same App because we need the same permissions - # Can't use the token received from permissions above, because it can't get enough permissions - - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 - if: vars.OWNER_APP_ID - id: app-token - with: - app-id: ${{ vars.OWNER_APP_ID }} - private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }} - permission-administration: read - permission-members: read - permission-pull-requests: write - - - name: Download process result + - name: Download output paths and eval stats for all systems uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: - name: comparison - path: comparison + pattern: diff-* + path: diff + merge-multiple: true - - name: Install Nix - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 - - # 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 target commit + - name: Check out the PR at the target commit uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: ref: ${{ needs.prepare.outputs.targetSha }} path: trusted - sparse-checkout: ci + + - name: Install Nix + uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 + with: + extra_nix_config: sandbox = true + + - name: Combine all output paths and eval stats + run: | + nix-build trusted/ci -A eval.combine \ + --arg diffDir ./diff \ + --out-link combined + + - name: Compare against the target branch + env: + AUTHOR_ID: ${{ github.event.pull_request.user.id }} + run: | + git -C trusted fetch --depth 1 origin ${{ needs.prepare.outputs.mergedSha }} + git -C trusted diff --name-only ${{ needs.prepare.outputs.mergedSha }} \ + | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json + + # Use the target branch to get accurate maintainer info + nix-build trusted/ci -A eval.compare \ + --arg combinedDir "$(realpath ./combined)" \ + --arg touchedFilesJson ./touched-files.json \ + --argstr githubAuthorId "$AUTHOR_ID" \ + --out-link comparison + + cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY" + + - name: Upload the comparison results + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 + with: + name: comparison + path: comparison/* - name: Build the requestReviews derivation run: nix-build trusted/ci -A requestReviews @@ -286,6 +266,18 @@ jobs: "/repos/$GITHUB_REPOSITORY/statuses/$PR_HEAD_SHA" \ -f "context=Eval / Summary" -f "state=success" -f "description=$description" -f "target_url=$target_url" + # See ./codeowners-v2.yml, reuse the same App because we need the same permissions + # Can't use the token received from permissions above, because it can't get enough permissions + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 + if: vars.OWNER_APP_ID + id: app-token + with: + app-id: ${{ vars.OWNER_APP_ID }} + private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }} + permission-administration: read + permission-members: read + permission-pull-requests: write + - name: Requesting maintainer reviews if: ${{ steps.app-token.outputs.token && github.repository_owner == 'NixOS' }} env: diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix index 68456135629a..f6cf1ebe7856 100644 --- a/ci/eval/compare/default.nix +++ b/ci/eval/compare/default.nix @@ -7,8 +7,7 @@ python3, }: { - beforeResultDir, - afterResultDir, + combinedDir, touchedFilesJson, githubAuthorId, byName ? false, @@ -20,7 +19,7 @@ let --- Inputs: - - beforeResultDir, afterResultDir: The evaluation result from before and after the change. + - beforeDir, afterDir: The evaluation result from before and after the change. They can be obtained by running `nix-build -A ci.eval.full` on both revisions. --- @@ -66,7 +65,6 @@ let Example: { name = "python312Packages.numpy"; platform = "x86_64-linux"; } */ inherit (import ./utils.nix { inherit lib; }) - diff groupByKernel convertToPackagePlatformAttrs groupByPlatform @@ -74,22 +72,10 @@ let getLabels ; - getAttrs = - dir: - let - raw = builtins.readFile "${dir}/outpaths.json"; - # The file contains Nix paths; we need to ignore them for evaluation purposes, - # else there will be a "is not allowed to refer to a store path" error. - data = builtins.unsafeDiscardStringContext raw; - in - builtins.fromJSON data; - beforeAttrs = getAttrs beforeResultDir; - afterAttrs = getAttrs afterResultDir; - # Attrs # - keys: "added", "changed" and "removed" # - values: lists of `packagePlatformPath`s - diffAttrs = diff beforeAttrs afterAttrs; + diffAttrs = builtins.fromJSON (builtins.readFile "${combinedDir}/combined-diff.json"); rebuilds = diffAttrs.added ++ diffAttrs.changed; rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds; @@ -149,8 +135,8 @@ runCommand "compare" maintainers = builtins.toJSON maintainers; passAsFile = [ "maintainers" ]; env = { - BEFORE_DIR = "${beforeResultDir}"; - AFTER_DIR = "${afterResultDir}"; + BEFORE_DIR = "${combinedDir}/before"; + AFTER_DIR = "${combinedDir}/after"; }; } '' diff --git a/ci/eval/compare/utils.nix b/ci/eval/compare/utils.nix index 6e75b2a62790..064d2cf57ea1 100644 --- a/ci/eval/compare/utils.nix +++ b/ci/eval/compare/utils.nix @@ -93,32 +93,6 @@ rec { in uniqueStrings (builtins.map (p: p.name) packagePlatformAttrs); - /* - Computes the key difference between two attrs - - { - added: [ ], - removed: [ ], - changed: [ ], - } - */ - diff = - let - filterKeys = cond: attrs: lib.attrNames (lib.filterAttrs cond attrs); - in - old: new: { - added = filterKeys (n: _: !(old ? ${n})) new; - removed = filterKeys (n: _: !(new ? ${n})) old; - changed = filterKeys ( - n: v: - # Filter out attributes that don't exist anymore - (new ? ${n}) - - # Filter out attributes that are the same as the new value - && (v != (new.${n})) - ) old; - }; - /* Group a list of `packagePlatformAttr`s by platforms diff --git a/ci/eval/default.nix b/ci/eval/default.nix index 2e5ac008312f..82f69e1c9a44 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -191,11 +191,13 @@ let cat "$chunkOutputDir"/result/* | jq -s 'add | map_values(.outputs)' > $out/${evalSystem}/paths.json ''; + diff = callPackage ./diff.nix { }; + combine = { - resultsDir, + diffDir, }: - runCommand "combined-result" + runCommand "combined-eval" { nativeBuildInputs = [ jq @@ -205,12 +207,22 @@ let mkdir -p $out # Combine output paths from all systems - cat ${resultsDir}/*/paths.json | jq -s add > $out/outpaths.json + cat ${diffDir}/*/diff.json | jq -s ' + reduce .[] as $item ({}; { + added: (.added + $item.added), + changed: (.changed + $item.changed), + removed: (.removed + $item.removed) + }) + ' > $out/combined-diff.json - mkdir -p $out/stats + mkdir -p $out/before/stats + for d in ${diffDir}/before/*; do + cp -r "$d"/stats-by-chunk $out/before/stats/$(basename "$d") + done - for d in ${resultsDir}/*; do - cp -r "$d"/stats-by-chunk $out/stats/$(basename "$d") + mkdir -p $out/after/stats + for d in ${diffDir}/after/*; do + cp -r "$d"/stats-by-chunk $out/after/stats/$(basename "$d") done ''; @@ -225,18 +237,26 @@ let quickTest ? false, }: let - results = symlinkJoin { - name = "results"; + diffs = symlinkJoin { + name = "diffs"; paths = map ( evalSystem: - singleSystem { - inherit quickTest evalSystem chunkSize; + let + eval = singleSystem { + inherit quickTest evalSystem chunkSize; + }; + in + diff { + inherit evalSystem; + # Local "full" evaluation doesn't do a real diff. + beforeDir = eval; + afterDir = eval; } ) evalSystems; }; in combine { - resultsDir = results; + diffDir = diffs; }; in @@ -244,6 +264,7 @@ in inherit attrpathsSuperset singleSystem + diff combine compare # The above three are used by separate VMs in a GitHub workflow, diff --git a/ci/eval/diff.nix b/ci/eval/diff.nix new file mode 100644 index 000000000000..629b4f8d3a6a --- /dev/null +++ b/ci/eval/diff.nix @@ -0,0 +1,61 @@ +{ + lib, + runCommand, + writeText, +}: + +{ + beforeDir, + afterDir, + evalSystem, +}: + +let + /* + Computes the key difference between two attrs + + { + added: [ ], + removed: [ ], + changed: [ ], + } + */ + diff = + let + filterKeys = cond: attrs: lib.attrNames (lib.filterAttrs cond attrs); + in + old: new: { + added = filterKeys (n: _: !(old ? ${n})) new; + removed = filterKeys (n: _: !(new ? ${n})) old; + changed = filterKeys ( + n: v: + # Filter out attributes that don't exist anymore + (new ? ${n}) + + # Filter out attributes that are the same as the new value + && (v != (new.${n})) + ) old; + }; + + getAttrs = + dir: + let + raw = builtins.readFile "${dir}/${evalSystem}/paths.json"; + # The file contains Nix paths; we need to ignore them for evaluation purposes, + # else there will be a "is not allowed to refer to a store path" error. + data = builtins.unsafeDiscardStringContext raw; + in + builtins.fromJSON data; + + beforeAttrs = getAttrs beforeDir; + afterAttrs = getAttrs afterDir; + diffAttrs = diff beforeAttrs afterAttrs; + diffJson = writeText "diff.json" (builtins.toJSON diffAttrs); +in +runCommand "diff" { } '' + mkdir -p $out/${evalSystem} + + cp -r ${beforeDir} $out/before + cp -r ${afterDir} $out/after + cp ${diffJson} $out/${evalSystem}/diff.json +'' diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d9731063b760..2867ce402dc6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20858,6 +20858,12 @@ githubId = 3302; name = "Renzo Carbonara"; }; + repparw = { + email = "ubritos@gmail.com"; + github = "repparw"; + githubId = 45952970; + name = "repparw"; + }; reputable2772 = { name = "Reputable2772"; github = "Reputable2772"; diff --git a/nixos/modules/services/web-apps/readeck.nix b/nixos/modules/services/web-apps/readeck.nix index f0e7252f40bd..0e5b68fc5faa 100644 --- a/nixos/modules/services/web-apps/readeck.nix +++ b/nixos/modules/services/web-apps/readeck.nix @@ -57,7 +57,8 @@ in config = mkIf cfg.enable { systemd.services.readeck = { description = "Readeck"; - after = [ "network.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "simple"; diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix index a31f8a10bb37..35472c001333 100644 --- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { name = "amazon-q-vscode"; publisher = "AmazonWebServices"; - version = "1.67.0"; - hash = "sha256-1GShGk0ulYlpJpcdai7T2n0p2v1qicLE4X2d7Pqx4Zc="; + version = "1.69.0"; + hash = "sha256-DmkDkBItpcbCW3pQJ2j4SFJFubSL9jhfF66EDN96W5k="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 561d1a228364..2c6a4d755db3 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -786,8 +786,8 @@ let mktplcRef = { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.14.16"; - hash = "sha256-U2oZSIsLpqEqYBIEjSnIToEOOnTCUi4vR6XwjnNUDN8="; + version = "0.14.19"; + hash = "sha256-HgrUTrYHJNC8tS8qZza98Tr3T0O0NMb7DgddNf3m7XY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog"; @@ -1195,8 +1195,8 @@ let mktplcRef = { publisher = "DanielGavin"; name = "ols"; - version = "0.1.35"; - hash = "sha256-Kem8o0gM1+cYohmua17kIlAH1RURgqoc0sPuIFDVU8Q="; + version = "0.1.37"; + hash = "sha256-R2vZNv6vkq5OIw3RzaAm4WGC4awiCC4junB3DRpJIfs="; }; meta = { description = "Visual Studio Code extension for Odin language"; @@ -1210,8 +1210,8 @@ let mktplcRef = { publisher = "DanielSanMedium"; name = "dscodegpt"; - version = "3.12.3"; - hash = "sha256-9vv/ourveSqLQyHylbWpUuJDwnpsZLihC800qDLI3YY="; + version = "3.12.38"; + hash = "sha256-+9OsFH586I8/P7WzadRHS9tX22/bxOByJB2LDSqp2Nk="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; @@ -1700,8 +1700,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.27.2"; - hash = "sha256-PXQiZOAAApsYLB3hztQcjAsnmkfDSDtYvUmMhFUfLxA="; + version = "0.28.0"; + hash = "sha256-pHLAA7i2HJC523lPotUy5Zwa3BTSTurC2BA+eevdH38="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -2716,8 +2716,8 @@ let mktplcRef = { publisher = "jnoortheen"; name = "nix-ide"; - version = "0.4.16"; - hash = "sha256-MdFDOg9uTUzYtRW2Kk4L8V3T/87MRDy1HyXY9ikqDFY="; + version = "0.4.18"; + hash = "sha256-ucy1Z0VcikEIU+s/Ai2qgJcUkEoNcAo7y7A2nuq3yZo="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; @@ -3141,8 +3141,8 @@ let mktplcRef = { publisher = "maximedenes"; name = "vscoq"; - version = "2.2.5"; - hash = "sha256-ctaeTgdK1JijSI3YD54iWEBNVrbaad408wD43fH78h4="; + version = "2.2.6"; + hash = "sha256-QBUTOFhdksHGkpYqgQIF2u+WodYH5PmMMvGFHwEEEIk="; }; meta = { description = "VsCoq is an extension for Visual Studio Code (VS Code) and VSCodium with support for the Coq Proof Assistant"; @@ -3395,8 +3395,8 @@ let mktplcRef = { name = "datawrangler"; publisher = "ms-toolsai"; - version = "1.21.1"; - hash = "sha256-I701ziW0Ibs92MzCuMGHv5AjhYrD3ow4/3U9MgB1onY="; + version = "1.22.0"; + hash = "sha256-gUlb48g12RW4j2HS9jfpZROgtFM9zEPg4ozLM7hOaLk="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix b/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix index 53b23469eed7..f03ccea78b82 100644 --- a/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix +++ b/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "magic-racket"; publisher = "evzen-wybitul"; - version = "0.6.7"; - hash = "sha256-1A4j8710AYuV8gA+sybv6WSavPVcCPMvI71h4n4Jx0w="; + version = "0.7.0"; + hash = "sha256-8q2H9VPmdIAh4VmtGjIAwUfpr1P7+zmDLGiyCNbAXBU="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix index 7453f8f2fc69..0976cf6d1ea3 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.27.1"; - hash = "sha256-HXzPI8B4wISly2SQNdbFO6CEREfhey+SH4HhutxH7Mg="; + version = "0.27.2"; + hash = "sha256-nwBDQNs5qrA0TxQZVtuXRiOy0iBNOCFpIim0x2k37YA="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix index d1f2617f1775..668b086c4c78 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.322.0"; - hash = "sha256-PekZQeRqpCSSVQe+AA0XLAwC3K0LGtRMbfnN7MxfmGA="; + version = "1.323.0"; + hash = "sha256-rTAq6snn3HAARrYbMJYy7aZ5rDucLfFS/t01VPjgXAo="; }; meta = { diff --git a/pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch b/pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch deleted file mode 100644 index aadf9765882d..000000000000 --- a/pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 8f33aa2ff4..39928382da 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ - monodll_msw_utils.o \ - monodll_utilsexc.o \ - monodll_fswatcher.o \ -- monodll_msw_secretstore.o -+ monodll_msw_secretstore.o \ - monodll_msw_uilocale.o - @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS) - @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ -@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ - monodll_uuid.o \ - monodll_msw_evtloop.o \ - monodll_access.o \ -- monodll_dark_mode.o -+ monodll_dark_mode.o \ - monodll_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \ -@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ - monodll_uuid.o \ - monodll_msw_evtloop.o \ - monodll_access.o \ -- monodll_dark_mode.o -+ monodll_dark_mode.o \ - monodll_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \ -@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ - monolib_msw_utils.o \ - monolib_utilsexc.o \ - monolib_fswatcher.o \ -- monolib_msw_secretstore.o -+ monolib_msw_secretstore.o \ - monolib_msw_uilocale.o - @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1) - @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \ -@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ - monolib_uuid.o \ - monolib_msw_evtloop.o \ - monolib_access.o \ -- monolib_dark_mode.o -+ monolib_dark_mode.o \ - monolib_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \ -@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ - monolib_uuid.o \ - monolib_msw_evtloop.o \ - monolib_access.o \ -- monolib_dark_mode.o -+ monolib_dark_mode.o \ - monolib_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \ -@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ - basedll_msw_utils.o \ - basedll_utilsexc.o \ - basedll_fswatcher.o \ -- basedll_msw_secretstore.o -+ basedll_msw_secretstore.o \ - basedll_msw_uilocale.o - @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2) - @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \ -@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ - baselib_msw_utils.o \ - baselib_utilsexc.o \ - baselib_fswatcher.o \ -- baselib_msw_secretstore.o -+ baselib_msw_secretstore.o \ - baselib_msw_uilocale.o - @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3) - @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \ -@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ - coredll_uuid.o \ - coredll_msw_evtloop.o \ - coredll_access.o \ -- coredll_dark_mode.o -+ coredll_dark_mode.o \ - coredll_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \ -@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ - coredll_uuid.o \ - coredll_msw_evtloop.o \ - coredll_access.o \ -- coredll_dark_mode.o -+ coredll_dark_mode.o \ - coredll_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \ -@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ - corelib_uuid.o \ - corelib_msw_evtloop.o \ - corelib_access.o \ -- corelib_dark_mode.o -+ corelib_dark_mode.o \ - corelib_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \ -@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ - corelib_uuid.o \ - corelib_msw_evtloop.o \ - corelib_access.o \ -- corelib_dark_mode.o -+ corelib_dark_mode.o \ - corelib_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \ diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 2bb626cc324a..8b2610cf88b6 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, cmake, + desktopToDarwinBundle, pkg-config, qtbase, qtsvg, @@ -45,7 +46,8 @@ gnuradioMinimal.pkgs.mkDerivation rec { pkg-config wrapQtAppsHook wrapGAppsHook3 - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; + buildInputs = [ gnuradioMinimal.unwrapped.logLib diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix index 77805b365d33..d9232e75c2a9 100644 --- a/pkgs/by-name/al/alist/package.nix +++ b/pkgs/by-name/al/alist/package.nix @@ -11,14 +11,14 @@ }: buildGoModule rec { pname = "alist"; - version = "3.44.0"; - webVersion = "3.44.0"; + version = "3.45.0"; + webVersion = "3.45.0"; src = fetchFromGitHub { owner = "AlistGo"; repo = "alist"; tag = "v${version}"; - hash = "sha256-zaIS2DYB7x76SCHCX9aJ0/8Lejwy3/AlLbnztSNJtSc="; + hash = "sha256-h8oWeTX3z3xye5O4+s7LA7Wm36JOrsU+UdKGZXaDKXk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -32,11 +32,11 @@ buildGoModule rec { }; web = fetchzip { url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz"; - hash = "sha256-YPqbEPpwRVTWwH/LOq7cGsYju6YqdFCOseD52OsnkSk="; + hash = "sha256-rNVa+dr/SX2aYHBzeV8QdD5XYCFyelhbqkTpvhF+S2g="; }; proxyVendor = true; - vendorHash = "sha256-eBIlBtO+AlW2TE4xgxktePb2bm1lIYiuZ4+AUd1bdW8="; + vendorHash = "sha256-IMoLVAgOaVM1xIFDe8BGOpzyBnDMfD9Q6VogFfOWFzU="; buildInputs = [ fuse ]; diff --git a/pkgs/by-name/at/atf/pr-85.patch b/pkgs/by-name/at/atf/pr-85.patch deleted file mode 100644 index d438ce16b048..000000000000 --- a/pkgs/by-name/at/atf/pr-85.patch +++ /dev/null @@ -1,1529 +0,0 @@ -From 1f0ee71c000074ca48c2d9edc94f152747835e20 Mon Sep 17 00:00:00 2001 -From: Enji Cooper -Date: Thu, 5 Dec 2024 23:07:18 -0800 -Subject: [PATCH 1/9] Garbage collect stray reference to auto_array - -This entry should have been removed in the referenced commit. - -Fixes: 6639d083e7d5b4b478397cc416cd42a756d17b0c ---- - atf-c++/detail/Makefile.am.inc | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/atf-c++/detail/Makefile.am.inc b/atf-c++/detail/Makefile.am.inc -index b3181346..29b41c3f 100644 ---- a/atf-c++/detail/Makefile.am.inc -+++ b/atf-c++/detail/Makefile.am.inc -@@ -25,7 +25,6 @@ - - libatf_c___la_SOURCES += atf-c++/detail/application.cpp \ - atf-c++/detail/application.hpp \ -- atf-c++/detail/auto_array.hpp \ - atf-c++/detail/env.cpp \ - atf-c++/detail/env.hpp \ - atf-c++/detail/exceptions.cpp \ - -From bb58a4dfbc98e95c365be8033f9778571f35ef9d Mon Sep 17 00:00:00 2001 -From: Enji Cooper -Date: Thu, 5 Dec 2024 23:25:26 -0800 -Subject: [PATCH 2/9] Require C++-14 at bare minimum - -This change imports ac_cxx_compile_stdcxx.m4 from gnu,org and makes use -of the `AX_CXX_COMPILE_STDCXX` macro in configure.ac to ensure that the -compiler specified supports C++-14 (at bare minimum). This is being done -to quell some issues reported by scan-build about the code using C++ -range-based for-loops (a feature added in C++-11). ---- - configure.ac | 3 +- - m4/ac_cxx_compile_stdcxx.m4 | 1070 +++++++++++++++++++++++++++++++++++ - 2 files changed, 1072 insertions(+), 1 deletion(-) - create mode 100644 m4/ac_cxx_compile_stdcxx.m4 - -diff --git a/configure.ac b/configure.ac -index c37aca44..6d802144 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,8 +58,9 @@ AM_PROG_CC_C_O - dnl The C compiler check automatically aborts if the compiler does not work. - dnl Nothing to do here. - --AC_LANG(C++) - AC_PROG_CXX -+AC_LANG_COMPILER(C++) -+AX_CXX_COMPILE_STDCXX(14, noext, mandatory) - AC_CACHE_CHECK([whether the C++ compiler works], - [atf_cv_prog_cxx_works], - [AC_LANG_PUSH([C++]) -diff --git a/m4/ac_cxx_compile_stdcxx.m4 b/m4/ac_cxx_compile_stdcxx.m4 -new file mode 100644 -index 00000000..fe6ae17e ---- /dev/null -+++ b/m4/ac_cxx_compile_stdcxx.m4 -@@ -0,0 +1,1070 @@ -+# =========================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) -+# -+# DESCRIPTION -+# -+# Check for baseline language coverage in the compiler for the specified -+# version of the C++ standard. If necessary, add switches to CXX and -+# CXXCPP to enable support. VERSION may be '11', '14', '17', '20', or -+# '23' for the respective C++ standard version. -+# -+# The second argument, if specified, indicates whether you insist on an -+# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -+# -std=c++11). If neither is specified, you get whatever works, with -+# preference for no added switch, and then for an extended mode. -+# -+# The third argument, if specified 'mandatory' or if left unspecified, -+# indicates that baseline support for the specified C++ standard is -+# required and that the macro should error out if no mode with that -+# support is found. If specified 'optional', then configuration proceeds -+# regardless, after defining HAVE_CXX${VERSION} if and only if a -+# supporting mode is found. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Benjamin Kosnik -+# Copyright (c) 2012 Zack Weinberg -+# Copyright (c) 2013 Roy Stogner -+# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov -+# Copyright (c) 2015 Paul Norman -+# Copyright (c) 2015 Moritz Klammler -+# Copyright (c) 2016, 2018 Krzesimir Nowak -+# Copyright (c) 2019 Enji Cooper -+# Copyright (c) 2020 Jason Merrill -+# Copyright (c) 2021, 2024 Jörn Heusipp -+# Copyright (c) 2015, 2022, 2023, 2024 Olly Betts -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 25 -+ -+dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro -+dnl (serial version number 13). -+ -+AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl -+ m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], -+ [$1], [14], [ax_cxx_compile_alternatives="14 1y"], -+ [$1], [17], [ax_cxx_compile_alternatives="17 1z"], -+ [$1], [20], [ax_cxx_compile_alternatives="20"], -+ [$1], [23], [ax_cxx_compile_alternatives="23"], -+ [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl -+ m4_if([$2], [], [], -+ [$2], [ext], [], -+ [$2], [noext], [], -+ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl -+ m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true], -+ [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], -+ [$3], [optional], [ax_cxx_compile_cxx$1_required=false], -+ [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) -+ AC_LANG_PUSH([C++])dnl -+ ac_success=no -+ -+ m4_if([$2], [], [dnl -+ AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, -+ ax_cv_cxx_compile_cxx$1, -+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], -+ [ax_cv_cxx_compile_cxx$1=yes], -+ [ax_cv_cxx_compile_cxx$1=no])]) -+ if test x$ax_cv_cxx_compile_cxx$1 = xyes; then -+ ac_success=yes -+ fi]) -+ -+ m4_if([$2], [noext], [], [dnl -+ if test x$ac_success = xno; then -+ for alternative in ${ax_cxx_compile_alternatives}; do -+ switch="-std=gnu++${alternative}" -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) -+ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, -+ $cachevar, -+ [ac_save_CXX="$CXX" -+ CXX="$CXX $switch" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], -+ [eval $cachevar=yes], -+ [eval $cachevar=no]) -+ CXX="$ac_save_CXX"]) -+ if eval test x\$$cachevar = xyes; then -+ CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi -+ ac_success=yes -+ break -+ fi -+ done -+ fi]) -+ -+ m4_if([$2], [ext], [], [dnl -+ if test x$ac_success = xno; then -+ dnl HP's aCC needs +std=c++11 according to: -+ dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf -+ dnl Cray's crayCC needs "-h std=c++11" -+ dnl MSVC needs -std:c++NN for C++17 and later (default is C++14) -+ for alternative in ${ax_cxx_compile_alternatives}; do -+ for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}" MSVC; do -+ if test x"$switch" = xMSVC; then -+ dnl AS_TR_SH maps both `:` and `=` to `_` so -std:c++17 would collide -+ dnl with -std=c++17. We suffix the cache variable name with _MSVC to -+ dnl avoid this. -+ switch=-std:c++${alternative} -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_${switch}_MSVC]) -+ else -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) -+ fi -+ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, -+ $cachevar, -+ [ac_save_CXX="$CXX" -+ CXX="$CXX $switch" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], -+ [eval $cachevar=yes], -+ [eval $cachevar=no]) -+ CXX="$ac_save_CXX"]) -+ if eval test x\$$cachevar = xyes; then -+ CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi -+ ac_success=yes -+ break -+ fi -+ done -+ if test x$ac_success = xyes; then -+ break -+ fi -+ done -+ fi]) -+ AC_LANG_POP([C++]) -+ if test x$ax_cxx_compile_cxx$1_required = xtrue; then -+ if test x$ac_success = xno; then -+ AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) -+ fi -+ fi -+ if test x$ac_success = xno; then -+ HAVE_CXX$1=0 -+ AC_MSG_NOTICE([No compiler with C++$1 support was found]) -+ else -+ HAVE_CXX$1=1 -+ AC_DEFINE(HAVE_CXX$1,1, -+ [define if the compiler supports basic C++$1 syntax]) -+ fi -+ AC_SUBST(HAVE_CXX$1) -+]) -+ -+ -+dnl Test body for checking C++11 support -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11], -+ [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11] -+) -+ -+dnl Test body for checking C++14 support -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], -+ [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11 -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14] -+) -+ -+dnl Test body for checking C++17 support -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17], -+ [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11 -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_17] -+) -+ -+dnl Test body for checking C++20 support -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_20], -+ [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11 -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_20] -+) -+ -+dnl Test body for checking C++23 support -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_23], -+ [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11 -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_20 -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_23] -+) -+ -+ -+dnl Tests for new features in C++11 -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ -+ -+// If the compiler admits that it is not ready for C++11, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+// MSVC always sets __cplusplus to 199711L in older versions; newer versions -+// only set it correctly if /Zc:__cplusplus is specified as well as a -+// /std:c++NN switch: -+// -+// https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/ -+// -+// The value __cplusplus ought to have is available in _MSVC_LANG since -+// Visual Studio 2015 Update 3: -+// -+// https://learn.microsoft.com/en-us/cpp/preprocessor/predefined-macros -+// -+// This was also the first MSVC version to support C++14 so we can't use the -+// value of either __cplusplus or _MSVC_LANG to quickly rule out MSVC having -+// C++11 or C++14 support, but we can check _MSVC_LANG for C++17 and later. -+#elif __cplusplus < 201103L && !defined _MSC_VER -+ -+#error "This is not a C++11 compiler" -+ -+#else -+ -+namespace cxx11 -+{ -+ -+ namespace test_static_assert -+ { -+ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ } -+ -+ namespace test_final_override -+ { -+ -+ struct Base -+ { -+ virtual ~Base() {} -+ virtual void f() {} -+ }; -+ -+ struct Derived : public Base -+ { -+ virtual ~Derived() override {} -+ virtual void f() override {} -+ }; -+ -+ } -+ -+ namespace test_double_right_angle_brackets -+ { -+ -+ template < typename T > -+ struct check {}; -+ -+ typedef check single_type; -+ typedef check> double_type; -+ typedef check>> triple_type; -+ typedef check>>> quadruple_type; -+ -+ } -+ -+ namespace test_decltype -+ { -+ -+ int -+ f() -+ { -+ int a = 1; -+ decltype(a) b = 2; -+ return a + b; -+ } -+ -+ } -+ -+ namespace test_type_deduction -+ { -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static const bool value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static const bool value = true; -+ }; -+ -+ template < typename T1, typename T2 > -+ auto -+ add(T1 a1, T2 a2) -> decltype(a1 + a2) -+ { -+ return a1 + a2; -+ } -+ -+ int -+ test(const int c, volatile int v) -+ { -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == false, ""); -+ auto ac = c; -+ auto av = v; -+ auto sumi = ac + av + 'x'; -+ auto sumf = ac + av + 1.0; -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == true, ""); -+ static_assert(is_same::value == false, ""); -+ static_assert(is_same::value == true, ""); -+ return (sumf > 0.0) ? sumi : add(c, v); -+ } -+ -+ } -+ -+ namespace test_noexcept -+ { -+ -+ int f() { return 0; } -+ int g() noexcept { return 0; } -+ -+ static_assert(noexcept(f()) == false, ""); -+ static_assert(noexcept(g()) == true, ""); -+ -+ } -+ -+ namespace test_constexpr -+ { -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept -+ { -+ return *s ? strlen_c_r(s + 1, acc + 1) : acc; -+ } -+ -+ template < typename CharT > -+ unsigned long constexpr -+ strlen_c(const CharT *const s) noexcept -+ { -+ return strlen_c_r(s, 0UL); -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("1") == 1UL, ""); -+ static_assert(strlen_c("example") == 7UL, ""); -+ static_assert(strlen_c("another\0example") == 7UL, ""); -+ -+ } -+ -+ namespace test_rvalue_references -+ { -+ -+ template < int N > -+ struct answer -+ { -+ static constexpr int value = N; -+ }; -+ -+ answer<1> f(int&) { return answer<1>(); } -+ answer<2> f(const int&) { return answer<2>(); } -+ answer<3> f(int&&) { return answer<3>(); } -+ -+ void -+ test() -+ { -+ int i = 0; -+ const int c = 0; -+ static_assert(decltype(f(i))::value == 1, ""); -+ static_assert(decltype(f(c))::value == 2, ""); -+ static_assert(decltype(f(0))::value == 3, ""); -+ } -+ -+ } -+ -+ namespace test_uniform_initialization -+ { -+ -+ struct test -+ { -+ static const int zero {}; -+ static const int one {1}; -+ }; -+ -+ static_assert(test::zero == 0, ""); -+ static_assert(test::one == 1, ""); -+ -+ } -+ -+ namespace test_lambdas -+ { -+ -+ void -+ test1() -+ { -+ auto lambda1 = [](){}; -+ auto lambda2 = lambda1; -+ lambda1(); -+ lambda2(); -+ } -+ -+ int -+ test2() -+ { -+ auto a = [](int i, int j){ return i + j; }(1, 2); -+ auto b = []() -> int { return '0'; }(); -+ auto c = [=](){ return a + b; }(); -+ auto d = [&](){ return c; }(); -+ auto e = [a, &b](int x) mutable { -+ const auto identity = [](int y){ return y; }; -+ for (auto i = 0; i < a; ++i) -+ a += b--; -+ return x + identity(a + b); -+ }(0); -+ return a + b + c + d + e; -+ } -+ -+ int -+ test3() -+ { -+ const auto nullary = [](){ return 0; }; -+ const auto unary = [](int x){ return x; }; -+ using nullary_t = decltype(nullary); -+ using unary_t = decltype(unary); -+ const auto higher1st = [](nullary_t f){ return f(); }; -+ const auto higher2nd = [unary](nullary_t f1){ -+ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; -+ }; -+ return higher1st(nullary) + higher2nd(nullary)(unary); -+ } -+ -+ } -+ -+ namespace test_variadic_templates -+ { -+ -+ template -+ struct sum; -+ -+ template -+ struct sum -+ { -+ static constexpr auto value = N0 + sum::value; -+ }; -+ -+ template <> -+ struct sum<> -+ { -+ static constexpr auto value = 0; -+ }; -+ -+ static_assert(sum<>::value == 0, ""); -+ static_assert(sum<1>::value == 1, ""); -+ static_assert(sum<23>::value == 23, ""); -+ static_assert(sum<1, 2>::value == 3, ""); -+ static_assert(sum<5, 5, 11>::value == 21, ""); -+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); -+ -+ } -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function -+ // because of this. -+ namespace test_template_alias_sfinae -+ { -+ -+ struct foo {}; -+ -+ template -+ using member = typename T::member_type; -+ -+ template -+ void func(...) {} -+ -+ template -+ void func(member*) {} -+ -+ void test(); -+ -+ void test() { func(0); } -+ -+ } -+ -+} // namespace cxx11 -+ -+#endif // __cplusplus >= 201103L -+ -+]]) -+ -+ -+dnl Tests for new features in C++14 -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ -+ -+// If the compiler admits that it is not ready for C++14, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201402L && !defined _MSC_VER -+ -+#error "This is not a C++14 compiler" -+ -+#else -+ -+namespace cxx14 -+{ -+ -+ namespace test_polymorphic_lambdas -+ { -+ -+ int -+ test() -+ { -+ const auto lambda = [](auto&&... args){ -+ const auto istiny = [](auto x){ -+ return (sizeof(x) == 1UL) ? 1 : 0; -+ }; -+ const int aretiny[] = { istiny(args)... }; -+ return aretiny[0]; -+ }; -+ return lambda(1, 1L, 1.0f, '1'); -+ } -+ -+ } -+ -+ namespace test_binary_literals -+ { -+ -+ constexpr auto ivii = 0b0000000000101010; -+ static_assert(ivii == 42, "wrong value"); -+ -+ } -+ -+ namespace test_generalized_constexpr -+ { -+ -+ template < typename CharT > -+ constexpr unsigned long -+ strlen_c(const CharT *const s) noexcept -+ { -+ auto length = 0UL; -+ for (auto p = s; *p; ++p) -+ ++length; -+ return length; -+ } -+ -+ static_assert(strlen_c("") == 0UL, ""); -+ static_assert(strlen_c("x") == 1UL, ""); -+ static_assert(strlen_c("test") == 4UL, ""); -+ static_assert(strlen_c("another\0test") == 7UL, ""); -+ -+ } -+ -+ namespace test_lambda_init_capture -+ { -+ -+ int -+ test() -+ { -+ auto x = 0; -+ const auto lambda1 = [a = x](int b){ return a + b; }; -+ const auto lambda2 = [a = lambda1(x)](){ return a; }; -+ return lambda2(); -+ } -+ -+ } -+ -+ namespace test_digit_separators -+ { -+ -+ constexpr auto ten_million = 100'000'000; -+ static_assert(ten_million == 100000000, ""); -+ -+ } -+ -+ namespace test_return_type_deduction -+ { -+ -+ auto f(int& x) { return x; } -+ decltype(auto) g(int& x) { return x; } -+ -+ template < typename T1, typename T2 > -+ struct is_same -+ { -+ static constexpr auto value = false; -+ }; -+ -+ template < typename T > -+ struct is_same -+ { -+ static constexpr auto value = true; -+ }; -+ -+ int -+ test() -+ { -+ auto x = 0; -+ static_assert(is_same::value, ""); -+ static_assert(is_same::value, ""); -+ return x; -+ } -+ -+ } -+ -+} // namespace cxx14 -+ -+#endif // __cplusplus >= 201402L -+ -+]]) -+ -+ -+dnl Tests for new features in C++17 -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[ -+ -+// If the compiler admits that it is not ready for C++17, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 201703L -+ -+#error "This is not a C++17 compiler" -+ -+#else -+ -+#include -+#include -+#include -+ -+namespace cxx17 -+{ -+ -+ namespace test_constexpr_lambdas -+ { -+ -+ constexpr int foo = [](){return 42;}(); -+ -+ } -+ -+ namespace test::nested_namespace::definitions -+ { -+ -+ } -+ -+ namespace test_fold_expression -+ { -+ -+ template -+ int multiply(Args... args) -+ { -+ return (args * ... * 1); -+ } -+ -+ template -+ bool all(Args... args) -+ { -+ return (args && ...); -+ } -+ -+ } -+ -+ namespace test_extended_static_assert -+ { -+ -+ static_assert (true); -+ -+ } -+ -+ namespace test_auto_brace_init_list -+ { -+ -+ auto foo = {5}; -+ auto bar {5}; -+ -+ static_assert(std::is_same, decltype(foo)>::value); -+ static_assert(std::is_same::value); -+ } -+ -+ namespace test_typename_in_template_template_parameter -+ { -+ -+ template typename X> struct D; -+ -+ } -+ -+ namespace test_fallthrough_nodiscard_maybe_unused_attributes -+ { -+ -+ int f1() -+ { -+ return 42; -+ } -+ -+ [[nodiscard]] int f2() -+ { -+ [[maybe_unused]] auto unused = f1(); -+ -+ switch (f1()) -+ { -+ case 17: -+ f1(); -+ [[fallthrough]]; -+ case 42: -+ f1(); -+ } -+ return f1(); -+ } -+ -+ } -+ -+ namespace test_extended_aggregate_initialization -+ { -+ -+ struct base1 -+ { -+ int b1, b2 = 42; -+ }; -+ -+ struct base2 -+ { -+ base2() { -+ b3 = 42; -+ } -+ int b3; -+ }; -+ -+ struct derived : base1, base2 -+ { -+ int d; -+ }; -+ -+ derived d1 {{1, 2}, {}, 4}; // full initialization -+ derived d2 {{}, {}, 4}; // value-initialized bases -+ -+ } -+ -+ namespace test_general_range_based_for_loop -+ { -+ -+ struct iter -+ { -+ int i; -+ -+ int& operator* () -+ { -+ return i; -+ } -+ -+ const int& operator* () const -+ { -+ return i; -+ } -+ -+ iter& operator++() -+ { -+ ++i; -+ return *this; -+ } -+ }; -+ -+ struct sentinel -+ { -+ int i; -+ }; -+ -+ bool operator== (const iter& i, const sentinel& s) -+ { -+ return i.i == s.i; -+ } -+ -+ bool operator!= (const iter& i, const sentinel& s) -+ { -+ return !(i == s); -+ } -+ -+ struct range -+ { -+ iter begin() const -+ { -+ return {0}; -+ } -+ -+ sentinel end() const -+ { -+ return {5}; -+ } -+ }; -+ -+ void f() -+ { -+ range r {}; -+ -+ for (auto i : r) -+ { -+ [[maybe_unused]] auto v = i; -+ } -+ } -+ -+ } -+ -+ namespace test_lambda_capture_asterisk_this_by_value -+ { -+ -+ struct t -+ { -+ int i; -+ int foo() -+ { -+ return [*this]() -+ { -+ return i; -+ }(); -+ } -+ }; -+ -+ } -+ -+ namespace test_enum_class_construction -+ { -+ -+ enum class byte : unsigned char -+ {}; -+ -+ byte foo {42}; -+ -+ } -+ -+ namespace test_constexpr_if -+ { -+ -+ template -+ int f () -+ { -+ if constexpr(cond) -+ { -+ return 13; -+ } -+ else -+ { -+ return 42; -+ } -+ } -+ -+ } -+ -+ namespace test_selection_statement_with_initializer -+ { -+ -+ int f() -+ { -+ return 13; -+ } -+ -+ int f2() -+ { -+ if (auto i = f(); i > 0) -+ { -+ return 3; -+ } -+ -+ switch (auto i = f(); i + 4) -+ { -+ case 17: -+ return 2; -+ -+ default: -+ return 1; -+ } -+ } -+ -+ } -+ -+ namespace test_template_argument_deduction_for_class_templates -+ { -+ -+ template -+ struct pair -+ { -+ pair (T1 p1, T2 p2) -+ : m1 {p1}, -+ m2 {p2} -+ {} -+ -+ T1 m1; -+ T2 m2; -+ }; -+ -+ void f() -+ { -+ [[maybe_unused]] auto p = pair{13, 42u}; -+ } -+ -+ } -+ -+ namespace test_non_type_auto_template_parameters -+ { -+ -+ template -+ struct B -+ {}; -+ -+ B<5> b1; -+ B<'a'> b2; -+ -+ } -+ -+ namespace test_structured_bindings -+ { -+ -+ int arr[2] = { 1, 2 }; -+ std::pair pr = { 1, 2 }; -+ -+ auto f1() -> int(&)[2] -+ { -+ return arr; -+ } -+ -+ auto f2() -> std::pair& -+ { -+ return pr; -+ } -+ -+ struct S -+ { -+ int x1 : 2; -+ volatile double y1; -+ }; -+ -+ S f3() -+ { -+ return {}; -+ } -+ -+ auto [ x1, y1 ] = f1(); -+ auto& [ xr1, yr1 ] = f1(); -+ auto [ x2, y2 ] = f2(); -+ auto& [ xr2, yr2 ] = f2(); -+ const auto [ x3, y3 ] = f3(); -+ -+ } -+ -+ namespace test_exception_spec_type_system -+ { -+ -+ struct Good {}; -+ struct Bad {}; -+ -+ void g1() noexcept; -+ void g2(); -+ -+ template -+ Bad -+ f(T*, T*); -+ -+ template -+ Good -+ f(T1*, T2*); -+ -+ static_assert (std::is_same_v); -+ -+ } -+ -+ namespace test_inline_variables -+ { -+ -+ template void f(T) -+ {} -+ -+ template inline T g(T) -+ { -+ return T{}; -+ } -+ -+ template<> inline void f<>(int) -+ {} -+ -+ template<> int g<>(int) -+ { -+ return 5; -+ } -+ -+ } -+ -+} // namespace cxx17 -+ -+#endif // (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 201703L -+ -+]]) -+ -+ -+dnl Tests for new features in C++20 -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_20], [[ -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202002L -+ -+#error "This is not a C++20 compiler" -+ -+#else -+ -+#include -+ -+namespace cxx20 -+{ -+ -+// As C++20 supports feature test macros in the standard, there is no -+// immediate need to actually test for feature availability on the -+// Autoconf side. -+ -+} // namespace cxx20 -+ -+#endif // (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202002L -+ -+]]) -+ -+ -+dnl Tests for new features in C++23 -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_23], [[ -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202302L -+ -+#error "This is not a C++23 compiler" -+ -+#else -+ -+#include -+ -+namespace cxx23 -+{ -+ -+// As C++23 supports feature test macros in the standard, there is no -+// immediate need to actually test for feature availability on the -+// Autoconf side. -+ -+} // namespace cxx23 -+ -+#endif // (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202302L -+ -+]]) - -From e00b7f9250e0b7dae44e6b9191be0aa31d8cb668 Mon Sep 17 00:00:00 2001 -From: Enji Cooper -Date: Sat, 7 Dec 2024 18:18:02 -0800 -Subject: [PATCH 3/9] Stop shipping atf-*-api(3) manpages - -These manpages have been deprecated for at least a release. Remove them -and all of the logic associated with them. - -Signed-off-by: Enji Cooper ---- - Makefile.am | 8 -------- - configure.ac | 3 --- - 2 files changed, 11 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 913910c2..d202fd1d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -114,12 +114,4 @@ clean-all: - - .PHONY: $(PHONY_TARGETS) - --# TODO(jmmv): Remove after atf 0.22. --install-data-hook: -- cd $(DESTDIR)$(man3dir) && \ -- for binding in c c++ sh; do \ -- rm -f "atf-$${binding}-api.3"; \ -- $(LN_S) "atf-$${binding}.3" "atf-$${binding}-api.3"; \ -- done -- - # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 -diff --git a/configure.ac b/configure.ac -index 6d802144..a2d68cee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -74,9 +74,6 @@ fi - - KYUA_DEVELOPER_MODE([C,C++]) - --dnl TODO(jmmv): Remove once the atf-*-api.3 symlinks are removed. --AC_PROG_LN_S -- - ATF_MODULE_APPLICATION - ATF_MODULE_DEFS - ATF_MODULE_ENV - -From aa0fe99ef3de0f31dbaefb5268015258478d0ba4 Mon Sep 17 00:00:00 2001 -From: Enji Cooper -Date: Sat, 7 Dec 2024 18:20:47 -0800 -Subject: [PATCH 4/9] Expose WCOREDUMP(..) in a deterministic manner - -WCOREDUMP is considered an extension to the POSIX spec on multiple -platforms, and thus is not automatically exposed on all platforms. Add the -relevant preprocessor defines to config.h via autoconf, then leverage them -in atf-c(3). - -This helps ensure that the platforms which support WCOREDUMP properly -expose the macro. - -Signed-off-by: Enji Cooper ---- - atf-c/detail/process.c | 2 ++ - configure.ac | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/atf-c/detail/process.c b/atf-c/detail/process.c -index 567d28ec..84bb4882 100644 ---- a/atf-c/detail/process.c -+++ b/atf-c/detail/process.c -@@ -23,6 +23,8 @@ - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -+#include "config.h" -+ - #include "atf-c/detail/process.h" - - #include -diff --git a/configure.ac b/configure.ac -index a2d68cee..3a88354b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,6 +58,8 @@ AM_PROG_CC_C_O - dnl The C compiler check automatically aborts if the compiler does not work. - dnl Nothing to do here. - -+AC_USE_SYSTEM_EXTENSIONS -+ - AC_PROG_CXX - AC_LANG_COMPILER(C++) - AX_CXX_COMPILE_STDCXX(14, noext, mandatory) - -From deee8f2628847e3fff6fd2af04f163fadee4c61c Mon Sep 17 00:00:00 2001 -From: Enji Cooper -Date: Tue, 10 Dec 2024 14:26:58 -0800 -Subject: [PATCH 5/9] Add compiler feature detection for - `__attribute__((nonnull))` - -This feature is being detected so several functions can be appropriately -marked as taking non-NULL/-nullptr parameters, and the compiler and static -analyzers can (in turn) make intelligent decisions when optimizing and -analyzing code, respectively. - -Signed-off-by: Enji Cooper ---- - atf-c/defs.h.in | 1 + - m4/module-defs.m4 | 21 +++++++++++++++++++++ - 2 files changed, 22 insertions(+) - -diff --git a/atf-c/defs.h.in b/atf-c/defs.h.in -index 6059e7fd..5346e56a 100644 ---- a/atf-c/defs.h.in -+++ b/atf-c/defs.h.in -@@ -27,6 +27,7 @@ - #define ATF_C_DEFS_H - - #define ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(a, b) @ATTRIBUTE_FORMAT_PRINTF@ -+#define ATF_DEFS_ATTRIBUTE_NONNULL @ATTRIBUTE_NONNULL@ - #define ATF_DEFS_ATTRIBUTE_NORETURN @ATTRIBUTE_NORETURN@ - #define ATF_DEFS_ATTRIBUTE_UNUSED @ATTRIBUTE_UNUSED@ - -diff --git a/m4/module-defs.m4 b/m4/module-defs.m4 -index b1c9cc84..feb3df27 100644 ---- a/m4/module-defs.m4 -+++ b/m4/module-defs.m4 -@@ -54,6 +54,26 @@ test_printf(const char *format, ...) - AC_SUBST([ATTRIBUTE_FORMAT_PRINTF], [${value}]) - ]) - -+AC_DEFUN([ATF_ATTRIBUTE_NONNULL], [ -+ AC_CACHE_CHECK( -+ [whether __attribute__((nonnull)) is supported], -+ [kyua_cv_attribute_nonnull], [ -+ AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([ -+void func(char *foo __attribute__((nonnull))); -+])], -+ [kyua_cv_attribute_nonnull=yes], -+ [kyua_cv_attribute_nonnull=no]) -+ ]) -+ if test x"${kyua_cv_attribute_nonnull}" = xyes; then -+ value="__attribute__((nonnull))" -+ else -+ value="" -+ fi -+ AC_SUBST([ATTRIBUTE_NONNULL], [${value}]) -+]) -+ -+ - AC_DEFUN([ATF_ATTRIBUTE_NORETURN], [ - dnl XXX This check is overly simple and should be fixed. For example, - dnl Sun's cc does support the noreturn attribute but CC (the C++ -@@ -103,6 +123,7 @@ function(int a __attribute__((__unused__))) - - AC_DEFUN([ATF_MODULE_DEFS], [ - ATF_ATTRIBUTE_FORMAT_PRINTF -+ ATF_ATTRIBUTE_NONNULL - ATF_ATTRIBUTE_NORETURN - ATF_ATTRIBUTE_UNUSED - ]) - -From 1ca4688b87e8bcb3bfc5c05ef61b385d59019383 Mon Sep 17 00:00:00 2001 -From: Enji Cooper -Date: Wed, 25 Dec 2024 11:31:12 -0800 -Subject: [PATCH 6/9] Restore AC_PROG_CPP - -This was accidentally deleted post-0.21 release. It's still needed by -tests and build infrastructure. - -Signed-off-by: Enji Cooper ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 3a88354b..e42ee5e1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -62,6 +62,7 @@ AC_USE_SYSTEM_EXTENSIONS - - AC_PROG_CXX - AC_LANG_COMPILER(C++) -+AC_PROG_CPP - AX_CXX_COMPILE_STDCXX(14, noext, mandatory) - AC_CACHE_CHECK([whether the C++ compiler works], - [atf_cv_prog_cxx_works], - -From bff968f5a164a81819046c55881e6083a7607dcf Mon Sep 17 00:00:00 2001 -From: Enji Cooper -Date: Sat, 7 Dec 2024 18:12:02 -0800 -Subject: [PATCH 7/9] atf-c/detail/env.c: remove unnecessary complexity - -The libcalls used have been in the POSIX standard since 2008.1. Require -them to be present instead of conditionally hoping they're present. - -This fixes an issue where the autoconf code was messing up with a -combination of clang tools, which resulted in the autoconf code failing -to properly determine whether or not the functions were available. - -Signed-off-by: Enji Cooper ---- - atf-c/detail/env.c | 41 +++-------------------------------------- - configure.ac | 1 - - m4/module-env.m4 | 28 ---------------------------- - 3 files changed, 3 insertions(+), 67 deletions(-) - delete mode 100644 m4/module-env.m4 - -diff --git a/atf-c/detail/env.c b/atf-c/detail/env.c -index 8ee3d697..36de217c 100644 ---- a/atf-c/detail/env.c -+++ b/atf-c/detail/env.c -@@ -25,10 +25,6 @@ - - #include "atf-c/detail/env.h" - --#if defined(HAVE_CONFIG_H) --#include "config.h" --#endif -- - #include - #include - -@@ -65,25 +61,11 @@ atf_env_set(const char *name, const char *val) - { - atf_error_t err; - --#if defined(HAVE_SETENV) - if (setenv(name, val, 1) == -1) -- err = atf_libc_error(errno, "Cannot set environment variable " -- "'%s' to '%s'", name, val); -+ err = atf_libc_error(errno, -+ "Cannot set environment variable '%s' to '%s'", name, val); - else - err = atf_no_error(); --#elif defined(HAVE_PUTENV) -- char *buf; -- -- err = atf_text_format(&buf, "%s=%s", name, val); -- if (!atf_is_error(err)) { -- if (putenv(buf) == -1) -- err = atf_libc_error(errno, "Cannot set environment variable " -- "'%s' to '%s'", name, val); -- free(buf); -- } --#else --# error "Don't know how to set an environment variable." --#endif - - return err; - } -@@ -91,24 +73,7 @@ atf_env_set(const char *name, const char *val) - atf_error_t - atf_env_unset(const char *name) - { -- atf_error_t err; - --#if defined(HAVE_UNSETENV) - unsetenv(name); -- err = atf_no_error(); --#elif defined(HAVE_PUTENV) -- char *buf; -- -- err = atf_text_format(&buf, "%s=", name); -- if (!atf_is_error(err)) { -- if (putenv(buf) == -1) -- err = atf_libc_error(errno, "Cannot unset environment variable" -- " '%s'", name); -- free(buf); -- } --#else --# error "Don't know how to unset an environment variable." --#endif -- -- return err; -+ return (atf_no_error()); - } -diff --git a/configure.ac b/configure.ac -index e42ee5e1..00ee124c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -79,7 +79,6 @@ KYUA_DEVELOPER_MODE([C,C++]) - - ATF_MODULE_APPLICATION - ATF_MODULE_DEFS --ATF_MODULE_ENV - ATF_MODULE_FS - - ATF_RUNTIME_TOOL([ATF_BUILD_CC], -diff --git a/m4/module-env.m4 b/m4/module-env.m4 -deleted file mode 100644 -index 963aab38..00000000 ---- a/m4/module-env.m4 -+++ /dev/null -@@ -1,28 +0,0 @@ --dnl Copyright (c) 2007 The NetBSD Foundation, Inc. --dnl All rights reserved. --dnl --dnl Redistribution and use in source and binary forms, with or without --dnl modification, are permitted provided that the following conditions --dnl are met: --dnl 1. Redistributions of source code must retain the above copyright --dnl notice, this list of conditions and the following disclaimer. --dnl 2. Redistributions in binary form must reproduce the above copyright --dnl notice, this list of conditions and the following disclaimer in the --dnl documentation and/or other materials provided with the distribution. --dnl --dnl THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND --dnl CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, --dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF --dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. --dnl IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY --dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL --dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE --dnl GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS --dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER --dnl IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR --dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN --dnl IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- --AC_DEFUN([ATF_MODULE_ENV], [ -- AC_CHECK_FUNCS([putenv setenv unsetenv]) --]) - -From 402b9362d01448074c4d2d91a8c770e591577167 Mon Sep 17 00:00:00 2001 -From: Enji Cooper -Date: Wed, 25 Dec 2024 17:19:28 -0800 -Subject: [PATCH 8/9] Remove ATF_BUILD_CXX require.progs check - -This particular check unfortunately doesn't work when ATF_BUILD_CXX -contains multiple CXXFLAGS, or contains a path with spaces in it. Remove -this check to unbreak the dependent tests -post-793d4640031dc06ce8a239ffa9ab61322104c4ca. - -Signed-off-by: Enji Cooper ---- - atf-c++/detail/test_helpers.hpp | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/atf-c++/detail/test_helpers.hpp b/atf-c++/detail/test_helpers.hpp -index c1171801..1c4c316f 100644 ---- a/atf-c++/detail/test_helpers.hpp -+++ b/atf-c++/detail/test_helpers.hpp -@@ -45,8 +45,6 @@ - { \ - set_md_var("descr", "Tests that the " hdrname " file can be " \ - "included on its own, without any prerequisites"); \ -- const std::string cxx = atf::env::get("ATF_BUILD_CXX", ATF_BUILD_CXX); \ -- set_md_var("require.progs", cxx); \ - } \ - ATF_TEST_CASE_BODY(name) \ - { \ -@@ -58,8 +56,6 @@ - ATF_TEST_CASE_HEAD(name) \ - { \ - set_md_var("descr", descr); \ -- const std::string cxx = atf::env::get("ATF_BUILD_CXX", ATF_BUILD_CXX); \ -- set_md_var("require.progs", cxx); \ - } \ - ATF_TEST_CASE_BODY(name) \ - { \ - -From f054eebc616577d973fa6f3b4ec440bb29671c20 Mon Sep 17 00:00:00 2001 -From: Enji Cooper -Date: Wed, 25 Dec 2024 20:17:15 -0800 -Subject: [PATCH 9/9] Remove redundant C++ toolchain check - -The C++ toolchain is sanity checked when C++14 conformance is checked; -there's no reason why we need to check whether or not the C++ toolchain -works again. - -Signed-off-by: Enji Cooper ---- - configure.ac | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 00ee124c..e36f9817 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,16 +64,6 @@ AC_PROG_CXX - AC_LANG_COMPILER(C++) - AC_PROG_CPP - AX_CXX_COMPILE_STDCXX(14, noext, mandatory) --AC_CACHE_CHECK([whether the C++ compiler works], -- [atf_cv_prog_cxx_works], -- [AC_LANG_PUSH([C++]) -- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], -- [atf_cv_prog_cxx_works=yes], -- [atf_cv_prog_cxx_works=no]) -- AC_LANG_POP]) --if test "${atf_cv_prog_cxx_works}" = no; then -- AC_MSG_ERROR([C++ compiler cannot create executables]) --fi - - KYUA_DEVELOPER_MODE([C,C++]) - diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index 29a354635a6c..2d462dfa4594 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -150,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = let - libs = [ vulkan-loader ] ++ cubeb.passthru.backendLibs; + libs = [ vulkan-loader ]; in '' gappsWrapperArgs+=( diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index 5f873a8fdd61..6f5d8dc24195 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -8,17 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "cook-cli"; - version = "0.10.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "cooklang"; repo = "cookcli"; rev = "v${version}"; - hash = "sha256-1m2+etJG+33fPTxBF8qT/U9WiZGcSn9r0WlK5PDL6/Q="; + hash = "sha256-2vY68PUoHDyyH3hJ/Fvjxbof7RzWFWYTg1UhsjWNpww="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-3tWVCP80a6odmi9C0klLbfO5UmdFczyUY8KQSaMIyw4="; + cargoHash = "sha256-H4soSp9fDwrqcv3eL5WqGYHWAt07gyVLoEVp1VbYchQ="; nativeBuildInputs = [ pkg-config @@ -39,7 +38,7 @@ rustPlatform.buildRustPackage rec { passthru.ui = buildNpmPackage { name = "ui"; src = "${src}/ui"; - npmDepsHash = "sha256-uMyOAYLVHhY4ytvEFvVzdoQ7ExzQ4sH+ZtDrEacu5bk="; + npmDepsHash = "sha256-zx8G6Raop1EZAVy1YCF5ag5aL9NutRxbPfTARmjP2SY="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' @@ -49,13 +48,13 @@ rustPlatform.buildRustPackage rec { ''; }; - meta = with lib; { + meta = { changelog = "https://github.com/cooklang/cookcli/releases/tag/v${version}"; description = "Suite of tools to create shopping lists and maintain recipes"; homepage = "https://cooklang.org/"; - license = [ licenses.mit ]; + license = lib.licenses.mit; mainProgram = "cook"; - maintainers = [ maintainers.emilioziniades ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = [ lib.maintainers.emilioziniades ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch b/pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch new file mode 100644 index 000000000000..018ec29358f4 --- /dev/null +++ b/pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch @@ -0,0 +1,208 @@ +From e0cbc1049b9a3a3322cd48d32af148f87d5007c2 Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Mon, 19 May 2025 22:36:53 +0200 +Subject: [PATCH] cmake: add pkg-config file generation + +Signed-off-by: Marcin Serwin +--- + CMakeLists.txt | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ + libcubeb.pc.in | 12 ++++++++++++ + 2 files changed, 62 insertions(+) + create mode 100644 libcubeb.pc.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 07618fa..6470837 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,6 +23,17 @@ if(NOT CMAKE_BUILD_TYPE) + "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) + endif() + ++set(private_requires) ++set(private_libs) ++set(private_libs_flags) ++if(UNIX AND NOT APPLE) ++ if(BSD OR ANDROID) ++ list(APPEND private_libs c++) ++ else() ++ list(APPEND private_libs stdc++) ++ endif() ++endif() ++ + set(CMAKE_C_STANDARD 99) + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) +@@ -141,6 +152,7 @@ if(NOT BUNDLE_SPEEX) + pkg_check_modules(speexdsp IMPORTED_TARGET speexdsp) + if(speexdsp_FOUND) + add_library(speex ALIAS PkgConfig::speexdsp) ++ list(APPEND private_requires speexdsp) + endif() + endif() + endif() +@@ -155,6 +167,7 @@ if(NOT TARGET speex) + EXPORT= + RANDOM_PREFIX=speex + ) ++ list(APPEND private_libs speex) + endif() + + # $ required because of https://gitlab.kitware.com/cmake/cmake/-/issues/15415 +@@ -166,6 +179,7 @@ include(CheckIncludeFiles) + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads) + target_link_libraries(cubeb PRIVATE Threads::Threads) ++list(APPEND private_libs ${CMAKE_THREAD_LIBS_INIT}) + + if(LAZY_LOAD_LIBS) + check_include_files(pulse/pulseaudio.h USE_PULSE) +@@ -176,6 +190,7 @@ if(LAZY_LOAD_LIBS) + + if(USE_PULSE OR USE_ALSA OR USE_JACK OR USE_SNDIO OR USE_AAUDIO) + target_link_libraries(cubeb PRIVATE ${CMAKE_DL_LIBS}) ++ list(APPEND private_libs ${CMAKE_DL_LIBS}) + + if(ANDROID) + target_compile_definitions(cubeb PRIVATE __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) +@@ -191,6 +206,7 @@ else() + set(USE_PULSE ON) + target_compile_definitions(cubeb PRIVATE DISABLE_LIBPULSE_DLOPEN) + target_link_libraries(cubeb PRIVATE PkgConfig::libpulse) ++ list(APPEND private_requires libpulse) + endif() + + pkg_check_modules(alsa IMPORTED_TARGET alsa) +@@ -198,6 +214,7 @@ else() + set(USE_ALSA ON) + target_compile_definitions(cubeb PRIVATE DISABLE_LIBASOUND_DLOPEN) + target_link_libraries(cubeb PRIVATE PkgConfig::alsa) ++ list(APPEND private_requires alsa) + endif() + + pkg_check_modules(jack IMPORTED_TARGET jack) +@@ -205,18 +222,21 @@ else() + set(USE_JACK ON) + target_compile_definitions(cubeb PRIVATE DISABLE_LIBJACK_DLOPEN) + target_link_libraries(cubeb PRIVATE PkgConfig::jack) ++ list(APPEND private_requires jack) + endif() + + check_include_files(sndio.h USE_SNDIO) + if(USE_SNDIO) + target_compile_definitions(cubeb PRIVATE DISABLE_LIBSNDIO_DLOPEN) + target_link_libraries(cubeb PRIVATE sndio) ++ list(APPEND private_libs sndio) + endif() + + check_include_files(aaudio/AAudio.h USE_AAUDIO) + if(USE_AAUDIO) + target_compile_definitions(cubeb PRIVATE DISABLE_LIBAAUDIO_DLOPEN) + target_link_libraries(cubeb PRIVATE aaudio) ++ list(APPEND private_libs aaudio) + endif() + endif() + +@@ -263,6 +283,7 @@ if(USE_AUDIOUNIT) + src/cubeb_osx_run_loop.cpp) + target_compile_definitions(cubeb PRIVATE USE_AUDIOUNIT) + target_link_libraries(cubeb PRIVATE "-framework AudioUnit" "-framework CoreAudio" "-framework CoreServices") ++ list(APPEND private_libs_flags "-framework AudioUnit" "-framework CoreAudio" "-framework CoreServices") + endif() + + check_include_files(audioclient.h USE_WASAPI) +@@ -271,6 +292,7 @@ if(USE_WASAPI) + src/cubeb_wasapi.cpp) + target_compile_definitions(cubeb PRIVATE USE_WASAPI) + target_link_libraries(cubeb PRIVATE avrt ole32 ksuser) ++ list(APPEND private_libs avrt ole32 ksuser) + endif() + + check_include_files("windows.h;mmsystem.h" USE_WINMM) +@@ -279,6 +301,7 @@ if(USE_WINMM) + src/cubeb_winmm.c) + target_compile_definitions(cubeb PRIVATE USE_WINMM) + target_link_libraries(cubeb PRIVATE winmm) ++ list(APPEND private_libs winmm) + endif() + + check_include_files(SLES/OpenSLES.h USE_OPENSL) +@@ -288,6 +311,7 @@ if(USE_OPENSL) + src/cubeb-jni.cpp) + target_compile_definitions(cubeb PRIVATE USE_OPENSL) + target_link_libraries(cubeb PRIVATE OpenSLES) ++ list(APPEND private_libs OpenSLES) + endif() + + check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H) +@@ -303,6 +327,7 @@ if(HAVE_SYS_SOUNDCARD_H) + pkg_check_modules(libbsd-overlay IMPORTED_TARGET libbsd-overlay) + if(libbsd-overlay_FOUND) + target_link_libraries(cubeb PRIVATE PkgConfig::libbsd-overlay) ++ list(APPEND private_requires libbsd-overlay) + set(HAVE_STRLCPY true) + endif() + endif() +@@ -320,6 +345,7 @@ if(USE_AUDIOTRACK) + src/cubeb_audiotrack.c) + target_compile_definitions(cubeb PRIVATE USE_AUDIOTRACK) + target_link_libraries(cubeb PRIVATE log) ++ list(APPEND private_libs log) + endif() + + check_include_files(sys/audioio.h USE_SUN) +@@ -335,6 +361,7 @@ if(USE_KAI) + src/cubeb_kai.c) + target_compile_definitions(cubeb PRIVATE USE_KAI) + target_link_libraries(cubeb PRIVATE kai) ++ list(APPEND private_libs kai) + endif() + + if(USE_PULSE AND USE_PULSE_RUST) +@@ -452,3 +479,26 @@ add_custom_target(clang-format-check + | xargs -0 ${CLANG_FORMAT_BINARY} -Werror -n + COMMENT "Check formatting with clang-format" + VERBATIM) ++ ++ ++list(TRANSFORM private_libs PREPEND "-l") ++string(JOIN " " CUBEB_PC_PRIVATE_LIBS ${private_libs} ${private_libs_flags}) ++ ++string(JOIN " " CUBEB_PC_PRIVATE_REQUIRES ${private_requires}) ++ ++if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}") ++ set(CUBEB_PC_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}") ++else() ++ set(CUBEB_PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") ++endif() ++if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}") ++ set(CUBEB_PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}") ++else() ++ set(CUBEB_PC_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}") ++endif() ++ ++configure_file(libcubeb.pc.in libcubeb.pc @ONLY) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libcubeb.pc" ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ++) ++ +diff --git a/libcubeb.pc.in b/libcubeb.pc.in +new file mode 100644 +index 0000000..2310ae6 +--- /dev/null ++++ b/libcubeb.pc.in +@@ -0,0 +1,12 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=@CUBEB_PC_LIBDIR@ ++includedir=@CUBEB_PC_INCLUDEDIR@ ++ ++Name: libcubeb ++Description: Cross platform audio library ++Version: @PROJECT_VERSION@ ++Requires.private: @CUBEB_PC_PRIVATE_REQUIRES@ ++Libs: -L${libdir} -lcubeb ++Libs.private: @CUBEB_PC_PRIVATE_LIBS@ ++Cflags: -I${includedir} +-- +2.49.0 + diff --git a/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch b/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch new file mode 100644 index 000000000000..9309495a4a93 --- /dev/null +++ b/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch @@ -0,0 +1,31 @@ +From 4f8dff52e99bdd70d07d7cb47d357bb91dc5f1a9 Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Sat, 24 May 2025 16:20:51 +0200 +Subject: [PATCH] cmake: don't hardcode "include" as the includedir + +When the default CMAKE_INSTALL_INCLUDEDIR is changed +headers are installed to a different location, however, the +INTERFACE_INCLUDE_DIRECTORIES in exported cmake configuration still +point to /include. + +Signed-off-by: Marcin Serwin +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 07618fa..bdf2212 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -91,7 +91,7 @@ add_library(cubeb + src/cubeb_utils.cpp + ) + target_include_directories(cubeb +- PUBLIC $ $ ++ PUBLIC $ $ + ) + set_target_properties(cubeb PROPERTIES + VERSION ${cubeb_VERSION} +-- +2.49.0 + diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix index 434945d371b5..764e763ee220 100644 --- a/pkgs/by-name/cu/cubeb/package.nix +++ b/pkgs/by-name/cu/cubeb/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + unstableGitUpdater, cmake, pkg-config, alsa-lib, @@ -9,80 +10,90 @@ libpulseaudio, sndio, speexdsp, - lazyLoad ? !stdenv.hostPlatform.isDarwin, + validatePkgConfig, + + # passthru.tests + testers, + pcsx2, + duckstation, + alsaSupport ? !stdenv.hostPlatform.isDarwin, pulseSupport ? !stdenv.hostPlatform.isDarwin, jackSupport ? !stdenv.hostPlatform.isDarwin, sndioSupport ? !stdenv.hostPlatform.isDarwin, - buildSharedLibs ? true, + enableShared ? !stdenv.hostPlatform.isStatic, }: -assert lib.assertMsg ( - stdenv.hostPlatform.isDarwin -> !lazyLoad -) "cubeb: lazyLoad is inert on Darwin"; - -let - backendLibs = - lib.optional alsaSupport alsa-lib - ++ lib.optional jackSupport jack2 - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional sndioSupport sndio; - -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "cubeb"; - version = "unstable-2022-10-18"; + version = "0-unstable-2025-04-02"; src = fetchFromGitHub { owner = "mozilla"; repo = "cubeb"; - rev = "27d2a102b0b75d9e49d43bc1ea516233fb87d778"; - hash = "sha256-q+uz1dGU4LdlPogL1nwCR/KuOX4Oy3HhMdA6aJylBRk="; + rev = "975a727e5e308a04cfb9ecdf7ddaf1150ea3f733"; + hash = "sha256-3IP++tdiJUwXR6t5mf/MkPd524K/LYESNMkQ8vy10jo="; }; + outputs = [ + "out" + "lib" + "dev" + ]; + nativeBuildInputs = [ cmake pkg-config + validatePkgConfig ]; - buildInputs = [ speexdsp ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) backendLibs; + buildInputs = + [ speexdsp ] + # In the default configuration these inputs are lazy-loaded. If your package builds a vendored cubeb please make + # sure to include these in the runtime LD path. + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional jackSupport jack2 + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional sndioSupport sndio; + + patches = [ + # https://github.com/mozilla/cubeb/pull/813 + ./0001-cmake-add-pkg-config-file-generation.patch + + # https://github.com/mozilla/cubeb/pull/814 + ./0001-cmake-don-t-hardcode-include-as-the-includedir.patch + ]; cmakeFlags = [ - (lib.cmakeBool "BUILD_SHARED_LIBS" buildSharedLibs) - "-DBUILD_TESTS=OFF" # tests require an audio server - "-DBUNDLE_SPEEX=OFF" - "-DUSE_SANITIZERS=OFF" + (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) + (lib.cmakeBool "BUILD_TESTS" false) # tests require an audio server + (lib.cmakeBool "BUNDLE_SPEEX" false) + (lib.cmakeBool "USE_SANITIZERS" false) # Whether to lazily load libraries with dlopen() - "-DLAZY_LOAD_LIBS=${if lazyLoad then "ON" else "OFF"}" + (lib.cmakeBool "LAZY_LOAD_LIBS" false) ]; passthru = { - # For downstream users when lazyLoad is true - backendLibs = lib.optionals lazyLoad backendLibs; + updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + tests = { + # These packages depend on a patched version of cubeb + inherit pcsx2 duckstation; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; }; - postInstall = '' - # TODO: remove after https://github.com/mozilla/cubeb/pull/813 is merged - mkdir -p $out/lib/pkgconfig/ - echo > $out/lib/pkgconfig/libcubeb.pc \ - "Name: libcubeb - Description: Cross platform audio library - Version: 0.0.0 - Requires.private: libpulse - Libs: -L"$out/lib" -lcubeb - Libs.private: -lstdc++" - ''; - - meta = with lib; { + meta = { description = "Cross platform audio library"; mainProgram = "cubeb-test"; homepage = "https://github.com/mozilla/cubeb"; - license = licenses.isc; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ + license = lib.licenses.isc; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ zhaofengli marcin-serwin ]; + pkgConfigModules = [ "libcubeb" ]; }; -} +}) diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix index 7f5705a5bd7c..e4c39a397c6a 100644 --- a/pkgs/by-name/du/duckstation/package.nix +++ b/pkgs/by-name/du/duckstation/package.nix @@ -6,9 +6,7 @@ callPackage, cmake, cpuinfo, - cubeb, curl, - discord-rpc, extra-cmake-modules, libXrandr, libbacktrace, @@ -42,6 +40,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { ./002-hardcode-vars.diff # Fix NEON intrinsics usage ./003-fix-NEON-intrinsics.patch + ./remove-cubeb-vendor.patch ]; nativeBuildInputs = [ @@ -57,6 +56,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 cpuinfo + sources.cubeb curl libXrandr libbacktrace @@ -70,7 +70,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { sources.soundtouch-patched sources.spirv-cross-patched wayland - ] ++ cubeb.passthru.backendLibs; + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_TESTS" true) @@ -115,14 +115,11 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { qtWrapperArgs = let - libPath = lib.makeLibraryPath ( - [ - sources.shaderc-patched - sources.spirv-cross-patched - vulkan-loader - ] - ++ cubeb.passthru.backendLibs - ); + libPath = lib.makeLibraryPath ([ + sources.shaderc-patched + sources.spirv-cross-patched + vulkan-loader + ]); in [ "--prefix LD_LIBRARY_PATH : ${libPath}" diff --git a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch b/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch new file mode 100644 index 000000000000..b28d522cbd50 --- /dev/null +++ b/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch @@ -0,0 +1,29 @@ +diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt +index af35687..8347825 100644 +--- a/dep/CMakeLists.txt ++++ b/dep/CMakeLists.txt +@@ -22,9 +22,8 @@ add_subdirectory(rcheevos EXCLUDE_FROM_ALL) + disable_compiler_warnings_for_target(rcheevos) + add_subdirectory(rapidyaml EXCLUDE_FROM_ALL) + disable_compiler_warnings_for_target(rapidyaml) +-add_subdirectory(cubeb EXCLUDE_FROM_ALL) +-disable_compiler_warnings_for_target(cubeb) +-disable_compiler_warnings_for_target(speex) ++find_package(cubeb REQUIRED GLOBAL) ++add_library(cubeb ALIAS cubeb::cubeb) + add_subdirectory(kissfft EXCLUDE_FROM_ALL) + disable_compiler_warnings_for_target(kissfft) + +diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp +index 85579c4..526d168 100644 +--- a/src/util/cubeb_audio_stream.cpp ++++ b/src/util/cubeb_audio_stream.cpp +@@ -261,7 +261,7 @@ std::vector> AudioStream::GetCubebDriverName + std::vector> names; + names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default")); + +- const char** cubeb_names = cubeb_get_backend_names(); ++ const char*const * cubeb_names = cubeb_get_backend_names(); + for (u32 i = 0; cubeb_names[i] != nullptr; i++) + names.emplace_back(cubeb_names[i], cubeb_names[i]); + return names; diff --git a/pkgs/by-name/du/duckstation/sources.nix b/pkgs/by-name/du/duckstation/sources.nix index 228bcbc2aaba..42a24ede16c5 100644 --- a/pkgs/by-name/du/duckstation/sources.nix +++ b/pkgs/by-name/du/duckstation/sources.nix @@ -9,6 +9,7 @@ stdenv, cmake, ninja, + cubeb, }: { @@ -163,4 +164,15 @@ platforms = lib.platforms.linux; }; }); + + cubeb = cubeb.overrideAttrs (old: { + pname = "cubeb-patched-for-duckstation"; + patches = (old.patches or [ ]) ++ [ + (fetchpatch { + url = "https://github.com/PCSX2/pcsx2/commit/430e31abe4a9e09567cb542f1416b011bb9b6ef9.patch"; + stripLen = 2; + hash = "sha256-bbH0c1X3lMeX6hfNKObhcq5xraFpicFV3mODQGYudvQ="; + }) + ]; + }); } diff --git a/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch b/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch deleted file mode 100644 index 253051ebf0f7..000000000000 --- a/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 41e750142b44465f3af197b7e2f0d6f54fc48c2d Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Mon, 21 Oct 2024 17:42:24 +0200 -Subject: [PATCH] Mark Lua symbols as C symbols - -Otherwise linking against our Lua built by a C-compiler fails due to the symbols being resolved as C++ symbols. ---- - interpreter.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/interpreter.h b/interpreter.h -index 6c405a1..c471ecb 100644 ---- a/interpreter.h -+++ b/interpreter.h -@@ -9,9 +9,11 @@ - #define INTERPRETER_H_ - - // Due to longjmp behaviour, we must build Lua as C++ to avoid UB -+extern "C" { - #include - #include - #include -+} - - #include "common.h" - #include --- -2.44.1 - diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index 9e3aae2585b1..3dc3eda4c780 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.15.42"; + version = "3.16.1"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${version}"; - hash = "sha256-ON0j5HYNbpHSwTMJgX/xPLjzLZXRDk1YogbhcwugxJE="; + hash = "sha256-IqkzMbWc8GiSo00sMrTugE+G552769WFz+GJbYIPOvs="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index 09cec8c283cb..855b14d14378 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,26 +1,26 @@ { - "version": "1.132.3", - "hash": "sha256-QwQSqWSQ82R5LrbyerAZflDRM2DS+rpA8E6uzxQbs48=", + "version": "1.133.1", + "hash": "sha256-8jqFiVNj494GQInfLDTXm43mO+H9YuxPwIqUJFOwwW0=", "components": { "cli": { - "npmDepsHash": "sha256-7CWJEEr/6+Duc90Qww6rhVLXEtxz3hymLcQIzv3YPg0=", - "version": "2.2.65" + "npmDepsHash": "sha256-oDgO8kb/8VqOAGUfG70x2K58j+OsZe+CjurEShiMeCU=", + "version": "2.2.67" }, "server": { - "npmDepsHash": "sha256-CdE8H8+uAlthHhko5Ir+BETqkZoNzpimgHB2gVJbus8=", - "version": "1.132.3" + "npmDepsHash": "sha256-3beEul7d4OfByrcm4u28Qv7KTdPW8GJ2gnHfQHT9LY0=", + "version": "1.133.1" }, "web": { - "npmDepsHash": "sha256-3UoNfa2P4bVFQSQTSbRacSxh2UbPokDHqveCHt9bnko=", - "version": "1.132.3" + "npmDepsHash": "sha256-xvSh0NGm7O+lunbHcE7aGv2OzQNVFlHWIeUAQPF218c=", + "version": "1.133.1" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-Rfds2/c8Q6KfWzyztxLcKS40JKOMh04JzMICsDvqMgs=", - "version": "1.132.3" + "npmDepsHash": "sha256-y2jwNlqGUIsr3DfNSpEr8BFdP7e8xvNUhBQ52ypf0YI=", + "version": "1.133.1" }, "geonames": { - "timestamp": "20250428153140", - "hash": "sha256-RDetKDf/qFRwlB+Jo5ivD6yp1paMWFJeUf1Vft70Kdw=" + "timestamp": "20250523191247", + "hash": "sha256-TiqUyYre3gGv3yJMoh6B+RZWu1AiMpgSZSW16NTI+Eg=" } } } diff --git a/pkgs/by-name/ja/jasp-desktop/cmake.patch b/pkgs/by-name/ja/jasp-desktop/cmake.patch index b6de8bc55269..60cf1814a031 100644 --- a/pkgs/by-name/ja/jasp-desktop/cmake.patch +++ b/pkgs/by-name/ja/jasp-desktop/cmake.patch @@ -1,5 +1,5 @@ diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake -index cc4681a..f484013 100644 +index a95ef78..6ee84cd 100644 --- a/Tools/CMake/Libraries.cmake +++ b/Tools/CMake/Libraries.cmake @@ -67,7 +67,7 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32)) @@ -11,36 +11,67 @@ index cc4681a..f484013 100644 find_package( Boost 1.78 REQUIRED COMPONENTS filesystem -@@ -178,10 +178,10 @@ if(LINUX) - set(LIBREADSTAT_INCLUDE_DIRS /app/include) - set(LIBREADSTAT_LIBRARY_DIRS /app/lib) - else() -- set(LIBREADSTAT_INCLUDE_DIRS /usr/local/include /usr/include) -+ set(LIBREADSTAT_INCLUDE_DIRS @readstat@/include /usr/include) - # The last two library paths handle the two most common multiarch cases. - # Other multiarch-compliant paths may come up but should be rare. -- set(LIBREADSTAT_LIBRARY_DIRS /usr/local/lib /usr/lib /usr/lib/x86_64-linux-gnu /usr/lib/aarch64-linux-gnu) -+ set(LIBREADSTAT_LIBRARY_DIRS @readstat@/lib /usr/lib /usr/lib/x86_64-linux-gnu /usr/lib/aarch64-linux-gnu) +@@ -185,7 +185,7 @@ if(LINUX) endif() message(CHECK_START "Looking for libreadstat.so") +- find_file(LIBREADSTAT_LIBRARIES libreadstat.so ++ find_library(LIBREADSTAT_LIBRARIES libreadstat.so + HINTS ${LIBREADSTAT_LIBRARY_DIRS} REQUIRED) + + if(EXISTS ${LIBREADSTAT_LIBRARIES}) diff --git a/Tools/CMake/Programs.cmake b/Tools/CMake/Programs.cmake -index dbd089d..ef6857a 100644 +index bfdc8dc..af5ac03 100644 --- a/Tools/CMake/Programs.cmake +++ b/Tools/CMake/Programs.cmake -@@ -39,6 +39,7 @@ endif() +@@ -38,8 +38,9 @@ if(NOT WIN32) + endif() # ------ Linux Tools/Programs - -+#[[ - if(LINUX) +- +-if(LINUX) ++# We don't need to check for any dependencies that are used to build R packages ++# since we build them separately ++if(false) message(CHECK_START "Looking for 'gfortran'") -@@ -81,6 +82,7 @@ if(LINUX) - endif() + find_program( +diff --git a/Tools/CMake/R.cmake b/Tools/CMake/R.cmake +index 9ae27d4..64fd96a 100644 +--- a/Tools/CMake/R.cmake ++++ b/Tools/CMake/R.cmake +@@ -841,11 +841,6 @@ message(STATUS "R_CPP_INCLUDES_LIBRARY = ${R_CPP_INCLUDES_LIBRARY}") + configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_renv.R.in + ${SCRIPT_DIRECTORY}/setup_renv.R @ONLY) - endif() -+]]# +-execute_process( +- COMMAND_ECHO STDOUT +- #ERROR_QUIET OUTPUT_QUIET +- WORKING_DIRECTORY ${R_HOME_PATH} +- COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_renv.R) - # ---------------------- + if(APPLE) + # Patch renv +@@ -867,11 +862,6 @@ endif() + configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_rcpp_rinside.R.in + ${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R @ONLY) + +-execute_process( +- COMMAND_ECHO STDOUT +- #ERROR_QUIET OUTPUT_QUIET +- WORKING_DIRECTORY ${R_HOME_PATH} +- COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R) + + if(APPLE) + # Patch RInside and RCpp +@@ -892,8 +882,8 @@ endif() + + include(FindRPackagePath) + +-find_package_path(RCPP_PATH ${R_CPP_INCLUDES_LIBRARY} "Rcpp") +-find_package_path(RINSIDE_PATH ${R_CPP_INCLUDES_LIBRARY} "RInside") ++find_package_path(RCPP_PATH ${R_LIBRARY_PATH} "Rcpp") ++find_package_path(RINSIDE_PATH ${R_LIBRARY_PATH} "RInside") + + set(RENV_PATH "${RENV_LIBRARY}/renv") diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix index 46dd282c6f38..c211946d76d9 100644 --- a/pkgs/by-name/ja/jasp-desktop/modules.nix +++ b/pkgs/by-name/ja/jasp-desktop/modules.nix @@ -165,6 +165,12 @@ let src = jasp-src; sourceRoot = "${jasp-src.name}/Modules/${name}"; propagatedBuildInputs = deps; + + # some packages have a .Rprofile that tries to activate renv + # we disable this by removing .Rprofile + postPatch = '' + rm -f .Rprofile + ''; }; in { @@ -229,6 +235,20 @@ in jaspGraphs jaspSem ]; + jaspBFF = buildJaspModule "jaspBFF" [ + BFF + jaspBase + jaspGraphs + ]; + jaspBfpack = buildJaspModule "jaspBfpack" [ + BFpack + bain + ggplot2 + stringr + coda + jaspBase + jaspGraphs + ]; jaspBsts = buildJaspModule "jaspBsts" [ Boom bsts @@ -305,6 +325,7 @@ in conting' multibridge ggplot2 + interp jaspBase jaspGraphs plyr @@ -353,6 +374,8 @@ in ggforce tidyr igraph + HDInterval + metafor ]; jaspMachineLearning = buildJaspModule "jaspMachineLearning" [ kknn @@ -375,6 +398,7 @@ in jaspBase jaspGraphs MASS + mclust mvnormalTest neuralnet network @@ -385,6 +409,7 @@ in ROCR Rtsne signal + VGAM ]; jaspMetaAnalysis = buildJaspModule "jaspMetaAnalysis" [ dplyr @@ -406,6 +431,12 @@ in metamisc ggmcmc pema + clubSandwich + CompQuadForm + sp + dfoptim + nleqslv + patchwork ]; jaspMixedModels = buildJaspModule "jaspMixedModels" [ afex @@ -459,6 +490,8 @@ in BART EBMAforecast imputeTS + scoringRules + scoringutils ]; jaspProcess = buildJaspModule "jaspProcess" [ blavaan @@ -543,6 +576,7 @@ in lme4 MASS psych + mirt ]; jaspRobustTTests = buildJaspModule "jaspRobustTTests" [ RoBTT @@ -553,16 +587,17 @@ in jaspSem = buildJaspModule "jaspSem" [ forcats ggplot2 - jaspBase - jaspGraphs lavaan cSEM reshape2 + jaspBase + jaspGraphs semPlot semTools stringr tibble tidyr + SEMsens ]; jaspSummaryStatistics = buildJaspModule "jaspSummaryStatistics" [ BayesFactor @@ -579,7 +614,7 @@ in ]; jaspSurvival = buildJaspModule "jaspSurvival" [ survival - survminer + ggsurvfit jaspBase jaspGraphs ]; @@ -593,6 +628,12 @@ in plotrix plyr ]; + jaspTestModule = buildJaspModule "jaspTestModule" [ + jaspBase + jaspGraphs + svglite + stringi + ]; jaspTimeSeries = buildJaspModule "jaspTimeSeries" [ jaspBase jaspGraphs diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix index 2fb25136e503..3f9a4010d945 100644 --- a/pkgs/by-name/ja/jasp-desktop/package.nix +++ b/pkgs/by-name/ja/jasp-desktop/package.nix @@ -1,31 +1,34 @@ { lib, stdenv, + fetchFromGitHub, - fetchpatch, + buildEnv, linkFarm, - replaceVars, - R, - rPackages, + cmake, ninja, pkg-config, + boost, + freexl, libarchive, - readstat, qt6, + R, + readstat, + rPackages, }: let - version = "0.19.1"; + version = "0.19.3"; src = fetchFromGitHub { owner = "jasp-stats"; repo = "jasp-desktop"; - rev = "v${version}"; - hash = "sha256-SACGyNVxa6rFjloRQrEVtUgujEEF7WYL8Qhw6ZqLwdQ="; + tag = "v${version}"; fetchSubmodules = true; + hash = "sha256-p489Q3jMQ7UWOCdAGskRF9KSLoRSatUwGVfj0/g4aPo="; }; moduleSet = import ./modules.nix { @@ -58,25 +61,19 @@ stdenv.mkDerivation { inherit version src; patches = [ - # remove unused cmake deps, ensure boost is dynamically linked, patch readstat path - (replaceVars ./cmake.patch { - inherit readstat; - }) - - (fetchpatch { - name = "fix-qt-6.8-crash.patch"; - url = "https://github.com/jasp-stats/jasp-desktop/commit/d96a35d262312f72081ac3f96ae8c2ae7c796b0.patch"; - hash = "sha256-KcsFy1ImPTHwDKN5Umfoa9CbtQn7B3FNu/Srr0dEJGA="; - }) + # - ensure boost is linked dynamically + # - fix readstat's find logic + # - disable some of the renv logic + # - dont't check for dependencies required for building modules + ./cmake.patch ]; cmakeFlags = [ - "-DGITHUB_PAT=dummy" - "-DGITHUB_PAT_DEF=dummy" - "-DINSTALL_R_FRAMEWORK=OFF" - "-DLINUX_LOCAL_BUILD=OFF" - "-DINSTALL_R_MODULES=OFF" - "-DCUSTOM_R_PATH=${customREnv}" + (lib.cmakeFeature "GITHUB_PAT" "dummy") + (lib.cmakeFeature "GITHUB_PAT_DEF" "dummy") + (lib.cmakeBool "LINUX_LOCAL_BUILD" false) + (lib.cmakeBool "INSTALL_R_MODULES" false) + (lib.cmakeFeature "CUSTOM_R_PATH" "${customREnv}") ]; nativeBuildInputs = [ @@ -87,10 +84,12 @@ stdenv.mkDerivation { ]; buildInputs = [ - customREnv boost + customREnv + freexl libarchive readstat + qt6.qtbase qt6.qtdeclarative qt6.qtwebengine @@ -98,6 +97,7 @@ stdenv.mkDerivation { qt6.qt5compat ]; + # needed so that JASPEngine can find libRInside.so env.NIX_LDFLAGS = "-L${rPackages.RInside}/library/RInside/lib"; postInstall = '' @@ -107,7 +107,7 @@ stdenv.mkDerivation { # Remove flatpak proxy script rm $out/bin/org.jaspstats.JASP substituteInPlace $out/share/applications/org.jaspstats.JASP.desktop \ - --replace-fail "Exec=org.jaspstats.JASP" "Exec=JASP" + --replace-fail "Exec=org.jaspstats.JASP" "Exec=JASP" # symlink modules from the store ln -s ${modulesDir} $out/Modules diff --git a/pkgs/by-name/ki/kikit/drop-versioneer.patch b/pkgs/by-name/ki/kikit/drop-versioneer.patch deleted file mode 100644 index efddd64c7f23..000000000000 --- a/pkgs/by-name/ki/kikit/drop-versioneer.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/setup.py b/setup.py -index 9351fc9..75dfb2c 100644 ---- a/setup.py -+++ b/setup.py -@@ -66,9 +66,6 @@ - "solidpython>=1.1.2", - "commentjson>=0.9" - ], -- setup_requires=[ -- "versioneer" -- ], - extras_require={ - "dev": ["pytest"], - }, diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index 2b13dd852402..986f0cd2ab4d 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -12,18 +12,19 @@ }: python3Packages.buildPythonApplication rec { pname = "monophony"; - version = "2.15.0"; - pyproject = false; + version = "3.3.3"; + pyproject = true; - sourceRoot = "${src.name}/source"; src = fetchFromGitLab { owner = "zehkira"; repo = "monophony"; rev = "v${version}"; - hash = "sha256-fC+XXOGBpG5pIQW1tCNtQaptBCyLM+YGgsZLjWrMoDA="; + hash = "sha256-ET0cygX/r/YXGWpPU01FnBoLRtjo1ddXEiVIva71aE8="; }; - pythonPath = with python3Packages; [ + sourceRoot = "${src.name}/source"; + + dependencies = with python3Packages; [ mpris-server pygobject3 ytmusicapi @@ -52,10 +53,11 @@ python3Packages.buildPythonApplication rec { gstreamer ]); - # Makefile only contains `install` - dontBuild = true; + pythonRelaxDeps = [ "mpris_server" ]; - installFlags = [ "prefix=$(out)" ]; + postInstall = '' + make install prefix=$out + ''; dontWrapGApps = true; @@ -68,13 +70,13 @@ python3Packages.buildPythonApplication rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { - homepage = "https://gitlab.com/zehkira/monophony"; + meta = { description = "Linux app for streaming music from YouTube"; longDescription = "Monophony is a free and open source Linux app for streaming music from YouTube. It has no ads and does not require an account."; - license = licenses.agpl3Plus; + homepage = "https://gitlab.com/zehkira/monophony"; + license = lib.licenses.agpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ quadradical ]; mainProgram = "monophony"; - platforms = platforms.linux; - maintainers = with maintainers; [ quadradical ]; }; } diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 2a3b650472b3..f972d5af23e3 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -117,13 +117,13 @@ in goBuild (finalAttrs: { pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-rkSWMGMKzs7V6jmxS3fG611Zahsyzz5kDI8L4HxQSfQ="; + hash = "sha256-ee2MkvdVDQaSFJDDuXEwedqOB2DUl3MIfp5tRxqbL8A="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix index 9aaf2bbedb34..e8375dc46f57 100644 --- a/pkgs/by-name/pc/pcsx2/package.nix +++ b/pkgs/by-name/pc/pcsx2/package.nix @@ -25,6 +25,7 @@ wayland, zip, zstd, + fetchpatch, }: let @@ -36,6 +37,16 @@ let qtwayland wrapQtAppsHook ; + + cubeb' = cubeb.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ + (fetchpatch { + url = "https://github.com/PCSX2/pcsx2/commit/430e31abe4a9e09567cb542f1416b011bb9b6ef9.patch"; + stripLen = 2; + hash = "sha256-bbH0c1X3lMeX6hfNKObhcq5xraFpicFV3mODQGYudvQ="; + }) + ]; + }); in llvmPackages.stdenv.mkDerivation (finalAttrs: { inherit (sources.pcsx2) pname version src; @@ -43,6 +54,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { patches = [ # Remove PCSX2_GIT_REV ./0000-define-rev.patch + + ./remove-cubeb-vendor.patch ]; cmakeFlags = [ @@ -80,7 +93,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { vulkan-headers wayland zstd - ] ++ cubeb.passthru.backendLibs; + cubeb' + ]; strictDeps = true; @@ -94,13 +108,10 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { qtWrapperArgs = let - libs = lib.makeLibraryPath ( - [ - vulkan-loader - shaderc - ] - ++ cubeb.passthru.backendLibs - ); + libs = lib.makeLibraryPath ([ + vulkan-loader + shaderc + ]); in [ "--prefix LD_LIBRARY_PATH : ${libs}" ]; diff --git a/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch b/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch new file mode 100644 index 000000000000..2c98f22746dd --- /dev/null +++ b/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index ff66f9c..e177c90 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -100,9 +100,8 @@ if(USE_VULKAN) + add_subdirectory(3rdparty/vulkan EXCLUDE_FROM_ALL) + endif() + +-add_subdirectory(3rdparty/cubeb EXCLUDE_FROM_ALL) +-disable_compiler_warnings_for_target(cubeb) +-disable_compiler_warnings_for_target(speex) ++find_package(cubeb REQUIRED GLOBAL) ++add_library(cubeb ALIAS cubeb::cubeb) + + # Find the Qt components that we need. + find_package(Qt6 6.7.2 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED) +diff --git a/pcsx2/Host/CubebAudioStream.cpp b/pcsx2/Host/CubebAudioStream.cpp +index 4cd9993..604635d 100644 +--- a/pcsx2/Host/CubebAudioStream.cpp ++++ b/pcsx2/Host/CubebAudioStream.cpp +@@ -288,7 +288,7 @@ std::vector> AudioStream::GetCubebDriverName + std::vector> names; + names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default")); + +- const char** cubeb_names = cubeb_get_backend_names(); ++ const char* const* cubeb_names = cubeb_get_backend_names(); + for (u32 i = 0; cubeb_names[i] != nullptr; i++) + names.emplace_back(cubeb_names[i], cubeb_names[i]); + diff --git a/pkgs/by-name/po/postman/darwin.nix b/pkgs/by-name/po/postman/darwin.nix index bc7ce9fe2775..3deccfeeb464 100644 --- a/pkgs/by-name/po/postman/darwin.nix +++ b/pkgs/by-name/po/postman/darwin.nix @@ -13,12 +13,12 @@ let { aarch64-darwin = { arch = "arm64"; - sha256 = "sha256-uhhrJk/WtM4tKsrBAn1IjHx0OeR/SpdOzy2XhoUP4sY="; + sha256 = "sha256-w1zu+sK8JqBMGBaKPYGJqddEWYWCv1aJRM+Q91l5dPw="; }; x86_64-darwin = { arch = "64"; - sha256 = "sha256-NYxcZoQYDyn85RkUz57b5yhzpeAK5xyyJF/7L2+3tt4="; + sha256 = "sha256-dlRK6NpDskuIW0nuf9mWx/xolOnGmH77ny+2ADaD7QU="; }; } .${stdenvNoCC.hostPlatform.system} diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix index 763330f35e03..a98ea9f4310c 100644 --- a/pkgs/by-name/po/postman/linux.nix +++ b/pkgs/by-name/po/postman/linux.nix @@ -56,12 +56,12 @@ let { aarch64-linux = { arch = "arm64"; - sha256 = "sha256-/Qfd/xn+FwYLPSWssP5JFfjMdICz6HDg30edl/Fme5A="; + sha256 = "sha256-XtY5SmYoU2OhX69jRb8uSGwx5vPiSfgmF2jY7mJIrTY="; }; x86_64-linux = { arch = "64"; - sha256 = "sha256-BbTYT0GHU+BmWFXG2TU8PL90eTpLcyLgnwSw9YyWT0g="; + sha256 = "sha256-eEgUk3VnahmFua8UrNMUi2lG0UujiuDTs64XqaAkYe8="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix index 3415c93e28e8..b763a0f08ef4 100644 --- a/pkgs/by-name/po/postman/package.nix +++ b/pkgs/by-name/po/postman/package.nix @@ -6,9 +6,12 @@ let pname = "postman"; - version = "11.44.0"; + version = "11.46.6"; meta = with lib; { homepage = "https://www.getpostman.com"; + changelog = "https://www.postman.com/release-notes/postman-app/#${ + replaceStrings [ "." ] [ "-" ] version + }"; description = "API Development Environment"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.postman; diff --git a/pkgs/by-name/qc/qcm/package.nix b/pkgs/by-name/qc/qcm/package.nix index 9b8d9c92caa7..baffb0244316 100644 --- a/pkgs/by-name/qc/qcm/package.nix +++ b/pkgs/by-name/qc/qcm/package.nix @@ -40,17 +40,13 @@ stdenv.mkDerivation (finalAttrs: { curl ffmpeg cubeb - ] ++ cubeb.passthru.backendLibs; + ]; # Correct qml import path postInstall = '' mv $out/lib/qt6 $out/lib/qt-6 ''; - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath cubeb.passthru.backendLibs}" - ]; - meta = { description = "Unofficial Qt client for netease cloud music"; homepage = "https://github.com/hypengw/Qcm"; diff --git a/pkgs/by-name/rp/rpcs3/0001-cmake-add-option-to-use-system-cubeb.patch b/pkgs/by-name/rp/rpcs3/0001-cmake-add-option-to-use-system-cubeb.patch new file mode 100644 index 000000000000..0ae9f29ca514 --- /dev/null +++ b/pkgs/by-name/rp/rpcs3/0001-cmake-add-option-to-use-system-cubeb.patch @@ -0,0 +1,46 @@ +From 5af2b630da7a6a450ec6bc4f07fc7ad9a825361d Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Sat, 24 May 2025 18:51:09 +0200 +Subject: [PATCH] cmake: add option to use system cubeb + +Signed-off-by: Marcin Serwin +--- + 3rdparty/CMakeLists.txt | 9 ++++++++- + CMakeLists.txt | 1 + + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt +index 044fd464e..6c49a889b 100644 +--- a/3rdparty/CMakeLists.txt ++++ b/3rdparty/CMakeLists.txt +@@ -131,7 +131,14 @@ add_subdirectory(stblib) + add_subdirectory(discord-rpc) + + # Cubeb +-add_subdirectory(cubeb EXCLUDE_FROM_ALL) ++if(USE_SYSTEM_CUBEB) ++ find_package(cubeb REQUIRED GLOBAL) ++ message(STATUS "Using system cubeb version '${cubeb_VERSION}'") ++ add_library(3rdparty::cubeb ALIAS cubeb::cubeb) ++else() ++ message(STATUS "Using static cubeb from 3rdparty") ++ add_subdirectory(cubeb EXCLUDE_FROM_ALL) ++endif() + + # SoundTouch + add_subdirectory(SoundTouch EXCLUDE_FROM_ALL) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d2edd836..39aa150c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,6 +31,7 @@ option(USE_SYSTEM_FFMPEG "Prefer system ffmpeg instead of the prebuild one" OFF) + option(USE_SYSTEM_OPENAL "Prefer system OpenAL instead of the prebuild one" ON) + option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON) + option(USE_SYSTEM_OPENCV "Prefer system OpenCV instead of the builtin one" ON) ++option(USE_SYSTEM_CUBEB "Prefer system cubeb instead of the builtin one" OFF) + option(HAS_MEMORY_BREAKPOINTS "Add support for memory breakpoints to the interpreter" OFF) + option(USE_LTO "Use LTO for building" ON) + option(BUILD_RPCS3_TESTS "Build RPCS3 unit tests." OFF) +-- +2.49.0 + diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index 2c00a3dc91d6..93166a211e2f 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -63,6 +63,9 @@ stdenv.mkDerivation { patches = [ # Modified from https://github.com/RPCS3/rpcs3/pull/17009; doesn't apply cleanly due to intermediate commits ./fix-qt6.9-compilation.patch + + # https://github.com/RPCS3/rpcs3/pull/17246 + ./0001-cmake-add-option-to-use-system-cubeb.patch ]; passthru.updateScript = ./update.sh; @@ -89,6 +92,7 @@ stdenv.mkDerivation { (lib.cmakeBool "USE_SYSTEM_FLATBUFFERS" true) (lib.cmakeBool "USE_SYSTEM_SDL" true) (lib.cmakeBool "USE_SYSTEM_OPENCV" true) + (lib.cmakeBool "USE_SYSTEM_CUBEB" true) (lib.cmakeBool "USE_SDL" true) (lib.cmakeBool "WITH_LLVM" true) (lib.cmakeBool "BUILD_LLVM" false) @@ -130,8 +134,8 @@ stdenv.mkDerivation { llvm_18 libSM opencv + cubeb ] - ++ cubeb.passthru.backendLibs ++ lib.optional faudioSupport faudio ++ lib.optionals waylandSupport [ wayland diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index eb06643b1326..96cf932d29a5 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -33,6 +33,11 @@ wayland-scanner, xorg, zenity, + # for passthru.tests + SDL_compat, + sdl2-compat, + sdl3-image, + sdl3-ttf, alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, dbusSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, drmSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, @@ -204,7 +209,15 @@ stdenv.mkDerivation (finalAttrs: { }); tests = - { + SDL_compat.tests + // sdl2-compat.tests + // { + inherit + SDL_compat + sdl2-compat + sdl3-image + sdl3-ttf + ; pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; inherit (finalAttrs.passthru) debug-text-example; } diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix index 9c2cb97be71c..782c518ea443 100644 --- a/pkgs/by-name/si/signal-desktop/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -7,7 +7,6 @@ webrtc, pkg-config, cubeb, - libpulseaudio, }: let cubeb' = cubeb.override { @@ -15,7 +14,7 @@ let pulseSupport = true; jackSupport = false; sndioSupport = false; - buildSharedLibs = false; + enableShared = false; }; in rustPlatform.buildRustPackage (finalAttrs: { @@ -49,11 +48,13 @@ rustPlatform.buildRustPackage (finalAttrs: { cmake pkg-config ]; - buildInputs = [ - webrtc - cubeb' - libpulseaudio - ]; + buildInputs = + [ + webrtc + cubeb' + ] + # Workaround for https://github.com/NixOS/nixpkgs/pull/394607 + ++ cubeb'.buildInputs; meta = { homepage = "https://github.com/signalapp/ringrtc"; diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index 67c4cebfbe82..66c8a76d3ab1 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -2,9 +2,11 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, + writableTmpDirAsHomeHook, }: let - version = "1.2.1"; + version = "1.3.1"; tag = "v${version}"; in buildGoModule { @@ -15,16 +17,23 @@ buildGoModule { owner = "yorukot"; repo = "superfile"; inherit tag; - hash = "sha256-yClDrDpt6QUWeAtWkG0tkmFqnaviRixz6Kez0q4cRuk="; + hash = "sha256-GlPePeINZ6KL3RRqfQQFYsEdd+70bRJcMqMVnUmgo/I="; }; - vendorHash = "sha256-STiuaNcmoviHBXGcSPPs39sICsks3Z8I3ANdnlUqA/k="; + vendorHash = "sha256-ArsB0B67ymuzxTXfaUuWiRrgVCrZhmGMbJUl2u+thUw="; ldflags = [ "-s" "-w" ]; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + + # Upstream notes that this could be flakey, and it consistently fails for me. + checkFlags = [ "-skip=^TestReturnDirElement/Sort_by_Date$" ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Pretty fancy and modern terminal file manager"; homepage = "https://github.com/yorukot/superfile"; diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix index 8fe1a292e727..49fc649df40e 100644 --- a/pkgs/by-name/ta/tana/package.nix +++ b/pkgs/by-name/ta/tana/package.nix @@ -62,7 +62,7 @@ let stdenv.cc.cc stdenv.cc.libc ]; - version = "1.0.30"; + version = "1.0.31"; in stdenv.mkDerivation { pname = "tana"; @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb"; - hash = "sha256-GKRfiVKUrMr6d4ZA/FAfHnyCzyYnIwhrAwKS7HvJU1U="; + hash = "sha256-+KJ2peQWb378h6nWmoj5J4zAmSi4AHvR6fqrjRC/c8w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/task-master-ai/package.nix b/pkgs/by-name/ta/task-master-ai/package.nix new file mode 100644 index 000000000000..77726e813901 --- /dev/null +++ b/pkgs/by-name/ta/task-master-ai/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: +buildNpmPackage (finalAttrs: { + pname = "task-master-ai"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "eyaltoledano"; + repo = "claude-task-master"; + tag = "v${finalAttrs.version}"; + hash = "sha256-cCfyQ9xU8axuZyTTVsrYVuic6DPHnAc4YX7aKj2MmSE="; + }; + + npmDepsHash = "sha256-UNGJ64E12ppo37gJBDNpyRFYfNEJMH5mRnK3HyWcy8E="; + + dontNpmBuild = true; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Node.js agentic AI workflow orchestrator"; + homepage = "https://task-master.dev"; + changelog = "https://github.com/eyaltoledano/claude-task-master/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = licenses.mit; + mainProgram = "task-master-ai"; + maintainers = [ maintainers.repparw ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/tc/tcp-cutter/package.nix b/pkgs/by-name/tc/tcp-cutter/package.nix deleted file mode 100644 index 9ca1a2dd1399..000000000000 --- a/pkgs/by-name/tc/tcp-cutter/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - stdenv, - fetchurl, -}: - -stdenv.mkDerivation rec { - pname = "tcp-cutter"; - version = "1.04"; - - src = fetchurl { - url = "http://www.digitage.co.uk/digitage/files/cutter/${pname}-${version}.tgz"; - sha256 = "100iy31a3njif6vh9gfsqrm14hac05rrflla275gd4rkxdlnqcqv"; - }; - - installPhase = '' - install -D -m 0755 cutter $out/bin/tcp-cutter - ''; - - meta = with lib; { - description = "TCP/IP Connection cutting on Linux Firewalls and Routers"; - homepage = "http://www.digitage.co.uk/digitage/software/linux-security/cutter"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = [ maintainers.offline ]; - mainProgram = "tcp-cutter"; - }; -} diff --git a/pkgs/by-name/vp/vpkedit/patches/fix-standalone-check.patch b/pkgs/by-name/vp/vpkedit/patches/fix-standalone-check.patch deleted file mode 100644 index 2c8495908060..000000000000 --- a/pkgs/by-name/vp/vpkedit/patches/fix-standalone-check.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/gui/utility/Options.cpp -+++ b/src/gui/utility/Options.cpp -@@ -13,15 +13,7 @@ - QSettings* opts = nullptr; - - bool Options::isStandalone() { --#ifdef VPKEDIT_BUILD_FOR_STRATA_SOURCE -- // Standalone mode is only used to check if we should write a physical config file. -- // If we're building for a Strata Source game, we should just use the system registry. -- // No need to pollute the bin folder! -- return false; --#else -- QFileInfo nonportable(QApplication::applicationDirPath() + "/.nonportable"); -- return !(nonportable.exists() && nonportable.isFile()); --#endif -+ return true; - } - - void Options::setupOptions(QSettings& options) { diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix index 1079a147df69..075254605ab4 100644 --- a/pkgs/by-name/we/webdav/package.nix +++ b/pkgs/by-name/we/webdav/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "webdav"; - version = "5.7.5"; + version = "5.8.0"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; tag = "v${version}"; - hash = "sha256-iXU3ePALas/Z4caB1uhc5yW88zV/4iqv7qpOw4ZgZ3g="; + hash = "sha256-6G9NlQVYFDLuIxKJXq0Rcixx1AiDhTHUekumMNqXi44="; }; vendorHash = "sha256-B78O13FPpkcuE808c2hLiIDPQdS5qlaw1dWLc9T7hvM="; diff --git a/pkgs/by-name/xv/xv/package.nix b/pkgs/by-name/xv/xv/package.nix index ad9b264e893e..0abb9e0eea39 100644 --- a/pkgs/by-name/xv/xv/package.nix +++ b/pkgs/by-name/xv/xv/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "xv"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "jasper-software"; repo = "xv"; rev = "v${version}"; - sha256 = "sha256-abmMrAxgccECsOi0eIy9/y0haPkUgbOl9wCgISLy5Rs="; + sha256 = "sha256-508P88Kac1W0xwjNblOjkYJri36ReZkjzrNzrrSBZjg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ze/zellij/rust-1.86.patch b/pkgs/by-name/ze/zellij/rust-1.86.patch deleted file mode 100644 index bf938bfb3604..000000000000 --- a/pkgs/by-name/ze/zellij/rust-1.86.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 95ea43f1969d9f9ee50a701023b5f90cf36d3967 Mon Sep 17 00:00:00 2001 -From: tranzystorekk -Date: Thu, 3 Apr 2025 17:36:02 +0200 -Subject: [PATCH] fix(deps): fix --locked build on rust 1.86 - ---- - Cargo.lock | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 4b7bebbc67..83298ba165 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -4084,7 +4084,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "c17a3bd88f2155da63a1f2fcb8a56377a24f0b6dfed12733bb5f544e86f690c5" - dependencies = [ - "leb128", -- "wasmparser 0.221.2", -+ "wasmparser 0.221.3", - ] - - [[package]] -@@ -4099,9 +4099,9 @@ dependencies = [ - - [[package]] - name = "wasmparser" --version = "0.221.2" -+version = "0.221.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9845c470a2e10b61dd42c385839cdd6496363ed63b5c9e420b5488b77bd22083" -+checksum = "d06bfa36ab3ac2be0dee563380147a5b81ba10dd8885d7fbbc9eb574be67d185" - dependencies = [ - "bitflags 2.5.0", - "hashbrown 0.15.2", -@@ -4129,7 +4129,7 @@ checksum = "a80742ff1b9e6d8c231ac7c7247782c6fc5bce503af760bca071811e5fc9ee56" - dependencies = [ - "anyhow", - "termcolor", -- "wasmparser 0.221.2", -+ "wasmparser 0.221.3", - ] - - [[package]] -@@ -4172,7 +4172,7 @@ dependencies = [ - "target-lexicon", - "trait-variant", - "wasm-encoder 0.221.2", -- "wasmparser 0.221.2", -+ "wasmparser 0.221.3", - "wasmtime-asm-macros", - "wasmtime-cache", - "wasmtime-component-macro", -@@ -4260,7 +4260,7 @@ dependencies = [ - "smallvec", - "target-lexicon", - "thiserror 1.0.61", -- "wasmparser 0.221.2", -+ "wasmparser 0.221.3", - "wasmtime-environ", - "wasmtime-versioned-export-macros", - ] -@@ -4287,7 +4287,7 @@ dependencies = [ - "smallvec", - "target-lexicon", - "wasm-encoder 0.221.2", -- "wasmparser 0.221.2", -+ "wasmparser 0.221.3", - "wasmprinter", - "wasmtime-component-util", - ] -@@ -4398,7 +4398,7 @@ dependencies = [ - "gimli 0.31.1", - "object 0.36.7", - "target-lexicon", -- "wasmparser 0.221.2", -+ "wasmparser 0.221.3", - "wasmtime-cranelift", - "wasmtime-environ", - "winch-codegen", -@@ -4635,7 +4635,7 @@ dependencies = [ - "smallvec", - "target-lexicon", - "thiserror 1.0.61", -- "wasmparser 0.221.2", -+ "wasmparser 0.221.3", - "wasmtime-cranelift", - "wasmtime-environ", - ] -@@ -4893,9 +4893,9 @@ dependencies = [ - - [[package]] - name = "wit-parser" --version = "0.221.2" -+version = "0.221.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fbe1538eea6ea5ddbe5defd0dc82539ad7ba751e1631e9185d24a931f0a5adc8" -+checksum = "896112579ed56b4a538b07a3d16e562d101ff6265c46b515ce0c701eef16b2ac" - dependencies = [ - "anyhow", - "id-arena", -@@ -4906,7 +4906,7 @@ dependencies = [ - "serde_derive", - "serde_json", - "unicode-xid", -- "wasmparser 0.221.2", -+ "wasmparser 0.221.3", - ] - - [[package]] diff --git a/pkgs/development/compilers/chicken/5/default.nix b/pkgs/development/compilers/chicken/5/default.nix index a3fe5a6da5ac..ec930ef13446 100644 --- a/pkgs/development/compilers/chicken/5/default.nix +++ b/pkgs/development/compilers/chicken/5/default.nix @@ -40,7 +40,7 @@ lib.makeScope newScope (self: { name = "${pname}-${version}"; src = self.fetchegg (eggData // { inherit pname; }); buildInputs = map (x: eggself.${x}) dependencies; - meta.homepage = "https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=tree;f=${pname}/${version}"; + meta.homepage = "https://wiki.call-cc.org/eggref/5/${pname}"; meta.description = synopsis; meta.license = ( diff --git a/pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch b/pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch deleted file mode 100644 index 4bd6916a6297..000000000000 --- a/pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch +++ /dev/null @@ -1,200 +0,0 @@ -From 6204ab9f989be3841c8c47e1e2cfe6a658fe16d5 Mon Sep 17 00:00:00 2001 -From: Seth Michael Larson -Date: Tue, 28 Jan 2025 14:09:00 -0600 -Subject: [PATCH 1/4] gh-105704: Disallow square brackets ( and ) in domain - names for parsed URLs - ---- - Lib/test/test_urlparse.py | 14 +++++++++++++ - Lib/urllib/parse.py | 20 +++++++++++++++++-- - ...-01-28-14-08-03.gh-issue-105704.EnhHxu.rst | 4 ++++ - 3 files changed, 36 insertions(+), 2 deletions(-) - create mode 100644 Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst - -diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py -index 4516bdea6adb19..0f15a0998ff2ea 100644 ---- a/Lib/test/test_urlparse.py -+++ b/Lib/test/test_urlparse.py -@@ -1412,6 +1412,20 @@ def test_invalid_bracketed_hosts(self): - self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@[0439:23af::2309::fae7:1234]/Path?Query') - self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@[0439:23af:2309::fae7:1234:2342:438e:192.0.2.146]/Path?Query') - self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@]v6a.ip[/Path') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]/') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix/') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]?') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix?') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]/') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix/') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]?') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix?') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@prefix.[v6a.ip]') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@[v6a.ip].suffix') - - def test_splitting_bracketed_hosts(self): - p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]/path?query') -diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py -index c412c729852272..9d51f4c6812b57 100644 ---- a/Lib/urllib/parse.py -+++ b/Lib/urllib/parse.py -@@ -439,6 +439,23 @@ def _checknetloc(netloc): - raise ValueError("netloc '" + netloc + "' contains invalid " + - "characters under NFKC normalization") - -+def _check_bracketed_netloc(netloc): -+ # Note that this function must mirror the splitting -+ # done in NetlocResultMixins._hostinfo(). -+ hostname_and_port = netloc.rpartition('@')[2] -+ before_bracket, have_open_br, bracketed = hostname_and_port.partition('[') -+ if have_open_br: -+ # No data is allowed before a bracket. -+ if before_bracket: -+ raise ValueError("Invalid IPv6 URL") -+ hostname, _, port = bracketed.partition(']') -+ # No data is allowed after the bracket but before the port delimiter. -+ if port and not port.startswith(":"): -+ raise ValueError("Invalid IPv6 URL") -+ else: -+ hostname, _, port = hostname_and_port.partition(':') -+ _check_bracketed_host(hostname) -+ - # Valid bracketed hosts are defined in - # https://www.rfc-editor.org/rfc/rfc3986#page-49 and https://url.spec.whatwg.org/ - def _check_bracketed_host(hostname): -@@ -505,8 +522,7 @@ def _urlsplit(url, scheme=None, allow_fragments=True): - (']' in netloc and '[' not in netloc)): - raise ValueError("Invalid IPv6 URL") - if '[' in netloc and ']' in netloc: -- bracketed_host = netloc.partition('[')[2].partition(']')[0] -- _check_bracketed_host(bracketed_host) -+ _check_bracketed_netloc(netloc) - if allow_fragments and '#' in url: - url, fragment = url.split('#', 1) - if '?' in url: -diff --git a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst -new file mode 100644 -index 00000000000000..aaeac71678de87 ---- /dev/null -+++ b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst -@@ -0,0 +1,4 @@ -+When using ``urllib.parse.urlsplit()`` and ``urlparse()`` host parsing would -+not reject domain names containing square brackets (``[`` and ``]``). Square -+brackets are only valid for IPv6 and IPvFuture hosts according to `RFC 3986 -+Section 3.2.2 `__. - -From 3ab35e8d890e2c5d4e6b0c0299f94775a3ded9ae Mon Sep 17 00:00:00 2001 -From: Seth Michael Larson -Date: Thu, 30 Jan 2025 09:50:14 -0600 -Subject: [PATCH 2/4] Use Sphinx references - -Co-authored-by: Peter Bierma ---- - .../Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst -index aaeac71678de87..fb8674f558db59 100644 ---- a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst -+++ b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst -@@ -1,4 +1,4 @@ --When using ``urllib.parse.urlsplit()`` and ``urlparse()`` host parsing would -+When using :func:`urllib.parse.urlsplit()` and :func:`urllib.parse.urlparse()` host parsing would - not reject domain names containing square brackets (``[`` and ``]``). Square - brackets are only valid for IPv6 and IPvFuture hosts according to `RFC 3986 - Section 3.2.2 `__. - -From ebf92bb4d323d41778e5de6df177b26f18ecf7f9 Mon Sep 17 00:00:00 2001 -From: Seth Michael Larson -Date: Thu, 30 Jan 2025 11:10:35 -0600 -Subject: [PATCH 3/4] Add mismatched bracket test cases, fix news format - ---- - Lib/test/test_urlparse.py | 10 ++++++++++ - .../2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst | 8 ++++---- - 2 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py -index 0f15a0998ff2ea..f8ce61b2b49621 100644 ---- a/Lib/test/test_urlparse.py -+++ b/Lib/test/test_urlparse.py -@@ -1426,6 +1426,16 @@ def test_invalid_bracketed_hosts(self): - self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix?') - self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@prefix.[v6a.ip]') - self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@[v6a.ip].suffix') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip]') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://]v6a.ip[') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://]v6a.ip') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip].suffix') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix]v6a.ip[suffix') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix]v6a.ip') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[suffix') - - def test_splitting_bracketed_hosts(self): - p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]/path?query') -diff --git a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst -index fb8674f558db59..bff1bc6b0d609c 100644 ---- a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst -+++ b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst -@@ -1,4 +1,4 @@ --When using :func:`urllib.parse.urlsplit()` and :func:`urllib.parse.urlparse()` host parsing would --not reject domain names containing square brackets (``[`` and ``]``). Square --brackets are only valid for IPv6 and IPvFuture hosts according to `RFC 3986 --Section 3.2.2 `__. -+When using :func:`urllib.parse.urlsplit` and :func:`urllib.parse.urlparse` host -+parsing would not reject domain names containing square brackets (``[`` and -+``]``). Square brackets are only valid for IPv6 and IPvFuture hosts according to -+`RFC 3986 Section 3.2.2 `__. - -From 2817b2e29c8b28a24f9eb97abce1e1b60b1162fa Mon Sep 17 00:00:00 2001 -From: Seth Michael Larson -Date: Thu, 30 Jan 2025 13:01:19 -0600 -Subject: [PATCH 4/4] Add more test coverage for ports - ---- - Lib/test/test_urlparse.py | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py -index f8ce61b2b49621..b51cc006b73280 100644 ---- a/Lib/test/test_urlparse.py -+++ b/Lib/test/test_urlparse.py -@@ -1424,6 +1424,15 @@ def test_invalid_bracketed_hosts(self): - self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix/') - self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]?') - self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix?') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:a') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:a') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:a1') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:a1') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:1a') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:1a') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:/') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:?') - self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@prefix.[v6a.ip]') - self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@[v6a.ip].suffix') - self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip') -@@ -1438,14 +1447,16 @@ def test_invalid_bracketed_hosts(self): - self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[suffix') - - def test_splitting_bracketed_hosts(self): -- p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]/path?query') -+ p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]:1234/path?query') - self.assertEqual(p1.hostname, 'v6a.ip') - self.assertEqual(p1.username, 'user') - self.assertEqual(p1.path, '/path') -+ self.assertEqual(p1.port, 1234) - p2 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7%test]/path?query') - self.assertEqual(p2.hostname, '0439:23af:2309::fae7%test') - self.assertEqual(p2.username, 'user') - self.assertEqual(p2.path, '/path') -+ self.assertIs(p2.port, None) - p3 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7:1234:192.0.2.146%test]/path?query') - self.assertEqual(p3.hostname, '0439:23af:2309::fae7:1234:192.0.2.146%test') - self.assertEqual(p3.username, 'user') diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 65d896214017..af876a8d964d 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.27.1"; + version = "1.28.1"; outputs = [ "bin" @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { owner = "libinput"; repo = "libinput"; rev = version; - hash = "sha256-3U+2a/uSoSj1t34uz7xO2QQtJExygKOhBL7BUGP0Fbo="; + hash = "sha256-kte5BzGEz7taW/ccnxmkJjXn3FeikzuD6Hm10l+X7c0="; }; patches = [ diff --git a/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch b/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch deleted file mode 100644 index 6ca6e8309462..000000000000 --- a/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch +++ /dev/null @@ -1,143 +0,0 @@ -From c1d1eed00099af8d858536b659864b7ccea41974 Mon Sep 17 00:00:00 2001 -From: Paul Howarth -Date: Sat, 13 Mar 2021 17:46:57 +0000 -Subject: [PATCH 1/2] Update for Getopt-Long-Descriptive 0.106 - -GLD is now outputting text with wrapping depending on the terminal -width. This update is enough to get the tests to pass when running -within "expect", which provides a PTY. It's almost certainly not -enough for general use. ---- - t/104_override_usage.t | 8 ++++++++ - t/107_no_auto_help.t | 2 +- - t/109_help_flag.t | 2 +- - t/110_sort_usage_by_attr_order.t | 12 ++++++++++++ - 4 files changed, 22 insertions(+), 2 deletions(-) - -diff --git a/t/104_override_usage.t b/t/104_override_usage.t -index bc45029..6641540 100644 ---- a/t/104_override_usage.t -+++ b/t/104_override_usage.t -@@ -61,9 +61,17 @@ use Test::Exception; - \t--foo INT A foo - } - : -+ $Getopt::Long::Descriptive::VERSION < 0.106 ? - qq{usage: 104_override_usage.t [-?] [long options...] - \t-? --[no-]usage --[no-]help Prints this usage information. - \t--foo INT A foo -+} -+ : -+ qq{usage: 104_override_usage.t [-?] [long options...] -+\t--[no-]help (or -?) Prints -+\t this usage information. -+\t aka --usage -+\t--foo INT A foo - } - - ]; -diff --git a/t/107_no_auto_help.t b/t/107_no_auto_help.t -index 27f87f5..103df43 100644 ---- a/t/107_no_auto_help.t -+++ b/t/107_no_auto_help.t -@@ -60,7 +60,7 @@ END { - warning_like { - throws_ok { Class->new_with_options } - #usage: 107_no_auto_help.t [-?] [long options...] -- qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+\Q-? --\E(\[no-\])?usage --(\[no-\])?\Qhelp\E\s+\QPrints this usage information.\E.\s+--configfile/ms, -+ qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+(\Q-? --\E(\[no-\])?usage )?--(\[no-\])?\Qhelp\E(\Q (or -?)\E)?\s+\QPrints this usage information.\E.(\s+\Qaka --usage\E.)?\s+--configfile/ms, - 'usage information looks good'; - } - qr/^Specified configfile \'this_value_unimportant\' does not exist, is empty, or is not readable$/, -diff --git a/t/109_help_flag.t b/t/109_help_flag.t -index 8c658e2..58dbca6 100644 ---- a/t/109_help_flag.t -+++ b/t/109_help_flag.t -@@ -40,7 +40,7 @@ foreach my $args ( ['--help'], ['--usage'], ['--?'], ['-?'] ) - local @ARGV = @$args; - - throws_ok { MyClass->new_with_options() } -- qr/^usage: (?:[\d\w]+)\Q.t [-?] [long options...]\E.^\t\Q-? --\E(\[no-\])?usage --(\[no-\])?help\s+\QPrints this usage information.\E$/ms, -+ qr/^usage: (?:[\d\w]+)\Q.t [-?] [long options...]\E.^\s+(\Q-? --\E(\[no-\])?usage )?--(\[no-\])?help(\Q (or -?)\E)?\s+Prints ?(.\s+)?\Qthis usage information.\E.(\s+\Qaka --usage\E.)?$/ms, - 'Help request detected; usage information properly printed'; - } - -diff --git a/t/110_sort_usage_by_attr_order.t b/t/110_sort_usage_by_attr_order.t -index e7dd177..7ec0c99 100644 ---- a/t/110_sort_usage_by_attr_order.t -+++ b/t/110_sort_usage_by_attr_order.t -@@ -64,6 +64,18 @@ usage: 110_sort_usage_by_attr_order.t [-?] [long options...] - --baz STR Documentation for "baz" - USAGE - } -+if ( $Getopt::Long::Descriptive::VERSION >= 0.106 ) -+{ -+$expected = <<'USAGE'; -+usage: 110_sort_usage_by_attr_order.t [-?] [long options...] -+ --[no-]help (or -?) Prints -+ this usage information. -+ aka --usage -+ --foo STR Documentation for "foo" -+ --bar STR Documentation for "bar" -+ --baz STR Documentation for "baz" -+USAGE -+} - $expected =~ s/^[ ]{4}/\t/xmsg; - is($obj->usage->text, $expected, 'Usage text has nicely sorted options'); - - -From 45ae6aaabc5413e985860fbfcc8da3bdc929a054 Mon Sep 17 00:00:00 2001 -From: Paul Howarth -Date: Mon, 15 Mar 2021 10:43:14 +0000 -Subject: [PATCH 2/2] Update for Getopt-Long-Descriptive 0.107 - -GLD's use of Term::ReadKey has been reverted, so this update should now -work reliably. Use with GLD 0.106 is not supported. ---- - t/104_override_usage.t | 6 +++--- - t/110_sort_usage_by_attr_order.t | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/t/104_override_usage.t b/t/104_override_usage.t -index 6641540..f7c6a31 100644 ---- a/t/104_override_usage.t -+++ b/t/104_override_usage.t -@@ -61,15 +61,15 @@ use Test::Exception; - \t--foo INT A foo - } - : -- $Getopt::Long::Descriptive::VERSION < 0.106 ? -+ # Note: Getopt::Long::Descriptive 0.106 not supported -+ $Getopt::Long::Descriptive::VERSION < 0.107 ? - qq{usage: 104_override_usage.t [-?] [long options...] - \t-? --[no-]usage --[no-]help Prints this usage information. - \t--foo INT A foo - } - : - qq{usage: 104_override_usage.t [-?] [long options...] --\t--[no-]help (or -?) Prints --\t this usage information. -+\t--[no-]help (or -?) Prints this usage information. - \t aka --usage - \t--foo INT A foo - } -diff --git a/t/110_sort_usage_by_attr_order.t b/t/110_sort_usage_by_attr_order.t -index 7ec0c99..16cdaa1 100644 ---- a/t/110_sort_usage_by_attr_order.t -+++ b/t/110_sort_usage_by_attr_order.t -@@ -64,12 +64,12 @@ usage: 110_sort_usage_by_attr_order.t [-?] [long options...] - --baz STR Documentation for "baz" - USAGE - } --if ( $Getopt::Long::Descriptive::VERSION >= 0.106 ) -+# Note: Getopt::Long::Descriptive 0.106 not supported -+if ( $Getopt::Long::Descriptive::VERSION >= 0.107 ) - { - $expected = <<'USAGE'; - usage: 110_sort_usage_by_attr_order.t [-?] [long options...] -- --[no-]help (or -?) Prints -- this usage information. -+ --[no-]help (or -?) Prints this usage information. - aka --usage - --foo STR Documentation for "foo" - --bar STR Documentation for "bar" diff --git a/pkgs/development/python-modules/bytewax/remove-docs-test.patch b/pkgs/development/python-modules/bytewax/remove-docs-test.patch deleted file mode 100644 index 93b2adad18dc..000000000000 --- a/pkgs/development/python-modules/bytewax/remove-docs-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 107cab8..34cc544 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -66,7 +66,6 @@ long_description_content_type = "text/markdown" - addopts = "-v --doctest-modules" - doctest_optionflags = "NORMALIZE_WHITESPACE" - testpaths = [ -- "docs", - "pysrc", - "pytests", - ] diff --git a/pkgs/development/python-modules/cashaddress/default.nix b/pkgs/development/python-modules/cashaddress/default.nix index ec7d20a9af68..433bacc750d1 100644 --- a/pkgs/development/python-modules/cashaddress/default.nix +++ b/pkgs/development/python-modules/cashaddress/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "cashaddress"; - version = "1.0.6-unstable-2015-05-19"; + version = "1.0.6-unstable-2019-05-15"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,11 +27,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "cashaddress" ]; - meta = with lib; { + meta = { description = "Python tool for convert bitcoin cash legacy addresses"; homepage = "https://github.com/oskyk/cashaddress"; changelog = "https://github.com/oskyk/cashaddress/releases/tag/${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/contexttimer/default.nix b/pkgs/development/python-modules/contexttimer/default.nix index 6029a556a270..987339bc9922 100644 --- a/pkgs/development/python-modules/contexttimer/default.nix +++ b/pkgs/development/python-modules/contexttimer/default.nix @@ -1,47 +1,45 @@ { lib, buildPythonPackage, - pythonAtLeast, fetchFromGitHub, + pythonOlder, + setuptools, mock, - fetchpatch, - python, + pytestCheckHook, }: buildPythonPackage { pname = "contexttimer"; - version = "unstable-2019-03-30"; - format = "setuptools"; - - disabled = pythonAtLeast "3.12"; + version = "unstable-2024-09-05"; + pyproject = true; src = fetchFromGitHub { owner = "brouberol"; repo = "contexttimer"; - rev = "a866f420ed4c10f29abf252c58b11f9db6706100"; - hash = "sha256-Fc1vK1KSZWgBPtBf5dVydF6dLHEGAOslWMV0FLRdj8w="; + rev = "8e77927b8b75365f8e2bc456d2457b3e47c67815"; + hash = "sha256-LCyXJa+7XkfxzcLGonv1yfOW+gZhLFBAbBT+5IP39qA="; }; - patches = [ - # https://github.com/brouberol/contexttimer/pull/16 - (fetchpatch { - url = "https://github.com/brouberol/contexttimer/commit/dd65871f3f25a523a47a74f2f5306c57048592b0.patch"; - hash = "sha256-vNBuFXvuvb6hWPzg4W4iyKbd4N+vofhxsKydEkc25E4="; - }) + disabled = pythonOlder "3.12"; + + build-system = [ setuptools ]; + + preCheck = '' + substituteInPlace tests/test_timer.py \ + --replace-fail "assertRegexpMatches" "assertRegex" + ''; + + nativeCheckInputs = [ + mock + pytestCheckHook ]; pythonImportsCheck = [ "contexttimer" ]; - nativeCheckInputs = [ mock ]; - - checkPhase = '' - ${python.interpreter} -m unittest tests/test_timer.py - ''; - - meta = with lib; { + meta = { homepage = "https://github.com/brouberol/contexttimer"; description = "Timer as a context manager"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ atila ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ atila ]; }; } diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index 44eac5c91c86..f667e2ac0aa4 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "docling-core"; - version = "2.30.1"; + version = "2.31.2"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-core"; tag = "v${version}"; - hash = "sha256-HTWd3jEStoRlX9NYYEO3PmC9i/cn3k+SJ7RFP0fxa3M="; + hash = "sha256-O0GfEoWImDjehCPb8erBdY2gYalj2im8rxdJKEsbUs4="; }; build-system = [ diff --git a/pkgs/development/python-modules/eheimdigital/default.nix b/pkgs/development/python-modules/eheimdigital/default.nix index 438cbd43fa69..3dcc82c2d995 100644 --- a/pkgs/development/python-modules/eheimdigital/default.nix +++ b/pkgs/development/python-modules/eheimdigital/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "eheimdigital"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "autinerd"; repo = "eheimdigital"; tag = version; - hash = "sha256-dqQeRaPy9NtvRhmGUVBVzmORJNYxzM2X/ricJUBlCK0="; + hash = "sha256-Jg5jVJAH6y2yrospcPJwHc/B0yd5ZRSXC6T7gYk7Sxs="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/jax-jumpy/default.nix b/pkgs/development/python-modules/jax-jumpy/default.nix index 1fbda8b2cd3e..ac15b08f9203 100644 --- a/pkgs/development/python-modules/jax-jumpy/default.nix +++ b/pkgs/development/python-modules/jax-jumpy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Farama-Foundation"; - repo = pname; + repo = "jumpy"; rev = version; hash = "sha256-tPQ/v2AVnAEC+08BVAvvgJ8Pj89nXZSn2tQ6nxXuSfA="; }; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index f4cc175118ee..5f2175449c48 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kellyjonbrazil"; - repo = pname; + repo = "jc"; tag = "v${version}"; hash = "sha256-tv466jVjLtmn2U8t3sSyQLuzGcVf0RHtE+cFd8j8T5k="; }; diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix index f1a80c7419ae..e67942b68207 100644 --- a/pkgs/development/python-modules/jieba/default.nix +++ b/pkgs/development/python-modules/jieba/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # no tests in PyPI tarball src = fetchFromGitHub { owner = "fxsjy"; - repo = pname; + repo = "jieba"; rev = "v${version}"; sha256 = "028vmd6sj6wn9l1ilw7qfmlpyiysnlzdgdlhwxs6j4fvq0gyrwxk"; }; diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix index 5d3138f58234..aad075020bda 100644 --- a/pkgs/development/python-modules/jishaku/default.nix +++ b/pkgs/development/python-modules/jishaku/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Gorialis"; - repo = pname; + repo = "jishaku"; tag = version; hash = "sha256-+J8Tr8jPN9K3eHLOuJTaP3We5A1kiyn9/yI1KChbuMY="; }; diff --git a/pkgs/development/python-modules/jmp/default.nix b/pkgs/development/python-modules/jmp/default.nix index 8ca03df1fe0f..4cfd27d57a8f 100644 --- a/pkgs/development/python-modules/jmp/default.nix +++ b/pkgs/development/python-modules/jmp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "deepmind"; - repo = pname; + repo = "jmp"; tag = "v${version}"; hash = "sha256-+PefZU1209vvf1SfF8DXiTvKYEnZ4y8iiIr8yKikx9Y="; }; diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix index 951ce91ce43c..43803a6d67b3 100644 --- a/pkgs/development/python-modules/jpylyzer/default.nix +++ b/pkgs/development/python-modules/jpylyzer/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openpreserve"; - repo = pname; + repo = "jpylyzer"; rev = version; hash = "sha256-P42qAks8suI/Xknwd8WAkymbGE7RApRa/a11J/V4LA0="; }; diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index b5f3da6150ff..ba7b8bebcdc8 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wbolster"; - repo = pname; + repo = "jsonlines"; rev = version; hash = "sha256-KNEJdAxEgd0NGPnk9J51C3yUN2e6Cvvevth0iKOMlhE="; }; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 52224a0b8dcd..bed256951ca9 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "emlove"; - repo = pname; + repo = "jsonrpc-async"; rev = version; hash = "sha256-KOnycsOZFDEVj8CJDwGbdtbOpMPQMVdrXbHG0fzr9PI="; }; diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix index a3439ea1b824..eb6bb1030e62 100644 --- a/pkgs/development/python-modules/jsonschema-spec/default.nix +++ b/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "p1c2u"; - repo = pname; + repo = "jsonschema-spec"; tag = version; hash = "sha256-rCepDnVAOEsokKjWCuqDYbGIq6/wn4rsQRx5dXTUsYo="; }; diff --git a/pkgs/development/python-modules/jsonstreams/default.nix b/pkgs/development/python-modules/jsonstreams/default.nix index 49ffcee24b82..9367c986e06c 100644 --- a/pkgs/development/python-modules/jsonstreams/default.nix +++ b/pkgs/development/python-modules/jsonstreams/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dcbaker"; - repo = pname; + repo = "jsonstreams"; rev = version; sha256 = "0qw74wz9ngz9wiv89vmilbifsbvgs457yn1bxnzhrh7g4vs2wcav"; }; diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix index 2ff93168391a..8833775b8074 100644 --- a/pkgs/development/python-modules/junitparser/default.nix +++ b/pkgs/development/python-modules/junitparser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "weiwei"; - repo = pname; + repo = "junitparser"; rev = version; hash = "sha256-rhDP05GSWT4K6Z2ip8C9+e3WbvBJOwP0vctvANBs7cw="; }; diff --git a/pkgs/development/python-modules/justbackoff/default.nix b/pkgs/development/python-modules/justbackoff/default.nix index e8c680a89d37..b41a856afb02 100644 --- a/pkgs/development/python-modules/justbackoff/default.nix +++ b/pkgs/development/python-modules/justbackoff/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alexferl"; - repo = pname; + repo = "justbackoff"; rev = "v${version}"; sha256 = "097j6jxgl4b3z46x9y9z10643vnr9v831vhagrxzrq6nviil2z6l"; }; diff --git a/pkgs/development/python-modules/justbases/default.nix b/pkgs/development/python-modules/justbases/default.nix index 98225e212d5d..d234eb3b7457 100644 --- a/pkgs/development/python-modules/justbases/default.nix +++ b/pkgs/development/python-modules/justbases/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mulkieran"; - repo = pname; + repo = "justbases"; tag = "v${version}"; hash = "sha256-XraUh3beI2JqKPRHYN5W3Tn3gg0GJCwhnhHIOFdzh6U="; }; diff --git a/pkgs/development/python-modules/justbytes/default.nix b/pkgs/development/python-modules/justbytes/default.nix index cc662510a4a2..250744ffec64 100644 --- a/pkgs/development/python-modules/justbytes/default.nix +++ b/pkgs/development/python-modules/justbytes/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mulkieran"; - repo = pname; + repo = "justbytes"; tag = "v${version}"; hash = "sha256-+jwIK1ZU+j58VoOfZAm7GdFy7KHU28khwzxhYhcws74="; }; diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index ea26abeba91e..1632d83f1af9 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jackrosenthal"; - repo = pname; + repo = "kajiki"; tag = "v${version}"; hash = "sha256-EbXe4Jh2IKAYw9GE0kFgKVv9c9uAOiFFYaMF8CGaOfg="; }; diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix index c26bbabb60c7..154809e96f76 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "daanzu"; - repo = pname; + repo = "kaldi-active-grammar"; rev = "v${version}"; sha256 = "0lilk6yjzcy31avy2z36bl9lr60gzwhmyqwqn8akq11qc3mbffsk"; }; diff --git a/pkgs/development/python-modules/karton-asciimagic/default.nix b/pkgs/development/python-modules/karton-asciimagic/default.nix index 03abd44841fd..cfba1810c0bf 100644 --- a/pkgs/development/python-modules/karton-asciimagic/default.nix +++ b/pkgs/development/python-modules/karton-asciimagic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; - repo = pname; + repo = "karton-asciimagic"; tag = "v${version}"; hash = "sha256-sY5ik9efzLBa6Fbh17Vh4q7PlwOGYjuodU9yvp/8E3k="; }; diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix index 36433de8852c..369eb4659fa4 100644 --- a/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; - repo = pname; + repo = "karton-config-extractor"; tag = "v${version}"; hash = "sha256-a9wSw25q0blgAkR2s3brW7jGHJSLjx1yXjMmhMJNUFk="; }; diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index 7ea83ea1381b..d2b74a54e626 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; - repo = pname; + repo = "karton-dashboard"; tag = "v${version}"; hash = "sha256-VzBC7IATF8QBtTXMv4vmorAzBlImEsayjenQ2Uz5jIo="; }; diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index 3fbfc306e6f4..9c63036226ac 100644 --- a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; - repo = pname; + repo = "karton-mwdb-reporter"; tag = "v${version}"; hash = "sha256-KJh9uJzVGYEEk1ed56ynKA/+dK9ouDB7L06xERjfjdc="; }; diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix index cd98c09815b6..523dba33e895 100644 --- a/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; - repo = pname; + repo = "karton-yaramatcher"; tag = "v${version}"; hash = "sha256-URGW8FyJZ3ktrwolls5ElSWn8FD6vWCA+Eu0aGtPh6U="; }; diff --git a/pkgs/development/python-modules/keyboard/default.nix b/pkgs/development/python-modules/keyboard/default.nix index 7620e272ea71..169d3c068318 100644 --- a/pkgs/development/python-modules/keyboard/default.nix +++ b/pkgs/development/python-modules/keyboard/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "boppreh"; - repo = pname; + repo = "keyboard"; rev = "v${version}"; hash = "sha256-U4GWhPp28azBE3Jn9xpLxudOKx0PjnYO77EM2HsJ9lM="; }; diff --git a/pkgs/development/python-modules/kinparse/default.nix b/pkgs/development/python-modules/kinparse/default.nix index 8ddde08f68d8..7dc864b5b834 100644 --- a/pkgs/development/python-modules/kinparse/default.nix +++ b/pkgs/development/python-modules/kinparse/default.nix @@ -2,37 +2,49 @@ lib, buildPythonPackage, fetchFromGitHub, - pytest, - future, pyparsing, + pytestCheckHook, + setuptools, }: -buildPythonPackage { +buildPythonPackage rec { pname = "kinparse"; - version = "unstable-2019-12-18"; - format = "setuptools"; + version = "1.2.3"; + pyproject = true; src = fetchFromGitHub { owner = "xesscorp"; repo = "kinparse"; - rev = "eeb3f346d57a67a471bdf111f39bef8932644481"; - sha256 = "1nrjnybwzy93c79yylcwmb4lvkx7hixavnjwffslz0zwn32l0kx3"; + tag = version; + hash = "sha256-170e2uhqpk6u/hahivWYubr3Ptb8ijymJSxhxrAfuyI="; }; + # Remove python2 build support as it breaks python >= 3.13 + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "universal = 1" "universal = 0" + ''; + + build-system = [ setuptools ]; + + dependencies = [ pyparsing ]; + + pythonRemoveDeps = [ "future" ]; + + preCheck = '' + substituteInPlace tests/test_kinparse.py \ + --replace-fail "data/" "$src/tests/data/" + ''; + + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "kinparse" ]; - nativeCheckInputs = [ pytest ]; - - propagatedBuildInputs = [ - future - pyparsing - ]; - - meta = with lib; { + meta = { description = "Parser for KiCad EESCHEMA netlists"; mainProgram = "kinparse"; homepage = "https://github.com/xesscorp/kinparse"; - license = licenses.mit; - maintainers = with maintainers; [ matthuszagh ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ matthuszagh ]; }; } diff --git a/pkgs/development/python-modules/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix index 47b98e771175..3263941c69b6 100644 --- a/pkgs/development/python-modules/kiss-headers/default.nix +++ b/pkgs/development/python-modules/kiss-headers/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Ousret"; - repo = pname; + repo = "kiss-headers"; tag = version; hash = "sha256-WeAzlC1yT+0nPSuB278z8T0XvPjbre051f/Rva5ujAk="; }; diff --git a/pkgs/development/python-modules/kivy-garden-modernmenu/default.nix b/pkgs/development/python-modules/kivy-garden-modernmenu/default.nix deleted file mode 100644 index 7ebb517f7de6..000000000000 --- a/pkgs/development/python-modules/kivy-garden-modernmenu/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - kivy, -}: - -buildPythonPackage { - pname = "kivy-garden-modernmenu"; - version = "0-unstable-2019-12-10"; - pyproject = true; - - src = fetchFromGitHub { - owner = "kivy-garden"; - repo = "modernmenu"; - rev = "681c3bf68b9ce2ebe653c2e6a9fcd2407bfe3e00"; - hash = "sha256-0d4UhmRtuYwnYoZajjExavlvqkhGamiEQ8GjHWYnO88="; - }; - - strictDeps = true; - - build-system = [ - setuptools - ]; - - checkInputs = [ - kivy - ]; - - pythonImportsCheck = [ - "kivy_garden.modernmenu" - ]; - - preInstallCheck = '' - export HOME=$PWD - ''; - - meta = { - description = "Stylized menu system for Kivy"; - homepage = "https://github.com/kivy-garden/modernmenu"; - license = lib.licenses.mit; - teams = [ lib.teams.ngi ]; - }; -} diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index c120217683c6..640ea71d1f77 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jonashaag"; - repo = pname; + repo = "klaus"; rev = version; hash = "sha256-GflSDhBmMsQ34o3ApraEJ6GmlXXP2kK6WW3lsfr6b7g="; }; diff --git a/pkgs/development/python-modules/kml2geojson/default.nix b/pkgs/development/python-modules/kml2geojson/default.nix index 3b392a227aae..7674d73770f0 100644 --- a/pkgs/development/python-modules/kml2geojson/default.nix +++ b/pkgs/development/python-modules/kml2geojson/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mrcagney"; - repo = pname; + repo = "kml2geojson"; rev = version; hash = "sha256-iJEcXpvy+Y3MkxAF2Q1Tkcx8GxUVjeVzv6gl134zdiI="; }; diff --git a/pkgs/development/python-modules/kornia/default.nix b/pkgs/development/python-modules/kornia/default.nix index d149caec9d0c..943bcf4931ac 100644 --- a/pkgs/development/python-modules/kornia/default.nix +++ b/pkgs/development/python-modules/kornia/default.nix @@ -17,8 +17,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "kornia"; + repo = "kornia"; tag = "v${version}"; hash = "sha256-pMCGL33DTnMLlxRbhBhRuR/ZA575+kbUJ59N3nuqpdI="; }; diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index fa332452fbbd..80c5f0e8139e 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -112,6 +112,7 @@ buildPythonPackage rec { # requires bs4, aka BeautifulSoup "test_importable_all" # flaky + "test_llm_caching" "test_llm_caching_async" ]; diff --git a/pkgs/development/python-modules/lanms-neo/default.nix b/pkgs/development/python-modules/lanms-neo/default.nix index b4d734e5cda1..d829be9a0b3e 100644 --- a/pkgs/development/python-modules/lanms-neo/default.nix +++ b/pkgs/development/python-modules/lanms-neo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "gen-ko"; - repo = pname; + repo = "lanms-neo"; rev = "6510e19e731a1e105d42b2fbda64de41c169ce2e"; hash = "sha256-0fs4RNN1ptiir7GfR9B8HK0VqTkk5PbVJxgKiDId3po="; }; diff --git a/pkgs/development/python-modules/laszip/default.nix b/pkgs/development/python-modules/laszip/default.nix index 461102cc69db..eb09169ae560 100644 --- a/pkgs/development/python-modules/laszip/default.nix +++ b/pkgs/development/python-modules/laszip/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tmontaigu"; - repo = pname; + repo = "laszip-python"; rev = version; hash = "sha256-MiPzL9TDCf1xnCv7apwdfcpkFnBRi4PO/atTQxqL8cw="; }; diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index 265bfeab5443..863c624368e4 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "saltstack"; - repo = pname; + repo = "libnacl"; rev = "v${version}"; hash = "sha256-phECLGDcBfDi/r2y0eGtqgIX/hvirtBqO8UUvEJ66zo="; }; diff --git a/pkgs/development/python-modules/lightparam/default.nix b/pkgs/development/python-modules/lightparam/default.nix index 635827b45669..70467aadfc02 100644 --- a/pkgs/development/python-modules/lightparam/default.nix +++ b/pkgs/development/python-modules/lightparam/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "portugueslab"; - repo = pname; + repo = "lightparam"; rev = "v${version}"; sha256 = "13hlkvjcyz2lhvlfqyavja64jccbidshhs39sl4fibrn9iq34s3i"; }; diff --git a/pkgs/development/python-modules/limiter/default.nix b/pkgs/development/python-modules/limiter/default.nix index 4da1afdb4f88..ab7dc2851c51 100644 --- a/pkgs/development/python-modules/limiter/default.nix +++ b/pkgs/development/python-modules/limiter/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alexdelorenzo"; - repo = pname; + repo = "limiter"; rev = "v${version}"; hash = "sha256-2Et4ozVf9t+tp2XtLbDk/LgLIU+jQAEAlU8hA5lpxdk="; }; diff --git a/pkgs/development/python-modules/lineedit/default.nix b/pkgs/development/python-modules/lineedit/default.nix index 51f5e5a83407..dd892eca9981 100644 --- a/pkgs/development/python-modules/lineedit/default.nix +++ b/pkgs/development/python-modules/lineedit/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "randy3k"; - repo = pname; + repo = "lineedit"; rev = "v${version}"; sha256 = "fq2NpjIQkIq1yzXEUxi6cz80kutVqcH6MqJXHtpTFsk="; }; diff --git a/pkgs/development/python-modules/linkify-it-py/default.nix b/pkgs/development/python-modules/linkify-it-py/default.nix index 6ca3fd64c917..2f4bb1c01422 100644 --- a/pkgs/development/python-modules/linkify-it-py/default.nix +++ b/pkgs/development/python-modules/linkify-it-py/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tsutsu3"; - repo = pname; + repo = "linkify-it-py"; tag = "v${version}"; hash = "sha256-BLwIityUZDVdSbvTpLf6QUlZUavWzG/45Nfffn18/vU="; }; diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index 64652c948c67..89baf11fa20c 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -26,8 +26,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "liquidctl"; + repo = "liquidctl"; tag = "v${version}"; hash = "sha256-ifYPUAF0lR9aCwiseNQZXbq+d+CXD/MwnZQhAM1TRLI="; }; diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix index 80ef631363e9..7fb95e0b8d2e 100644 --- a/pkgs/development/python-modules/livelossplot/default.nix +++ b/pkgs/development/python-modules/livelossplot/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stared"; - repo = pname; + repo = "livelossplot"; tag = "v${version}"; hash = "sha256-qC1FBFJyf2IlDIffJ5Xs89WcN/GFA/8maODhc1u2xhA="; }; diff --git a/pkgs/development/python-modules/lm-format-enforcer/default.nix b/pkgs/development/python-modules/lm-format-enforcer/default.nix index 26764b305987..c44943046550 100644 --- a/pkgs/development/python-modules/lm-format-enforcer/default.nix +++ b/pkgs/development/python-modules/lm-format-enforcer/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "noamgat"; - repo = pname; + repo = "lm-format-enforcer"; tag = "v${version}"; hash = "sha256-8BsfA1R/X+wA0H0MqQKn+CljUIT8VdoInoczSGvu74o="; }; diff --git a/pkgs/development/python-modules/loca/default.nix b/pkgs/development/python-modules/loca/default.nix index 73b88dee28e9..87969790bb89 100644 --- a/pkgs/development/python-modules/loca/default.nix +++ b/pkgs/development/python-modules/loca/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromSourcehut { owner = "~cnx"; - repo = pname; + repo = "loca"; rev = version; sha256 = "1l6jimw3wd81nz1jrzsfw1zzsdm0jm998xlddcqaq0h38sx69w8g"; }; diff --git a/pkgs/development/python-modules/logging-journald/default.nix b/pkgs/development/python-modules/logging-journald/default.nix index 14b1ac2ce6fc..3dd36d8d1b2b 100644 --- a/pkgs/development/python-modules/logging-journald/default.nix +++ b/pkgs/development/python-modules/logging-journald/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mosquito"; - repo = pname; + repo = "logging-journald"; tag = version; hash = "sha256-RQ9opkAOZfhYuqOXJ2Mtnig8soL+lCveYH2YdXL1AGM="; }; diff --git a/pkgs/development/python-modules/logster/default.nix b/pkgs/development/python-modules/logster/default.nix index 19fa5b64b9ed..0db0a88dacb6 100644 --- a/pkgs/development/python-modules/logster/default.nix +++ b/pkgs/development/python-modules/logster/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "etsy"; - repo = pname; + repo = "logster"; rev = version; sha256 = "06ac5hydas24h2cn8l5i69v1z0min5hwh6a1lcm1b08xnvpsi85q"; }; diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 5fa1a0251bc5..062e33372d36 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Delgan"; - repo = pname; + repo = "loguru"; tag = version; hash = "sha256-tccEzzs9TtFAZM9s43cskF9llc81Ng28LqedjLiE1m4="; }; diff --git a/pkgs/development/python-modules/luddite/default.nix b/pkgs/development/python-modules/luddite/default.nix index 435db8725cd0..5a421d68218a 100644 --- a/pkgs/development/python-modules/luddite/default.nix +++ b/pkgs/development/python-modules/luddite/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jumptrading"; - repo = pname; + repo = "luddite"; tag = "v${version}"; hash = "sha256-iJ3h1XRBzLd4cBKFPNOlIV5Z5XJ/miscfIdkpPIpbJ8="; }; diff --git a/pkgs/development/python-modules/luhn/default.nix b/pkgs/development/python-modules/luhn/default.nix index b0407235fe0a..888d0913ba06 100644 --- a/pkgs/development/python-modules/luhn/default.nix +++ b/pkgs/development/python-modules/luhn/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mmcloughlin"; - repo = pname; + repo = "luhn"; rev = version; hash = "sha256-ZifaCjOVhWdXuzi5n6V+6eVN5vrEHKgUdpSOXoMyR18="; }; diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix index a465014b5951..24b46b47a25b 100644 --- a/pkgs/development/python-modules/lyricwikia/default.nix +++ b/pkgs/development/python-modules/lyricwikia/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "enricobacis"; - repo = pname; + repo = "lyricwikia"; tag = version; hash = "sha256-P88DrRAa2zptt8JLy0/PLi0oZ/BghF/XGSP0kOObi7E="; }; diff --git a/pkgs/development/python-modules/lzallright/default.nix b/pkgs/development/python-modules/lzallright/default.nix index 9c6bd3cf1c60..fe9a2212b62e 100644 --- a/pkgs/development/python-modules/lzallright/default.nix +++ b/pkgs/development/python-modules/lzallright/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vlaci"; - repo = pname; + repo = "lzallright"; rev = "v${version}"; hash = "sha256-E4Eaah58JCbxXfmpqFS2Emi1/eo2L3qyJP+vWH3PHPg="; }; diff --git a/pkgs/development/python-modules/macholib/default.nix b/pkgs/development/python-modules/macholib/default.nix index 6bf2ec3eeeb7..d1fd68b020e7 100644 --- a/pkgs/development/python-modules/macholib/default.nix +++ b/pkgs/development/python-modules/macholib/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ronaldoussoren"; - repo = pname; + repo = "macholib"; rev = "v${version}"; hash = "sha256-bTql10Ceny4fBCxnEWz1m1wi03EWMDW9u99IQiWYbnY="; }; diff --git a/pkgs/development/python-modules/macropy/default.nix b/pkgs/development/python-modules/macropy/default.nix index d87d2de44bb5..6a9de5a4f57c 100644 --- a/pkgs/development/python-modules/macropy/default.nix +++ b/pkgs/development/python-modules/macropy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lihaoyi"; - repo = pname; + repo = "macropy"; rev = "v${version}"; sha256 = "1bd2fzpa30ddva3f8lw2sbixxf069idwib8srd64s5v46ricm2cf"; }; diff --git a/pkgs/development/python-modules/markdown-include/default.nix b/pkgs/development/python-modules/markdown-include/default.nix index 69da5c6ae1c6..a1797b5ecd8d 100644 --- a/pkgs/development/python-modules/markdown-include/default.nix +++ b/pkgs/development/python-modules/markdown-include/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # only wheel on pypi src = fetchFromGitHub { owner = "cmacmackin"; - repo = pname; + repo = "markdown-include"; tag = "v${version}"; hash = "sha256-1MEk0U00a5cpVhqnDZkwBIk4NYgsRXTVsI/ANNQ/OH0="; }; diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index 8aa6678241f2..4ccd9e7b5bcd 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; - repo = pname; + repo = "markdown-it-py"; tag = "v${version}"; hash = "sha256-cmjLElJA61EysTUFMVY++Kw0pI4wOIXOyCY3To9fpQc="; }; diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 304f143b884b..d582af3fbecf 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "HPAC"; - repo = pname; + repo = "matchpy"; rev = version; hash = "sha256-n5rXIjqVQZzEbfIZVQiGLh2PR1DHAJ9gumcrbvwnasA="; }; diff --git a/pkgs/development/python-modules/mbstrdecoder/default.nix b/pkgs/development/python-modules/mbstrdecoder/default.nix index b9bb0227dc35..c914816defa5 100644 --- a/pkgs/development/python-modules/mbstrdecoder/default.nix +++ b/pkgs/development/python-modules/mbstrdecoder/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thombashi"; - repo = pname; + repo = "mbstrdecoder"; tag = "v${version}"; hash = "sha256-rJ3Q7/xYPO0jBuzhYm2aIhPar2tbJIxHnHR0y0HWtik="; }; diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index a58c2aad44b7..92912f5f477a 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "py-mine"; - repo = pname; + repo = "mcstatus"; tag = "v${version}"; hash = "sha256-P8Su5P/ztyoXZBVvm5uCMDn4ezeg11oRSQ0QCyIJbVw="; }; diff --git a/pkgs/development/python-modules/mdformat-beautysh/default.nix b/pkgs/development/python-modules/mdformat-beautysh/default.nix index b0015e740382..2b5d8fd23fab 100644 --- a/pkgs/development/python-modules/mdformat-beautysh/default.nix +++ b/pkgs/development/python-modules/mdformat-beautysh/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hukkin"; - repo = pname; + repo = "mdformat-beautysh"; tag = version; hash = "sha256-mH9PN6QsPmnIzh/0vxa+5mYLzANUHRruXC0ql4h8myw="; }; diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix index a5cdee5cfcea..47f7dfe3e1f7 100644 --- a/pkgs/development/python-modules/mdformat-footnote/default.nix +++ b/pkgs/development/python-modules/mdformat-footnote/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; - repo = pname; + repo = "mdformat-footnote"; tag = "v${version}"; hash = "sha256-DUCBWcmB5i6/HkqxjlU3aTRO7i0n2sj+e/doKB8ffeo="; }; diff --git a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix index 9da3ed6de832..0f7c36fc86b2 100644 --- a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix +++ b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "csala"; - repo = pname; + repo = "mdformat-simple-breaks"; tag = "v${version}"; hash = "sha256-4lJHB4r9lI2uGJ/BmFFc92sumTRKBBwiRmGBdQkzfd0="; }; diff --git a/pkgs/development/python-modules/mdformat-tables/default.nix b/pkgs/development/python-modules/mdformat-tables/default.nix index c1bf086d863b..c600efbb2f72 100644 --- a/pkgs/development/python-modules/mdformat-tables/default.nix +++ b/pkgs/development/python-modules/mdformat-tables/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; - repo = pname; + repo = "mdformat-tables"; tag = "v${version}"; hash = "sha256-7MbpGBGprhGrQ9P31HUU2h0bjyHWap6DETVN/dCDA1w="; }; diff --git a/pkgs/development/python-modules/mdformat-toc/default.nix b/pkgs/development/python-modules/mdformat-toc/default.nix index 325c85a67c29..1b2fd6af0164 100644 --- a/pkgs/development/python-modules/mdformat-toc/default.nix +++ b/pkgs/development/python-modules/mdformat-toc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hukkin"; - repo = pname; + repo = "mdformat-toc"; tag = version; hash = "sha256-3EX6kGez408tEYiR9VSvi3GTrb4ds+HJwpFflv77nkg="; }; diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 92362d5e02fc..e15183ec07f2 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; - repo = pname; + repo = "mdit-py-plugins"; tag = "v${version}"; hash = "sha256-aY2DMLh1OkWVcN6A29FLba1ETerf/EOqSjHVpsdE21M="; }; diff --git a/pkgs/development/python-modules/mdurl/default.nix b/pkgs/development/python-modules/mdurl/default.nix index 6a5e3a7cdc73..8e053530f396 100644 --- a/pkgs/development/python-modules/mdurl/default.nix +++ b/pkgs/development/python-modules/mdurl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hukkin"; - repo = pname; + repo = "mdurl"; rev = version; hash = "sha256-wxV8DKeTwKpFTUBuGTQXaVHc0eW1//Y+2V8Kgs85TDM="; }; diff --git a/pkgs/development/python-modules/mdutils/default.nix b/pkgs/development/python-modules/mdutils/default.nix index 49334a6e54a7..d6ff38e1a6ed 100644 --- a/pkgs/development/python-modules/mdutils/default.nix +++ b/pkgs/development/python-modules/mdutils/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "didix21"; - repo = pname; + repo = "mdutils"; tag = "v${version}"; hash = "sha256-xF6z63CjL/qSBQsm/fSTQhwpg9yJU4qrY06cjn1PbCk="; }; diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index 3db5517dafeb..16920fd860be 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NanoComp"; - repo = pname; + repo = "meep"; tag = "v${version}"; hash = "sha256-9cQHvwUAeop5dRMVvedph+KQvTcmnkHdfqPQlSY280c="; }; diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix index 7fd6e040a2af..9d8f59cbef96 100644 --- a/pkgs/development/python-modules/mercantile/default.nix +++ b/pkgs/development/python-modules/mercantile/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mapbox"; - repo = pname; + repo = "mercantile"; rev = version; hash = "sha256-DiDXO2XnD3We6NhP81z7aIHzHrHDi/nkqy98OT9986w="; }; diff --git a/pkgs/development/python-modules/meteocalc/default.nix b/pkgs/development/python-modules/meteocalc/default.nix index 38c39d7d42ca..75008e31fd1a 100644 --- a/pkgs/development/python-modules/meteocalc/default.nix +++ b/pkgs/development/python-modules/meteocalc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "malexer"; - repo = pname; + repo = "meteocalc"; rev = version; hash = "sha256-WuIW6hROQkjMfbCLUouECIrp4s6oCd2/N79hsrTbVTk="; }; diff --git a/pkgs/development/python-modules/mhcgnomes/default.nix b/pkgs/development/python-modules/mhcgnomes/default.nix index 9a1a470d7a72..f409daef50ec 100644 --- a/pkgs/development/python-modules/mhcgnomes/default.nix +++ b/pkgs/development/python-modules/mhcgnomes/default.nix @@ -7,14 +7,14 @@ serializable, }: -buildPythonPackage rec { +buildPythonPackage { pname = "mhcgnomes"; version = "1.8.6"; format = "setuptools"; src = fetchFromGitHub { owner = "pirl-unc"; - repo = pname; + repo = "mhcgnomes"; # See https://github.com/pirl-unc/mhcgnomes/issues/20. As of 2023-07-13, # they do no have version tags. rev = "c7e779b60e35a031f6e0f0ea6ae70e8a8e7671c6"; diff --git a/pkgs/development/python-modules/midea-beautiful-air/default.nix b/pkgs/development/python-modules/midea-beautiful-air/default.nix index 628675325a23..22cbfb5fbd99 100644 --- a/pkgs/development/python-modules/midea-beautiful-air/default.nix +++ b/pkgs/development/python-modules/midea-beautiful-air/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nbogojevic"; - repo = pname; + repo = "midea-beautiful-air"; tag = "v${version}"; hash = "sha256-786Q085bv8Zsm0c55I4XalRhEfwElRTJds5qnb0cWhk="; }; diff --git a/pkgs/development/python-modules/midea-local/default.nix b/pkgs/development/python-modules/midea-local/default.nix index b0dfd7746e42..47d827f46c82 100644 --- a/pkgs/development/python-modules/midea-local/default.nix +++ b/pkgs/development/python-modules/midea-local/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "midea-lan"; - repo = pname; + repo = "midea-local"; tag = "v${version}"; hash = "sha256-zXOxgPFX6TRdFnQ0OqqEu1sy9MmlfxEg7KedQWxYv48="; }; diff --git a/pkgs/development/python-modules/minimock/default.nix b/pkgs/development/python-modules/minimock/default.nix index 63e8ef0b3778..a10fa1f89a7f 100644 --- a/pkgs/development/python-modules/minimock/default.nix +++ b/pkgs/development/python-modules/minimock/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lowks"; - repo = pname; + repo = "minimock"; rev = "v${version}"; hash = "sha256-Ut3iKc7Sr28uGgWCV3K3CS+gBta2icvbUPMjjo4fflU="; }; diff --git a/pkgs/development/python-modules/mkdocs-redirects/default.nix b/pkgs/development/python-modules/mkdocs-redirects/default.nix index 6a2d973b1af6..db31a2076db7 100644 --- a/pkgs/development/python-modules/mkdocs-redirects/default.nix +++ b/pkgs/development/python-modules/mkdocs-redirects/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkdocs"; - repo = pname; + repo = "mkdocs-redirects"; tag = "v${version}"; hash = "sha256-YsMA00yajeGSqSB6CdKxGqyClC9Cgc3ImRBTucHEHhs="; }; diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 2a2a49fd9b91..8151b8728526 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -42,8 +42,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "mkdocs"; + repo = "mkdocs"; tag = version; hash = "sha256-JQSOgV12iYE6FubxdoJpWy9EHKFxyKoxrm/7arCn9Ak="; }; diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix index 3cf1095b20ea..ee0cade32736 100644 --- a/pkgs/development/python-modules/mock-open/default.nix +++ b/pkgs/development/python-modules/mock-open/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # no tests in PyPI tarball src = fetchFromGitHub { owner = "nivbend"; - repo = pname; + repo = "mock-open"; rev = "v${version}"; sha256 = "0qlz4y8jqxsnmqg03yp9f87rmnjrvmxm5qvm6n1218gm9k5dixbm"; }; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index 1d273556bc06..a65c74c5c27e 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MongoEngine"; - repo = pname; + repo = "mongoengine"; tag = "v${version}"; hash = "sha256-trWCKmCa+q+qtzF0HKCZMnko1cvvpwJvczLFuKtB83E="; }; diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix index a733f70a824c..f45195078d38 100644 --- a/pkgs/development/python-modules/moonraker-api/default.nix +++ b/pkgs/development/python-modules/moonraker-api/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cmroche"; - repo = pname; + repo = "moonraker-api"; tag = "v${version}"; hash = "sha256-AwSHF9BbxKBXIQdG4OX1vYYP/ST4jSz3uMMDUx0MSEg="; }; diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index 487de3c3228c..8af5521584c1 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dermotduffy"; - repo = pname; + repo = "motioneye-client"; rev = "v${version}"; hash = "sha256-kgFSd5RjO+OtnPeAOimPTDVEfJ47rXh2Ku5xEYStHv8="; }; diff --git a/pkgs/development/python-modules/mpl-scatter-density/default.nix b/pkgs/development/python-modules/mpl-scatter-density/default.nix index f8b4444ec0d8..bbf5d732b29c 100644 --- a/pkgs/development/python-modules/mpl-scatter-density/default.nix +++ b/pkgs/development/python-modules/mpl-scatter-density/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astrofrog"; - repo = pname; + repo = "mpl-scatter-density"; tag = "v${version}"; hash = "sha256-pDiKJAN/4WFf5icNU/ZGOvw0jqN3eGZHgilm2oolpbE="; }; diff --git a/pkgs/development/python-modules/mpldatacursor/default.nix b/pkgs/development/python-modules/mpldatacursor/default.nix index 4b33f34b93ed..ca1721ea8ecf 100644 --- a/pkgs/development/python-modules/mpldatacursor/default.nix +++ b/pkgs/development/python-modules/mpldatacursor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "joferkington"; - repo = pname; + repo = "mpldatacursor"; rev = "v${version}"; sha256 = "0i1lwl6x6hgjq4xwsc138i4v5895lmnpfqwpzpnj5mlck6fy6rda"; }; diff --git a/pkgs/development/python-modules/mpris-server/default.nix b/pkgs/development/python-modules/mpris-server/default.nix index 06383416d96c..12c21f90cd9e 100644 --- a/pkgs/development/python-modules/mpris-server/default.nix +++ b/pkgs/development/python-modules/mpris-server/default.nix @@ -7,44 +7,38 @@ pygobject3, unidecode, setuptools, + strenum, }: buildPythonPackage rec { pname = "mpris-server"; - version = "0.4.2"; + version = "0.9.6"; pyproject = true; src = fetchPypi { pname = "mpris_server"; inherit version; - hash = "sha256-p3nM80fOMtRmeKvOXuX40Fu9xH8gPgYyneXbUS678fE="; + hash = "sha256-T0ZeDQiYIAhKR8aw3iv3rtwzc+R0PTQuIh6+Hi4rIHQ="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ emoji pydbus pygobject3 + strenum unidecode ]; - pythonRelaxDeps = [ "emoji" ]; - pythonImportsCheck = [ "mpris_server" ]; # upstream has no tests doCheck = false; - # update doesn't support python311 and monophony, the only consumer requires - # 0.4.2 - passthru.skipBulkUpdate = true; - - meta = with lib; { + meta = { description = "Publish a MediaPlayer2 MPRIS device to D-Bus"; homepage = "https://pypi.org/project/mpris-server/"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ quadradical ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ quadradical ]; }; } diff --git a/pkgs/development/python-modules/multimethod/default.nix b/pkgs/development/python-modules/multimethod/default.nix index 048ed3cd91a2..e8f3d7fe965b 100644 --- a/pkgs/development/python-modules/multimethod/default.nix +++ b/pkgs/development/python-modules/multimethod/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "coady"; - repo = pname; + repo = "multimethod"; tag = "v${version}"; hash = "sha256-/91re2K+nVKULJOjDoimpOukQlLlsMS9blkVQWit2eI="; }; diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index 520f9d2846bf..b6d7620a4aef 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "uqfoundation"; - repo = pname; + repo = "multiprocess"; tag = version; hash = "sha256-TKD0iQv5Go4PrKWtVOF6FJG1tkvs3APxPlhDVEs7YXE="; }; diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix deleted file mode 100644 index 6f7bf72c4a6e..000000000000 --- a/pkgs/development/python-modules/mutag/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pyparsing, - pythonOlder, - setuptools, -}: - -buildPythonPackage { - pname = "mutag"; - version = "0.0.2-unstable-2018-08-20"; - pyproject = true; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "aroig"; - repo = "mutag"; - rev = "9425169eb5d4aa9eb09f2809a09b83855b3acbef"; - hash = "sha256-fEMmFRoFyLkqusAuhdx3XEPaPsu1x86ACAz9Vkl9YfA="; - }; - - build-system = [ setuptools ]; - - dependencies = [ pyparsing ]; - - # Module has no tests - doCheck = false; - - pythonImportsCheck = [ "mutag" ]; - - meta = with lib; { - description = "Script to change email tags in a mu indexed maildir"; - homepage = "https://github.com/aroig/mutag"; - license = licenses.gpl3Plus; - maintainers = [ ]; - mainProgram = "mutag"; - }; -} diff --git a/pkgs/development/python-modules/mutf8/default.nix b/pkgs/development/python-modules/mutf8/default.nix index c7d2afdd1308..ab7bde62fc6b 100644 --- a/pkgs/development/python-modules/mutf8/default.nix +++ b/pkgs/development/python-modules/mutf8/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "TkTech"; - repo = pname; + repo = "mutf8"; rev = "v${version}"; hash = "sha256-4Ojn3t0EbOVdrYEiY8JegJuvW9sz8jt9tKFwOluiGQo="; }; diff --git a/pkgs/development/python-modules/mwdblib/default.nix b/pkgs/development/python-modules/mwdblib/default.nix index a987296aaf89..154d2eba925f 100644 --- a/pkgs/development/python-modules/mwdblib/default.nix +++ b/pkgs/development/python-modules/mwdblib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; - repo = pname; + repo = "mwdblib"; tag = "v${version}"; hash = "sha256-+hh7SJFITpLumIuzNgBbXtFh+26tUG66UFv6DLDk5ag="; }; diff --git a/pkgs/development/python-modules/myhome/default.nix b/pkgs/development/python-modules/myhome/default.nix index ce22d1a25c63..a8a1485522ef 100644 --- a/pkgs/development/python-modules/myhome/default.nix +++ b/pkgs/development/python-modules/myhome/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "speijnik"; - repo = pname; + repo = "myhome"; rev = "v${version}"; hash = "sha256-DJzwvgvSA9Q0kpueUoQV64pdDDNA7WzGu7r+g5aqutk="; }; diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index 8e1ab236ac48..ca8edc4a3720 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; - repo = pname; + repo = "myst-parser"; tag = "v${version}"; hash = "sha256-/Prauz4zuJY39EK2BmgBbH1uwjF4K38e5X5hPYwRBl0="; }; diff --git a/pkgs/development/python-modules/name-that-hash/default.nix b/pkgs/development/python-modules/name-that-hash/default.nix index ae094b0a142c..27aeb4255e84 100644 --- a/pkgs/development/python-modules/name-that-hash/default.nix +++ b/pkgs/development/python-modules/name-that-hash/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "HashPals"; - repo = pname; + repo = "name-that-hash"; rev = version; hash = "sha256-zOb4BS3zG1x8GLXAooqqvMOw0fNbw35JuRWOdGP26/8="; }; diff --git a/pkgs/development/python-modules/names/default.nix b/pkgs/development/python-modules/names/default.nix index c4648e171a72..4b6467ddad18 100644 --- a/pkgs/development/python-modules/names/default.nix +++ b/pkgs/development/python-modules/names/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "treyhunner"; - repo = pname; + repo = "names"; rev = version; sha256 = "0jfn11bl05k3qkqw0f4vi2i2lhllxdrbb1732qiisdy9fbvv8611"; }; diff --git a/pkgs/development/python-modules/napari-plugin-engine/default.nix b/pkgs/development/python-modules/napari-plugin-engine/default.nix index 6fcabe6ffd2c..194575643117 100644 --- a/pkgs/development/python-modules/napari-plugin-engine/default.nix +++ b/pkgs/development/python-modules/napari-plugin-engine/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "napari"; - repo = pname; + repo = "napari-plugin-engine"; tag = "v${version}"; hash = "sha256-cKpCAEYYRq3UPje7REjzhEe1J9mmrtXs8TBnxWukcNE="; }; diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index a6be3e24a047..cb594e483203 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -27,7 +27,7 @@ let src = fetchFromGitHub { owner = "jupyter"; - repo = pname; + repo = "nbclient"; tag = "v${version}"; hash = "sha256-+qSed6yy4YVZ25GigNTap+kMaoDiMYSJO85wurbzeDs="; }; diff --git a/pkgs/development/python-modules/ndspy/default.nix b/pkgs/development/python-modules/ndspy/default.nix index ea749eda1e9d..f769f2132561 100644 --- a/pkgs/development/python-modules/ndspy/default.nix +++ b/pkgs/development/python-modules/ndspy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RoadrunnerWMC"; - repo = pname; + repo = "ndspy"; tag = "v${version}"; hash = "sha256-PQONVEuh5Fg2LHr4gq0XTGcOpps/s9FSgoyDn4BCcik="; }; diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix index cd0725bc5eb6..3c774de642b7 100644 --- a/pkgs/development/python-modules/nh3/default.nix +++ b/pkgs/development/python-modules/nh3/default.nix @@ -12,7 +12,7 @@ let version = "0.2.21"; src = fetchFromGitHub { owner = "messense"; - repo = pname; + repo = "nh3"; rev = "v${version}"; hash = "sha256-DskjcKjdz1HmKzmA568zRCjh4UK1/LBD5cSIu7Rfwok="; }; diff --git a/pkgs/development/python-modules/nmapthon2/default.nix b/pkgs/development/python-modules/nmapthon2/default.nix index 0a518c29013c..3bc59c632991 100644 --- a/pkgs/development/python-modules/nmapthon2/default.nix +++ b/pkgs/development/python-modules/nmapthon2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cblopez"; - repo = pname; + repo = "nmapthon2"; rev = "v${version}"; hash = "sha256-4Na75TdKDywUomJF4tDWUWwCCtcOSxBUMOF7+FDhbpY="; }; diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index 16f48f3725e7..76e334c8ba9c 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ms7m"; - repo = pname; + repo = "notify-py"; tag = "v${version}"; hash = "sha256-4PJ/0dLG3bWDuF1G/qUmvNaIUFXgPP2S/0uhZz86WRA="; }; diff --git a/pkgs/development/python-modules/nptyping/default.nix b/pkgs/development/python-modules/nptyping/default.nix index d09c3daf59af..a27dadeb48fc 100644 --- a/pkgs/development/python-modules/nptyping/default.nix +++ b/pkgs/development/python-modules/nptyping/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ramonhagenaars"; - repo = pname; + repo = "nptyping"; tag = "v${version}"; hash = "sha256-hz4YrcvARCAA7TXapmneIwle/F4pzcIYLPSmiFHC0VQ="; }; diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix index 9f1a3089fc60..368cfc25151a 100644 --- a/pkgs/development/python-modules/nsz/default.nix +++ b/pkgs/development/python-modules/nsz/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nicoboss"; - repo = pname; + repo = "nsz"; tag = version; hash = "sha256-ch4HzQFa95o3HMsi7R0LpPWmhN/Z9EYfrmCdUZLwPSE="; }; diff --git a/pkgs/development/python-modules/numdifftools/default.nix b/pkgs/development/python-modules/numdifftools/default.nix index 29dee4bbbaa4..bd7fb86615f7 100644 --- a/pkgs/development/python-modules/numdifftools/default.nix +++ b/pkgs/development/python-modules/numdifftools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pbrod"; - repo = pname; + repo = "numdifftools"; rev = "v${version}"; hash = "sha256-HYacLaowSDdrwkxL1h3h+lw/8ahzaecpXEnwrCqMCWk="; }; diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix index bbd8361aea8b..bbe611db0734 100644 --- a/pkgs/development/python-modules/nxt-python/default.nix +++ b/pkgs/development/python-modules/nxt-python/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "schodet"; - repo = pname; + repo = "nxt-python"; tag = version; hash = "sha256-ffJ7VhXT5I7i5JYfnjFBaud0CxoVBFWx6kRdAz+Ry00="; }; diff --git a/pkgs/development/python-modules/oasatelematics/default.nix b/pkgs/development/python-modules/oasatelematics/default.nix index fca7740dc6de..fc6cec6ca347 100644 --- a/pkgs/development/python-modules/oasatelematics/default.nix +++ b/pkgs/development/python-modules/oasatelematics/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "panosmz"; - repo = pname; + repo = "oasatelematics"; rev = "v${version}"; hash = "sha256-3O7XbNVj1S3ZwheklEhm0ivw16Tj7drML/xYC9383Kg="; }; diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix index cbf5d5e3c0b2..f7eaff97f382 100644 --- a/pkgs/development/python-modules/ofxtools/default.nix +++ b/pkgs/development/python-modules/ofxtools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # PyPI distribution does not include tests src = fetchFromGitHub { owner = "csingley"; - repo = pname; + repo = "ofxtools"; rev = version; hash = "sha256-NsImnD+erhpakQnl1neuHfSKiV6ipNBMPGKMDM0gwWc="; }; diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix index 0858e4bc7b90..03a1e53eea69 100644 --- a/pkgs/development/python-modules/oletools/default.nix +++ b/pkgs/development/python-modules/oletools/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "decalage2"; - repo = pname; + repo = "oletools"; rev = "v${version}"; hash = "sha256-ons1VeWStxUZw2CPpnX9p5I3Q7cMhi34JU8TeuUDt+Y="; }; diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix index a36c97dd2cda..f12d7140ea62 100644 --- a/pkgs/development/python-modules/opcua-widgets/default.nix +++ b/pkgs/development/python-modules/opcua-widgets/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "FreeOpcUa"; - repo = pname; + repo = "opcua-widgets"; rev = version; hash = "sha256-ABJlKYN5H/1k8ynvSTSoJBX12vTTyavuNUAmTJ84mn0="; }; diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 2691be8446f9..7a40cc690de8 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "p1c2u"; - repo = pname; + repo = "openapi-schema-validator"; tag = version; hash = "sha256-1Y049W4TbqvKZRwnvPVwyLq6CH6NQDrEfJknuMn8dGo="; }; diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix index 634efaf196b2..d49618bb0140 100644 --- a/pkgs/development/python-modules/opensimplex/default.nix +++ b/pkgs/development/python-modules/opensimplex/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lmas"; - repo = pname; + repo = "opensimplex"; rev = "v${version}"; sha256 = "C/MTKTHjxMsOgzuXvokw039Kv6N/PgBoOqKleWPLpw0="; }; diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index b645a2d1b1d0..d97adbefb8a1 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "opuslib"; version = "3.0.3"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "orion-labs"; - repo = pname; + repo = "opuslib"; rev = "92109c528f9f6c550df5e5325ca0fcd4f86b0909"; hash = "sha256-NxmC/4TTIEDVzrfMPN4PcT1JY4QCw8IBMy80XiM/o00="; }; diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 53d9e3005b9f..8b95da057d1a 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "collerek"; - repo = pname; + repo = "ormar"; tag = version; hash = "sha256-jg1qgOJiRBJCRThhq/jaXNmSoL0FmceIOWMKNxtyGJI="; }; diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix index ef90df289af6..6f3f8e123585 100644 --- a/pkgs/development/python-modules/oscrypto/default.nix +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wbond"; - repo = pname; + repo = "oscrypto"; rev = version; hash = "sha256-CmDypmlc/kb6ONCUggjT1Iqd29xNSLRaGh5Hz36dvOw="; }; diff --git a/pkgs/development/python-modules/ospd/default.nix b/pkgs/development/python-modules/ospd/default.nix index 3c89a0bec398..a933bedc85a4 100644 --- a/pkgs/development/python-modules/ospd/default.nix +++ b/pkgs/development/python-modules/ospd/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "greenbone"; - repo = pname; + repo = "ospd"; tag = "v${version}"; hash = "sha256-dZgs+G2vJQIKnN9xHcNeNViG7mOIdKb+Ms2AKE+FC4M="; }; diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index 047c607a340a..b8df86e21460 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fsspec"; - repo = pname; + repo = "ossfs"; tag = version; hash = "sha256-2i7zxLCi4wNCwzWNUbC6lvvdRkK+ksUWds+H6QG6bW4="; }; diff --git a/pkgs/development/python-modules/ovmfvartool/default.nix b/pkgs/development/python-modules/ovmfvartool/default.nix index aaee10b25a37..d1462221f9d2 100644 --- a/pkgs/development/python-modules/ovmfvartool/default.nix +++ b/pkgs/development/python-modules/ovmfvartool/default.nix @@ -5,14 +5,14 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage { pname = "ovmfvartool"; version = "unstable-2022-09-04"; format = "setuptools"; src = fetchFromGitHub { owner = "hlandau"; - repo = pname; + repo = "ovmfvartool"; rev = "45e6b1e53967ee6590faae454c076febce096931"; hash = "sha256-XbvcE/MXNj5S5N7A7jxdwgEE5yMuB82Xg+PYBsFRIm0="; }; diff --git a/pkgs/development/python-modules/palace/default.nix b/pkgs/development/python-modules/palace/default.nix index 8ea9f3b6d9fa..17a4955eccb3 100644 --- a/pkgs/development/python-modules/palace/default.nix +++ b/pkgs/development/python-modules/palace/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromSourcehut { owner = "~cnx"; - repo = pname; + repo = "palace"; rev = version; sha256 = "1z0m35y4v1bg6vz680pwdicm9ssryl0q6dm9hfpb8hnifmridpcj"; }; diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index 1ed55533d9d6..6db3615d92a1 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "holoviz"; - repo = pname; + repo = "param"; tag = "v${version}"; hash = "sha256-3aqABliOk+JtR84J/qiwda4yAkVgG2lJWewhQuSUgtA="; }; diff --git a/pkgs/development/python-modules/pathable/default.nix b/pkgs/development/python-modules/pathable/default.nix index 4ec76c85f5fe..d6d92204c424 100644 --- a/pkgs/development/python-modules/pathable/default.nix +++ b/pkgs/development/python-modules/pathable/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "p1c2u"; - repo = pname; + repo = "pathable"; tag = version; hash = "sha256-nN5jpI0Zi5ofdSuN9QbTHDXPmQRq9KAn8SoHuNDpZaw="; }; diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 872deb560d3f..8b711ae52256 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "uqfoundation"; - repo = pname; + repo = "pathos"; tag = version; hash = "sha256-oVqWrX40umazNw/ET/s3pKUwvh8ctgF9sS0U8WwFQkA="; }; diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix index 1ef4585798ef..bcc3d0bfed56 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "breezy-team"; - repo = pname; + repo = "patiencediff"; tag = "v${version}"; hash = "sha256-SFu1oN1yE9tKeBgWhgWjDpR31AptGrls0D5kKQed+HI="; }; diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix index 8e868ce3ac2c..50c13671f5d5 100644 --- a/pkgs/development/python-modules/patool/default.nix +++ b/pkgs/development/python-modules/patool/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { #pypi doesn't have test data src = fetchFromGitHub { owner = "wummel"; - repo = pname; + repo = "patool"; tag = version; hash = "sha256-mt/GUIRJHB2/Rritc+uNkolZzguYy2G/NKnSKNxKsLk="; }; diff --git a/pkgs/development/python-modules/pcapy-ng/default.nix b/pkgs/development/python-modules/pcapy-ng/default.nix index 97313c157072..d101f3d5fffb 100644 --- a/pkgs/development/python-modules/pcapy-ng/default.nix +++ b/pkgs/development/python-modules/pcapy-ng/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stamparm"; - repo = pname; + repo = "pcapy-ng"; rev = version; hash = "sha256-6LA2n7Kv0MiZcqUJpi0lDN4Q+GcOttYw7hJwVqK/DU0="; }; diff --git a/pkgs/development/python-modules/pcodedmp/default.nix b/pkgs/development/python-modules/pcodedmp/default.nix index eef04412632a..79576ea2c9e8 100644 --- a/pkgs/development/python-modules/pcodedmp/default.nix +++ b/pkgs/development/python-modules/pcodedmp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bontchev"; - repo = pname; + repo = "pcodedmp"; rev = version; hash = "sha256-SYOFGMvrzxDPMACaCvqwU28Mh9LEuvFBGvAph4X+geo="; }; diff --git a/pkgs/development/python-modules/pem/default.nix b/pkgs/development/python-modules/pem/default.nix index 61b1ef39a0c7..ec74c0766140 100644 --- a/pkgs/development/python-modules/pem/default.nix +++ b/pkgs/development/python-modules/pem/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hynek"; - repo = pname; + repo = "pem"; tag = version; hash = "sha256-rVYlnvISGugh9qvf3mdrIyELmeOUU4g6291HeoMkoQc="; }; diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 23ebc341503a..1e20583dc9ff 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nschloe"; - repo = pname; + repo = "perfplot"; tag = "v${version}"; hash = "sha256-bu6eYQukhLE8sLkS3PbqTgXOqJFXJYXTcXAhmjaq48g="; }; diff --git a/pkgs/development/python-modules/pescea/default.nix b/pkgs/development/python-modules/pescea/default.nix index aec7138b7795..41f0c0ca6165 100644 --- a/pkgs/development/python-modules/pescea/default.nix +++ b/pkgs/development/python-modules/pescea/default.nix @@ -9,7 +9,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pescea"; version = "1.0.12"; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lazdavila"; - repo = pname; + repo = "pescea"; # https://github.com/lazdavila/pescea/issues/4 rev = "a3dd7deedc64205e24adbc4ff406a2f6aed3b240"; hash = "sha256-5TkFrGaSkQOORhf5a7SjkzggFLPyqe9k3M0B4ljhWTQ="; diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index c4e179c2d953..dca63eba3497 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NordicSemiconductor"; - repo = pname; + repo = "piccata"; tag = version; hash = "sha256-Vuhwt+esTkvyEIRVYaRGvNMTAXVWBBv/6lpaxN5RrBA="; }; diff --git a/pkgs/development/python-modules/picobox/default.nix b/pkgs/development/python-modules/picobox/default.nix index 157a1325858d..c6988b261813 100644 --- a/pkgs/development/python-modules/picobox/default.nix +++ b/pkgs/development/python-modules/picobox/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ikalnytskyi"; - repo = pname; + repo = "picobox"; tag = version; hash = "sha256-JtrwUVo3b4G34OUShX4eJS2IVubl4vBmEtB/Jhk4eJI="; }; diff --git a/pkgs/development/python-modules/picosvg/default.nix b/pkgs/development/python-modules/picosvg/default.nix index d73007bf2503..9b6a355fa36f 100644 --- a/pkgs/development/python-modules/picosvg/default.nix +++ b/pkgs/development/python-modules/picosvg/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googlefonts"; - repo = pname; + repo = "picosvg"; tag = "v${version}"; hash = "sha256-ocdHF0kYnfllpvul32itu1QtlDrqVeq5sT8Ecb5V1yk="; }; diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index 6866c568c09d..a69b688ad538 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matthewwithanm"; - repo = pname; + repo = "pilkit"; tag = version; hash = "sha256-NmD9PFCkz3lz4AnGoQUpkt35q0zvDVm+kx7lVDFBcHk="; }; diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index 5c62e7f222b9..85139ea17f67 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "soft-matter"; - repo = pname; + repo = "pims"; tag = "v${version}"; hash = "sha256-3SBZk11w6eTZFmETMRJaYncxY38CYne1KzoF5oRgzuY="; }; diff --git a/pkgs/development/python-modules/pinboard/default.nix b/pkgs/development/python-modules/pinboard/default.nix index dd4e489defd6..d9ee6abaa67d 100644 --- a/pkgs/development/python-modules/pinboard/default.nix +++ b/pkgs/development/python-modules/pinboard/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lionheart"; - repo = pname; + repo = "pinboard"; rev = version; sha256 = "0ppc3vwv48ahqx6n5c7d7066zhi31cjdik0ma9chq6fscq2idgdf"; }; diff --git a/pkgs/development/python-modules/pip-requirements-parser/default.nix b/pkgs/development/python-modules/pip-requirements-parser/default.nix index fb52b8f3da04..61ed71d1b4c8 100644 --- a/pkgs/development/python-modules/pip-requirements-parser/default.nix +++ b/pkgs/development/python-modules/pip-requirements-parser/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nexB"; - repo = pname; + repo = "pip-requirements-parser"; tag = "v${version}"; hash = "sha256-UMrwDXxk+sD3P2jk7s95y4OX6DRBjWWZZ8IhkR6tnZ4="; }; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index fb3cce10c235..8f4269b523fd 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -36,7 +36,7 @@ let src = fetchFromGitHub { owner = "pypa"; - repo = pname; + repo = "pip"; tag = version; hash = "sha256-V069rAL6U5KBnSc09LRCu0M7qQCH5NbMghVttlmIoRY="; }; diff --git a/pkgs/development/python-modules/pipetools/default.nix b/pkgs/development/python-modules/pipetools/default.nix index 8ef8830494e1..e6316aad4b43 100644 --- a/pkgs/development/python-modules/pipetools/default.nix +++ b/pkgs/development/python-modules/pipetools/default.nix @@ -6,14 +6,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pipetools"; version = "1.1.0"; # Used github as the src since the pypi package does not include the tests src = fetchFromGitHub { owner = "0101"; - repo = pname; + repo = "pipetools"; rev = "6cba9fadab07a16fd85eed16d5cffc609f84c62b"; hash = "sha256-BoZFePQCQfz1dkct5p/WQLuXoNX3eLcnKf3Mf0fG6u8="; }; diff --git a/pkgs/development/python-modules/pkce/default.nix b/pkgs/development/python-modules/pkce/default.nix index 08539054316a..05092226a4c0 100644 --- a/pkgs/development/python-modules/pkce/default.nix +++ b/pkgs/development/python-modules/pkce/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RomeoDespres"; - repo = pname; + repo = "pkce"; rev = version; hash = "sha256-dOHCu0pDXk9LM4Yobaz8GAfVpBd8rXlty+Wfhx+WPME="; }; diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index a70a39c709fd..fe8f973132f0 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ialbert"; - repo = pname; + repo = "plac"; tag = "v${version}"; hash = "sha256-EWwDtS2cRLBe4aZuH72hgg2BQnVJQ39GmPx05NxTNjE="; }; diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix index dd51e56c7d0e..d66c26e13a30 100644 --- a/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mikitex70"; - repo = pname; + repo = "plantuml-markdown"; tag = version; hash = "sha256-DgHWqwPsZ5q1XqrfaAiUslKnJdHX4Pzw9lygF3iaxz4="; }; diff --git a/pkgs/development/python-modules/pleroma-bot/default.nix b/pkgs/development/python-modules/pleroma-bot/default.nix index 9678a3449f82..462473b3507e 100644 --- a/pkgs/development/python-modules/pleroma-bot/default.nix +++ b/pkgs/development/python-modules/pleroma-bot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robertoszek"; - repo = pname; + repo = "pleroma-bot"; rev = version; hash = "sha256-vJxblpf3NMSyYMHeWG7vHP5AeluTtMtVxOsHgvGDHeA="; }; diff --git a/pkgs/development/python-modules/plotext/default.nix b/pkgs/development/python-modules/plotext/default.nix index a7bd0e2e7568..1ed735a5fea0 100644 --- a/pkgs/development/python-modules/plotext/default.nix +++ b/pkgs/development/python-modules/plotext/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "piccolomo"; - repo = pname; + repo = "plotext"; tag = version; hash = "sha256-4cuStXnZFTlOoBp9w+LrTZavCWEaQdZMY4apGNKvBXE="; }; diff --git a/pkgs/development/python-modules/plyer/default.nix b/pkgs/development/python-modules/plyer/default.nix index b0d20de57400..2e2100209323 100644 --- a/pkgs/development/python-modules/plyer/default.nix +++ b/pkgs/development/python-modules/plyer/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kivy"; - repo = pname; + repo = "plyer"; tag = version; sha256 = "sha256-7Icb2MVj5Uit86lRHxal6b7y9gIJ3UT2HNqpA9DYWVE="; }; diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix index b5081376a682..06b0c7c85b89 100644 --- a/pkgs/development/python-modules/pmdsky-debug-py/default.nix +++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; + repo = "pmdsky-debug-py"; rev = version; sha256 = "sha256-JTvLyYUwOEp1O0rtO313VIT6AYOqXWVFUleTrb6BN6Q="; }; diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index 59a8a201c088..fe2bec35dc90 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mtkennerly"; - repo = pname; + repo = "poetry-dynamic-versioning"; tag = "v${version}"; hash = "sha256-V5UuODRwm829c1KPdQm9oqeN6YdcCo1ODDsEHbm4e/Y="; }; diff --git a/pkgs/development/python-modules/polarizationsolver/default.nix b/pkgs/development/python-modules/polarizationsolver/default.nix index fc0afe375f46..d2deda5fd8e5 100644 --- a/pkgs/development/python-modules/polarizationsolver/default.nix +++ b/pkgs/development/python-modules/polarizationsolver/default.nix @@ -8,14 +8,14 @@ fields, }: -buildPythonPackage rec { +buildPythonPackage { pname = "polarizationsolver"; version = "unstable-2021-11-02"; format = "setuptools"; src = fetchFromGitLab { owner = "reinholdt"; - repo = pname; + repo = "polarizationsolver"; rev = "00424ac4d1862257a55e4b16543f63ace3fe8c22"; hash = "sha256-LACf8Xw+o/uJ3+PD/DE/o7nwKY7fv3NyYbpjCrTTnBU="; }; diff --git a/pkgs/development/python-modules/polyline/default.nix b/pkgs/development/python-modules/polyline/default.nix index 0352bea3d031..34bc7a5ceba2 100644 --- a/pkgs/development/python-modules/polyline/default.nix +++ b/pkgs/development/python-modules/polyline/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frederickjansen"; - repo = pname; + repo = "polyline"; tag = "v${version}"; hash = "sha256-fbGGfZdme4OiIGNlXG1uVl1xP+rPVI9l5hjHM0gwAsE="; }; diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index cbf7630bfa6b..62b8c9f260e0 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pyproject = true; src = fetchFromGitHub { - repo = pname; + repo = "pomegranate"; owner = "jmschrei"; tag = "v${version}"; hash = "sha256-p2Gn0FXnsAHvRUeAqx4M1KH0+XvDl3fmUZZ7MiMvPSs="; diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index a1c5a27fe9e2..265a552e99b6 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -19,8 +19,8 @@ buildPythonPackage rec { format = "setuptools"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "powerline"; + repo = "powerline"; tag = version; hash = "sha256-snJrfUvP11lBIy6F0WtqJt9fiYm5jxMwm9u3u5XFO84="; }; diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index 9124989c5d15..e75265573a6c 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pre-commit"; - repo = pname; + repo = "pre-commit-hooks"; tag = "v${version}"; hash = "sha256-BYNi/xtdichqsn55hqr1MSFwWpH+7cCbLfqmpn9cxto="; }; diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix index f35fcb5e9c87..725f4a5ed746 100644 --- a/pkgs/development/python-modules/pretend/default.nix +++ b/pkgs/development/python-modules/pretend/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alex"; - repo = pname; + repo = "pretend"; rev = "v${version}"; hash = "sha256-OqMfeIMFNBBLq6ejR3uOCIHZ9aA4zew7iefVlAsy1JQ="; }; diff --git a/pkgs/development/python-modules/prodict/default.nix b/pkgs/development/python-modules/prodict/default.nix index fdee36a3c615..6143bc9f78a8 100644 --- a/pkgs/development/python-modules/prodict/default.nix +++ b/pkgs/development/python-modules/prodict/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ramazanpolat"; - repo = pname; + repo = "prodict"; rev = version; hash = "sha256-c46JEQFg4KRwerqpMSgh6+tYRpKTOX02Lzsq4/meS3o="; }; diff --git a/pkgs/development/python-modules/prompthub-py/default.nix b/pkgs/development/python-modules/prompthub-py/default.nix index 8becc3b2ac30..b10a06cd6ffb 100644 --- a/pkgs/development/python-modules/prompthub-py/default.nix +++ b/pkgs/development/python-modules/prompthub-py/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { # Pypi source package doesn't contain tests src = fetchFromGitHub { owner = "deepset-ai"; - repo = pname; + repo = "prompthub-py"; rev = "v${version}"; hash = "sha256-FA4IfhHViSL1u4pgd7jh40rEcS0BldSFDwCPG5irk1g="; }; diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index 2b679015e6bd..43784048fdd3 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ProtonVPN"; - repo = pname; + repo = "protonvpn-nm-lib"; tag = version; hash = "sha256-n3jfBHMYqyQZgvFFJcylNbTWZ3teuqhdelTfpNrwWuA="; }; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 605936dd8637..d6489aa0f97b 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adobe-type-tools"; - repo = pname; + repo = "psautohint"; rev = "v${version}"; sha256 = "125nx7accvbk626qlfar90va1995kp9qfrz6a978q4kv2kk37xai"; fetchSubmodules = true; # data dir for tests diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 8b935f54e5dd..468464010762 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "psd-tools"; - repo = pname; + repo = "psd-tools"; tag = "v${version}"; hash = "sha256-n3OqyItvKXD6NjCm/FgEuu1G5apTmUypwKJ+Y2DCmEg="; }; diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index 3db8b1f6da4f..4f6fcbd62cfd 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyapp-kit"; - repo = pname; + repo = "psygnal"; tag = "v${version}"; hash = "sha256-ZEN8S2sI1usXl5A1Ow1+l4BBB6qNnlVt/nvFtAX4maY="; }; diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix deleted file mode 100644 index d88a7433f068..000000000000 --- a/pkgs/development/python-modules/ptable/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - pytestCheckHook, -}: - -buildPythonPackage { - pname = "ptable"; - version = "unstable-2019-06-14"; - pyproject = true; - - # https://github.com/kxxoling/PTable/issues/27 - src = fetchFromGitHub { - owner = "kxxoling"; - repo = "PTable"; - rev = "bcfdb92811ae1f39e1065f31544710bf87d3bc21"; - sha256 = "1cj314rp6irlvr0a2c4xffsm2idsb0hzwr38vzz6z3kbhphcb63i"; - }; - - build-system = [ setuptools ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = with lib; { - homepage = "https://github.com/kxxoling/PTable"; - description = "Simple Python library designed to make it quick and easy to represent tabular data in visually appealing ASCII tables"; - mainProgram = "ptable"; - license = licenses.bsd3; - maintainers = [ maintainers.mmahut ]; - }; -} diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 4eccba1a6a6a..73813e2eaedc 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "coin-or"; - repo = pname; + repo = "pulp"; tag = version; hash = "sha256-lpbk1GeC8F/iLGV8G5RPHghnaM9eL82YekUYEt9+mvc="; }; diff --git a/pkgs/development/python-modules/pvextractor/default.nix b/pkgs/development/python-modules/pvextractor/default.nix index d060de77bf2f..08bdbc505452 100644 --- a/pkgs/development/python-modules/pvextractor/default.nix +++ b/pkgs/development/python-modules/pvextractor/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "radio-astro-tools"; - repo = pname; + repo = "pvextractor"; tag = "v${version}"; sha256 = "sha256-TjwoTtoGWU6C6HdFuS+gJj69PUnfchPHs7UjFqwftVQ="; }; diff --git a/pkgs/development/python-modules/py-air-control/default.nix b/pkgs/development/python-modules/py-air-control/default.nix index 73cac52da828..2cb2e82edf54 100644 --- a/pkgs/development/python-modules/py-air-control/default.nix +++ b/pkgs/development/python-modules/py-air-control/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rgerganov"; - repo = pname; + repo = "py-air-control"; rev = "v${version}"; sha256 = "0mkggl5hwmj90djxbbz4svim6iv7xl8k324cb4rlc75p5rgcdwmh"; }; diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix index 9ed05ea205bd..05f9d26c87b5 100644 --- a/pkgs/development/python-modules/py-canary/default.nix +++ b/pkgs/development/python-modules/py-canary/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "snjoetw"; - repo = pname; + repo = "py-canary"; tag = version; hash = "sha256-zylWkssU85eSfR+Di7vQGTr6hOQkqXCObv/PCDHoKHA="; }; diff --git a/pkgs/development/python-modules/py-cid/default.nix b/pkgs/development/python-modules/py-cid/default.nix index 7b986be7dc42..19966c227f02 100644 --- a/pkgs/development/python-modules/py-cid/default.nix +++ b/pkgs/development/python-modules/py-cid/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ipld"; - repo = pname; + repo = "py-cid"; rev = "v${version}"; hash = "sha256-aN7ee25ghKKa90+FoMDCdGauToePc5AzDLV3tONvh4U="; }; diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix index 8485fe8c2837..4ac79186e324 100644 --- a/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "workhorsy"; - repo = pname; + repo = "py-cpuinfo"; rev = "v${version}"; hash = "sha256-Q5u0guAqDVhf6bvJTzNvCpWbIzjxxAjE7s0OuXj9T4Q="; }; diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index 4f1c74b9f20a..e8fdadc8feab 100644 --- a/pkgs/development/python-modules/py-desmume/default.nix +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; + repo = "py-desmume"; tag = version; hash = "sha256-aH7f/BI89VLUGqwA8Y7ThSpmKxWffYRETT/+EjPVTg8="; fetchSubmodules = true; diff --git a/pkgs/development/python-modules/py-dormakaba-dkey/default.nix b/pkgs/development/python-modules/py-dormakaba-dkey/default.nix index 1b64a9e888ed..6b190999aedf 100644 --- a/pkgs/development/python-modules/py-dormakaba-dkey/default.nix +++ b/pkgs/development/python-modules/py-dormakaba-dkey/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "emontnemery"; - repo = pname; + repo = "py-dormakaba-dkey"; tag = version; hash = "sha256-kS99du9EZwki6J2q+nI44rx/AWIPtq7wXR/61ZcyUSM="; }; diff --git a/pkgs/development/python-modules/py-libzfs/default.nix b/pkgs/development/python-modules/py-libzfs/default.nix index b5d8e7f4ab29..9932d97e2670 100644 --- a/pkgs/development/python-modules/py-libzfs/default.nix +++ b/pkgs/development/python-modules/py-libzfs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "truenas"; - repo = pname; + repo = "py-libzfs"; rev = "TS-${version}"; hash = "sha256-Uiu0RNE06++iNWUNcKpbZvreT2D7/EqHlFZJXKe3F4A="; }; diff --git a/pkgs/development/python-modules/py-multiaddr/default.nix b/pkgs/development/python-modules/py-multiaddr/default.nix index 95016f826c62..49ba5ea55091 100644 --- a/pkgs/development/python-modules/py-multiaddr/default.nix +++ b/pkgs/development/python-modules/py-multiaddr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "multiformats"; - repo = pname; + repo = "py-multiaddr"; rev = "v${version}"; hash = "sha256-cGM7iYQPP+UOkbTxRhzuED0pkcydFCO8vpx9wTc0/HI="; }; diff --git a/pkgs/development/python-modules/py-multicodec/default.nix b/pkgs/development/python-modules/py-multicodec/default.nix index 5f8ce30adda3..cd502996e0d0 100644 --- a/pkgs/development/python-modules/py-multicodec/default.nix +++ b/pkgs/development/python-modules/py-multicodec/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "multiformats"; - repo = pname; + repo = "py-multicodec"; tag = "v${version}"; hash = "sha256-2aK+bfhqCMqSO+mtrHIfNQmQpQHpwd7yHseI/3O7Sp4="; }; diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix index 396fd68d6696..50c4c3787098 100644 --- a/pkgs/development/python-modules/py-multihash/default.nix +++ b/pkgs/development/python-modules/py-multihash/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "multiformats"; - repo = pname; + repo = "py-multihash"; tag = "v${version}"; hash = "sha256-z1lmSypGCMFWJNzNgV9hx/IStyXbpd5jvrptFpewuOA="; }; diff --git a/pkgs/development/python-modules/py-nightscout/default.nix b/pkgs/development/python-modules/py-nightscout/default.nix index e690f1b1caca..edfc25ee0527 100644 --- a/pkgs/development/python-modules/py-nightscout/default.nix +++ b/pkgs/development/python-modules/py-nightscout/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "marciogranzotto"; - repo = pname; + repo = "py-nightscout"; rev = "v${version}"; sha256 = "0kslmm3wrxhm307nqmjmq8i8vy1x6mjaqlgba0hgvisj6b4hx65k"; }; diff --git a/pkgs/development/python-modules/py-ubjson/default.nix b/pkgs/development/python-modules/py-ubjson/default.nix index 7eca2165efc1..881bc356c1a3 100644 --- a/pkgs/development/python-modules/py-ubjson/default.nix +++ b/pkgs/development/python-modules/py-ubjson/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Iotic-Labs"; - repo = pname; + repo = "py-ubjson"; rev = "v${version}"; sha256 = "1frn97xfa88zrfmpnvdk1pc03yihlchhph99bhjayvzlfcrhm5v3"; }; diff --git a/pkgs/development/python-modules/pyaftership/default.nix b/pkgs/development/python-modules/pyaftership/default.nix index 853e33a471f3..9e7d3b7702ec 100644 --- a/pkgs/development/python-modules/pyaftership/default.nix +++ b/pkgs/development/python-modules/pyaftership/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; + repo = "pyaftership"; tag = version; hash = "sha256-njlDScmxIYWxB4EL9lOSGCXqZDzP999gI9EkpcZyFlE="; }; diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix index e3879501572b..83e75000f19d 100644 --- a/pkgs/development/python-modules/pyahocorasick/default.nix +++ b/pkgs/development/python-modules/pyahocorasick/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "WojciechMula"; - repo = pname; + repo = "pyahocorasick"; tag = version; hash = "sha256-SCIgu0uEjiSUiIP0WesJG+y+3ZqFBfI5PdgUzviOVrs="; }; diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 6e4a7e846b3e..f27f7ba4f426 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "appknox"; - repo = pname; + repo = "pyaxmlparser"; rev = "v${version}"; hash = "sha256-NtAsO/I1jDEv676yhAgLguQnB/kHdAqPoLt2QFWbvmw="; }; diff --git a/pkgs/development/python-modules/pyblackbird/default.nix b/pkgs/development/python-modules/pyblackbird/default.nix index 97a1d09b6b19..93473e82709e 100644 --- a/pkgs/development/python-modules/pyblackbird/default.nix +++ b/pkgs/development/python-modules/pyblackbird/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "koolsb"; - repo = pname; + repo = "pyblackbird"; tag = version; hash = "sha256-+ehzrr+RrwFKOOuxBq3+mwnuMPxZFV4QTZG1IRgsbLc="; }; diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix index ca745113c592..3f9ae13c516b 100644 --- a/pkgs/development/python-modules/pybluez/default.nix +++ b/pkgs/development/python-modules/pybluez/default.nix @@ -7,14 +7,14 @@ gattlib, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pybluez"; version = "unstable-2022-01-28"; format = "setuptools"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "pybluez"; + repo = "pybluez"; rev = "5096047f90a1f6a74ceb250aef6243e144170f92"; hash = "sha256-GA58DfCFaVzZQA1HYpGQ68bznrt4SX1ojyOVn8hyCGo="; }; diff --git a/pkgs/development/python-modules/pybravia/default.nix b/pkgs/development/python-modules/pybravia/default.nix index 52685473473c..b610c25b3d09 100644 --- a/pkgs/development/python-modules/pybravia/default.nix +++ b/pkgs/development/python-modules/pybravia/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Drafteed"; - repo = pname; + repo = "pybravia"; tag = "v${version}"; hash = "sha256-1LfYEVclRneU3eD52kvzjLYyGdzYSWVDQ5EADOviglw="; }; diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index 765b25b70f58..51f36bd86eec 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "capnproto"; - repo = pname; + repo = "pycapnp"; tag = "v${version}"; sha256 = "sha256-SVeBRJMMR1Z8+S+QoiUKGRFGUPS/MlmWLi1qRcGcPoE="; }; diff --git a/pkgs/development/python-modules/pycarwings2/default.nix b/pkgs/development/python-modules/pycarwings2/default.nix index 2d83d009aad8..8778ec180fbf 100644 --- a/pkgs/development/python-modules/pycarwings2/default.nix +++ b/pkgs/development/python-modules/pycarwings2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "filcole"; - repo = pname; + repo = "pycarwings2"; rev = "v${version}"; hash = "sha256-kqj/NZXqgPUsOnnzMPmIlICHek7RBxksmL3reNBK+bo="; }; diff --git a/pkgs/development/python-modules/pycec/default.nix b/pkgs/development/python-modules/pycec/default.nix index 5f6ef9f37c7c..29a85c252abe 100644 --- a/pkgs/development/python-modules/pycec/default.nix +++ b/pkgs/development/python-modules/pycec/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "konikvranik"; - repo = pname; + repo = "pycec"; tag = "v${version}"; hash = "sha256-5KQyHjAvHWeHFqcFHFJxDOPwWuVcFAN2wVdz9a77dzU="; }; diff --git a/pkgs/development/python-modules/pycfdns/default.nix b/pkgs/development/python-modules/pycfdns/default.nix index f8e86b22add3..f9ef958474f1 100644 --- a/pkgs/development/python-modules/pycfdns/default.nix +++ b/pkgs/development/python-modules/pycfdns/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; + repo = "pycfdns"; tag = version; hash = "sha256-bLzDakxKq8fcjEKSxc6D5VN9gfAu1M3/zaAU2UYnwSs="; }; diff --git a/pkgs/development/python-modules/pychannels/default.nix b/pkgs/development/python-modules/pychannels/default.nix index 48310b769912..4558f31aeff6 100644 --- a/pkgs/development/python-modules/pychannels/default.nix +++ b/pkgs/development/python-modules/pychannels/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fancybits"; - repo = pname; + repo = "pychannels"; rev = version; hash = "sha256-E+VL4mJ2KxS5bJZc3Va+wvyVjT55LJz+1wHkxDRa85s="; }; diff --git a/pkgs/development/python-modules/pycketcasts/default.nix b/pkgs/development/python-modules/pycketcasts/default.nix index 7b4c51fcc6e8..96ffaf13af1d 100644 --- a/pkgs/development/python-modules/pycketcasts/default.nix +++ b/pkgs/development/python-modules/pycketcasts/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nwithan8"; - repo = pname; + repo = "pycketcasts"; rev = version; hash = "sha256-O4j89fE7fYPthhCH8b2gGskkelEA4mU6GvSbKIl+4Mk="; }; diff --git a/pkgs/development/python-modules/pyclimacell/default.nix b/pkgs/development/python-modules/pyclimacell/default.nix index 8b61e177f5db..992c20aafe2f 100644 --- a/pkgs/development/python-modules/pyclimacell/default.nix +++ b/pkgs/development/python-modules/pyclimacell/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "raman325"; - repo = pname; + repo = "pyclimacell"; rev = "v${version}"; hash = "sha256-jWHjnebg4Aar48gid7bB7XYXOQtSqbmVmASsZd0YoPc="; }; diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix index d786032e1410..588b294dc039 100644 --- a/pkgs/development/python-modules/pyclip/default.nix +++ b/pkgs/development/python-modules/pyclip/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spyoungtech"; - repo = pname; + repo = "pyclip"; tag = "v${version}"; hash = "sha256-0nOkNgT8XCwtXI9JZntkhoMspKQU602rTKBFajVKBoM="; }; diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index 416bd18a2c37..9c0ba320116b 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sepandhaghighi"; - repo = pname; + repo = "pycm"; tag = "v${version}"; hash = "sha256-JX75UEaONL+2n6xePE2hbIEMmnt0RknWNWgpbMwNyhw="; }; diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix index 38ee9a244b6d..1fc20c3b80b2 100644 --- a/pkgs/development/python-modules/pycyphal/default.nix +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "OpenCyphal"; - repo = pname; + repo = "pycyphal"; tag = version; hash = "sha256-XkH0wss8ueh/Wwz0lhvQShOp3a4X9lNdosT/sMe7p4Q="; fetchSubmodules = true; diff --git a/pkgs/development/python-modules/pydiscourse/default.nix b/pkgs/development/python-modules/pydiscourse/default.nix index 4f4aa417c97e..b974af2b98e0 100644 --- a/pkgs/development/python-modules/pydiscourse/default.nix +++ b/pkgs/development/python-modules/pydiscourse/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pydiscourse"; - repo = pname; + repo = "pydiscourse"; tag = "v${version}"; hash = "sha256-KqJ6ag4owG7US5Q4Ygjq263ds1o/JhEJ3bNa8YecYtE="; }; diff --git a/pkgs/development/python-modules/pydruid/default.nix b/pkgs/development/python-modules/pydruid/default.nix index a8e1462aec29..788310c18c65 100644 --- a/pkgs/development/python-modules/pydruid/default.nix +++ b/pkgs/development/python-modules/pydruid/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; src = fetchFromGitHub { - repo = pname; + repo = "pydruid"; owner = "druid-io"; tag = version; hash = "sha256-9+xomjSwWDVHkret/mqAZKWOPFRMvVB3CWtFPzrT81k="; diff --git a/pkgs/development/python-modules/pyduke-energy/default.nix b/pkgs/development/python-modules/pyduke-energy/default.nix index c65acc773e2d..bc747e6d2f77 100644 --- a/pkgs/development/python-modules/pyduke-energy/default.nix +++ b/pkgs/development/python-modules/pyduke-energy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mjmeli"; - repo = pname; + repo = "pyduke-energy"; tag = "v${version}"; hash = "sha256-7KkUpsHg3P2cF0bVl3FzyAQwzeaCmg+vzRHlM/TIcNA="; }; diff --git a/pkgs/development/python-modules/pyeverlights/default.nix b/pkgs/development/python-modules/pyeverlights/default.nix index dd9abeca4f31..29fe46f12642 100644 --- a/pkgs/development/python-modules/pyeverlights/default.nix +++ b/pkgs/development/python-modules/pyeverlights/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "joncar"; - repo = pname; + repo = "pyeverlights"; rev = version; sha256 = "16xpq933j8yydq78fnf4f7ivyw5a45ix4mfycpmm91aj549p6pm0"; }; diff --git a/pkgs/development/python-modules/pyevilgenius/default.nix b/pkgs/development/python-modules/pyevilgenius/default.nix index 40d48342e57e..ebce3deac562 100644 --- a/pkgs/development/python-modules/pyevilgenius/default.nix +++ b/pkgs/development/python-modules/pyevilgenius/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; + repo = "pyevilgenius"; rev = version; hash = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o="; }; diff --git a/pkgs/development/python-modules/pyevmasm/default.nix b/pkgs/development/python-modules/pyevmasm/default.nix index c683c93143b2..0b26308b9796 100644 --- a/pkgs/development/python-modules/pyevmasm/default.nix +++ b/pkgs/development/python-modules/pyevmasm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "crytic"; - repo = pname; + repo = "pyevmasm"; rev = version; sha256 = "134q0z0dqzxzr0jw5jr98kp90kx2dl0qw9smykwxdgq555q1l6qa"; }; diff --git a/pkgs/development/python-modules/pyflexit/default.nix b/pkgs/development/python-modules/pyflexit/default.nix index 22190d150b40..5ab6a9ef72d9 100644 --- a/pkgs/development/python-modules/pyflexit/default.nix +++ b/pkgs/development/python-modules/pyflexit/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Sabesto"; - repo = pname; + repo = "pyflexit"; rev = version; sha256 = "1ajlqr3z6zj4fyslqzpwpfkvh8xjx94wsznzij0vx0q7jp43bqig"; }; diff --git a/pkgs/development/python-modules/pyflic/default.nix b/pkgs/development/python-modules/pyflic/default.nix index f780c16cd144..ebf469ff6b32 100644 --- a/pkgs/development/python-modules/pyflic/default.nix +++ b/pkgs/development/python-modules/pyflic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "soldag"; - repo = pname; + repo = "pyflic"; rev = version; sha256 = "sha256-K1trMBZfc1aHSNSddq0v//Gv8ySgT/ONQYgrKWzw2qs="; }; diff --git a/pkgs/development/python-modules/pyfzf/default.nix b/pkgs/development/python-modules/pyfzf/default.nix index 296d2d11670e..28dec72e412c 100644 --- a/pkgs/development/python-modules/pyfzf/default.nix +++ b/pkgs/development/python-modules/pyfzf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nk412"; - repo = pname; + repo = "pyfzf"; rev = version; hash = "sha256-w+ZjQGFd/lR2TiTHc2uQSJXORmzJJZXsr9BO4PIw/Co="; }; diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix index d4abb9fabaae..6862a8aff423 100644 --- a/pkgs/development/python-modules/pyhcl/default.nix +++ b/pkgs/development/python-modules/pyhcl/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "virtuald"; - repo = pname; + repo = "pyhcl"; rev = version; sha256 = "0rcpx4vvj2c6wxp31vay7a2xa5p62kabi91vps9plj6710yz29nc"; }; diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index 44ee5b78be85..287b4b9fbc4d 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-hep"; - repo = pname; + repo = "pyhepmc"; tag = "v${version}"; hash = "sha256-yh02Z1nPGjghZYHkPBlClDEztq4VQsW3H+kuco/lBpk="; fetchSubmodules = true; diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index 2becc21c26ce..1962d5101ee9 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chimpler"; - repo = pname; + repo = "pyhocon"; tag = version; hash = "sha256-xXx30uxJ8+KPVdYC6yRzEDJbwYSzIO/Gy1xrehvI5ZE="; }; diff --git a/pkgs/development/python-modules/pyhomepilot/default.nix b/pkgs/development/python-modules/pyhomepilot/default.nix index db00d9190ff0..a51e73c4109c 100644 --- a/pkgs/development/python-modules/pyhomepilot/default.nix +++ b/pkgs/development/python-modules/pyhomepilot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nico0302"; - repo = pname; + repo = "pyhomepilot"; rev = "v${version}"; sha256 = "00gmqx8cwsd15iccnlr8ypgqrdg6nw9ha518cfk7pyp8vhw1ziwy"; }; diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix index f76788180202..bb52bb4b8c56 100644 --- a/pkgs/development/python-modules/pyialarm/default.nix +++ b/pkgs/development/python-modules/pyialarm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RyuzakiKK"; - repo = pname; + repo = "pyialarm"; rev = "v${version}"; hash = "sha256-rOdeYewjoFVbHdNPHN6ZC2g6X5yr84/JFE6tGSDIoRU="; }; diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 6aebdaa47f52..2d87062de302 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "picklepete"; - repo = pname; + repo = "pyicloud"; rev = version; hash = "sha256-2E1pdHHt8o7CGpdG+u4xy5OyNCueUGVw5CY8oicYd5w="; }; diff --git a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix index f941b8dc67c1..9659cd9bae80 100644 --- a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix +++ b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DudeNr33"; - repo = pname; + repo = "pyinstaller-versionfile"; rev = "v${version}"; hash = "sha256-lz1GuiXU+r8sMld5SsG3qS+FOsWfbvkQmO2bxAR3XcY="; }; diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix index 060094a6cfd7..12d6a1346797 100644 --- a/pkgs/development/python-modules/pyinstrument/default.nix +++ b/pkgs/development/python-modules/pyinstrument/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "joerick"; - repo = pname; + repo = "pyinstrument"; tag = "v${version}"; hash = "sha256-uJ9KRgSETuxpeEIpBKFz66+Qci86jy36lKkUKpvmKIg="; }; diff --git a/pkgs/development/python-modules/pyjsparser/default.nix b/pkgs/development/python-modules/pyjsparser/default.nix index b0988585e21b..6f288964d9f7 100644 --- a/pkgs/development/python-modules/pyjsparser/default.nix +++ b/pkgs/development/python-modules/pyjsparser/default.nix @@ -6,14 +6,14 @@ }: let - pyjsparser = buildPythonPackage rec { + pyjsparser = buildPythonPackage { pname = "pyjsparser"; version = "2.7.1"; format = "setuptools"; src = fetchFromGitHub { owner = "PiotrDabkowski"; - repo = pname; + repo = "pyjsparser"; rev = "5465d037b30e334cb0997f2315ec1e451b8ad4c1"; hash = "sha256-Hqay9/qsjUfe62U7Q79l0Yy01L2Bnj5xNs6427k3Br8="; }; diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 2e35bf2cce96..209624aa801f 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jodal"; - repo = pname; + repo = "pykka"; tag = "v${version}"; hash = "sha256-n9TgXcmUEIQdqtrY+9T+EtPys+7OzXCemRwNPj1xPDw="; }; diff --git a/pkgs/development/python-modules/pykostalpiko/default.nix b/pkgs/development/python-modules/pykostalpiko/default.nix index c9c183819818..a6d19032f6f1 100644 --- a/pkgs/development/python-modules/pykostalpiko/default.nix +++ b/pkgs/development/python-modules/pykostalpiko/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Florian7843"; - repo = pname; + repo = "pykostalpiko"; rev = "v${version}"; hash = "sha256-kmzFsOgmMb8bOkulg7G6vXEPdb0xizh7u5LjnHfEWWQ="; }; diff --git a/pkgs/development/python-modules/pykulersky/default.nix b/pkgs/development/python-modules/pykulersky/default.nix index 1c3ddaea9cd7..2af5ad5c402b 100644 --- a/pkgs/development/python-modules/pykulersky/default.nix +++ b/pkgs/development/python-modules/pykulersky/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "emlove"; - repo = pname; + repo = "pykulersky"; rev = version; hash = "sha256-BaGcsHlQpuEnUn8OgSUsJi2q89vFl7vpkinviKnUZJk="; }; diff --git a/pkgs/development/python-modules/pyld/default.nix b/pkgs/development/python-modules/pyld/default.nix index aa66ac581c3c..d9ebdadcb2e7 100644 --- a/pkgs/development/python-modules/pyld/default.nix +++ b/pkgs/development/python-modules/pyld/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "digitalbazaar"; - repo = pname; + repo = "pyld"; rev = version; sha256 = "0z2vkllw8bvzxripwb6l757r7av5qwhzsiy4061gmlhq8z8gq961"; }; diff --git a/pkgs/development/python-modules/pylibdmtx/default.nix b/pkgs/development/python-modules/pylibdmtx/default.nix index 97037747a25b..a74e24e0be39 100644 --- a/pkgs/development/python-modules/pylibdmtx/default.nix +++ b/pkgs/development/python-modules/pylibdmtx/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NaturalHistoryMuseum"; - repo = pname; + repo = "pylibdmtx"; rev = "v${version}"; hash = "sha256-vNWzhO4V0mj4eItZ0Z5UG9RBCqprIcgMGNyIe1+mXWY="; }; diff --git a/pkgs/development/python-modules/pylint-celery/default.nix b/pkgs/development/python-modules/pylint-celery/default.nix index 99ffa65d6cd7..97a78f24ee07 100644 --- a/pkgs/development/python-modules/pylint-celery/default.nix +++ b/pkgs/development/python-modules/pylint-celery/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; - repo = pname; + repo = "pylint-celery"; rev = version; sha256 = "05fhwraq12c2724pn4py1bjzy5rmsrb1x68zck73nlp5icba6yap"; }; diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix index 27dd4c93d6fc..4cc3c20817ab 100644 --- a/pkgs/development/python-modules/pylru/default.nix +++ b/pkgs/development/python-modules/pylru/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jlhutch"; - repo = pname; + repo = "pylru"; rev = "v${version}"; hash = "sha256-dTYiD+/zt0ZSP+sefYyeD87To1nRXyoFodlBg8pm1YE="; }; diff --git a/pkgs/development/python-modules/pyls-spyder/default.nix b/pkgs/development/python-modules/pyls-spyder/default.nix index de2cbdae88b8..feacc1d448f7 100644 --- a/pkgs/development/python-modules/pyls-spyder/default.nix +++ b/pkgs/development/python-modules/pyls-spyder/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spyder-ide"; - repo = pname; + repo = "pyls-spyder"; rev = "v${version}"; sha256 = "11ajbsia60d4c9s6m6rbvaqp1d69fcdbq6a98lkzkkzv2b9pdhkk"; }; diff --git a/pkgs/development/python-modules/pymailgunner/default.nix b/pkgs/development/python-modules/pymailgunner/default.nix index 7e5a5bd5d8c4..720961288400 100644 --- a/pkgs/development/python-modules/pymailgunner/default.nix +++ b/pkgs/development/python-modules/pymailgunner/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pschmitt"; - repo = pname; + repo = "pymailgunner"; rev = version; hash = "sha256-QKwpW1aeN6OI76Kocow1Zhghq4/fl/cMPexny0MTwQs="; }; diff --git a/pkgs/development/python-modules/pymanopt/default.nix b/pkgs/development/python-modules/pymanopt/default.nix index de1408d95b39..453190901195 100644 --- a/pkgs/development/python-modules/pymanopt/default.nix +++ b/pkgs/development/python-modules/pymanopt/default.nix @@ -26,8 +26,8 @@ buildPythonPackage rec { pyproject = true; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "pymanopt"; + repo = "pymanopt"; tag = version; hash = "sha256-LOEulticgCWZBCf3qj5KFBHt0lMd4H85368IhG3DQ4g="; }; diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix index 44bd1c815614..f852e528f209 100644 --- a/pkgs/development/python-modules/pymarshal/default.nix +++ b/pkgs/development/python-modules/pymarshal/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stargateaudio"; - repo = pname; + repo = "pymarshal"; rev = version; hash = "sha256-Ds8JV2mtLRcKXBvPs84Hdj3MxxqpeV5muKCSlAFCj1A="; }; diff --git a/pkgs/development/python-modules/pymata-express/default.nix b/pkgs/development/python-modules/pymata-express/default.nix index d516ba9b38e7..e4bb1bfb5dbc 100644 --- a/pkgs/development/python-modules/pymata-express/default.nix +++ b/pkgs/development/python-modules/pymata-express/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MrYsLab"; - repo = pname; + repo = "pymata-express"; rev = version; sha256 = "1mibyn84kjahrv3kn51yl5mhkyig4piv6wanggzjflh5nm96bhy8"; }; diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix index ebd94da6860f..3f086afa7c92 100644 --- a/pkgs/development/python-modules/pymorphy3/default.nix +++ b/pkgs/development/python-modules/pymorphy3/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "no-plagiarism"; - repo = pname; + repo = "pymorphy3"; tag = version; hash = "sha256-xqz9BW6vaYnDE+rPEhAO4igPYLZNwZLj42BnnJ7Uk1M="; }; diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index 9178399610b3..d5bff10a57a7 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "theolind"; - repo = pname; + repo = "pymysensors"; rev = version; hash = "sha256-3t9YrSJf02kc5CuTqPBc/qNJV7yy7Vke4WqhtuOaAYo="; }; diff --git a/pkgs/development/python-modules/pynello/default.nix b/pkgs/development/python-modules/pynello/default.nix index 919674c639fc..9aa53b8a0251 100644 --- a/pkgs/development/python-modules/pynello/default.nix +++ b/pkgs/development/python-modules/pynello/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pschmitt"; - repo = pname; + repo = "pynello"; rev = version; hash = "sha256-sUy37sEPEMyFYFVBzFVdcg31nZAyC+Ricm4LqxmjuQQ="; }; diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix index 08f200f65f1d..60247ac74ca0 100644 --- a/pkgs/development/python-modules/pynetgear/default.nix +++ b/pkgs/development/python-modules/pynetgear/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MatMaul"; - repo = pname; + repo = "pynetgear"; tag = version; hash = "sha256-5Lj2cK/SOGgaPu8dI9X3Leg4dPAY7tdIHCzFnNaube8="; }; diff --git a/pkgs/development/python-modules/pynrrd/default.nix b/pkgs/development/python-modules/pynrrd/default.nix index 0f178dc4cc1b..e3cd97f0dea8 100644 --- a/pkgs/development/python-modules/pynrrd/default.nix +++ b/pkgs/development/python-modules/pynrrd/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mhe"; - repo = pname; + repo = "pynrrd"; tag = "v${version}"; hash = "sha256-qu3s3XswJCUchqYfYMuqIzI4sfeXrttvXSEW9/GSENA="; }; diff --git a/pkgs/development/python-modules/pyobihai/default.nix b/pkgs/development/python-modules/pyobihai/default.nix index 6b8e6c448f0d..1c26aaaaf4bd 100644 --- a/pkgs/development/python-modules/pyobihai/default.nix +++ b/pkgs/development/python-modules/pyobihai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ejpenney"; - repo = pname; + repo = "pyobihai"; tag = version; hash = "sha256-tDPu/ceH7+7AnxokADDfl+G56B0+ri8RxXxXEyWa61Q="; }; diff --git a/pkgs/development/python-modules/pyosf/default.nix b/pkgs/development/python-modules/pyosf/default.nix index e3b4257da4e8..281d2f1c2de8 100644 --- a/pkgs/development/python-modules/pyosf/default.nix +++ b/pkgs/development/python-modules/pyosf/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "psychopy"; - repo = pname; + repo = "pyosf"; tag = "v${version}"; hash = "sha256-Yhb6HSnLdFzWouse/RKZ8SIbMia/hhD8TAovdqmvd7o="; }; diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 102750113157..8536939ad536 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JessicaTegner"; - repo = pname; + repo = "pypandoc"; tag = "v${version}"; hash = "sha256-9fpits8O/50maM/e1lVVqBoTwUmcI+/IAYhVX1Pt6ZE="; }; diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index a41820b42118..35734486d287 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyparsing"; - repo = pname; + repo = "pyparsing"; tag = version; hash = "sha256-irRSylY16Vcm2zsue1Iv+1eqYGZSAqhkqHrdjdhznlM="; }; diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index a5f681ac167d..9aa205c3f2c2 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = isPyPy; src = fetchFromGitHub { - repo = pname; + repo = "pyparted"; owner = "dcantrell"; tag = "v${version}"; hash = "sha256-AiUCCrEbDD0OxrvXs1YN3/1IE7SuVasC2YCirIG58iU="; diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix index 4bf0723dc6ce..01bf26b699e1 100644 --- a/pkgs/development/python-modules/pypcap/default.nix +++ b/pkgs/development/python-modules/pypcap/default.nix @@ -7,14 +7,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pypcap"; version = "1.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "pynetwork"; - repo = pname; + repo = "pypcap"; # No release was tagged and PyPI doesn't contain tests. rev = "968859f0ffb5b7c990506dffe82457b7de23a026"; hash = "sha256-NfyEC3qEBm6TjebcDIsoz8tJWaJ625ZFPfx7AMyynWE="; diff --git a/pkgs/development/python-modules/pyprusalink/default.nix b/pkgs/development/python-modules/pyprusalink/default.nix index d92ba9f738b2..d57c96c6e9a0 100644 --- a/pkgs/development/python-modules/pyprusalink/default.nix +++ b/pkgs/development/python-modules/pyprusalink/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; + repo = "pyprusalink"; tag = version; hash = "sha256-Opip696hXV1gqFC1cWfrSCkrsldl7M7XZAqUaVkDy7M="; }; diff --git a/pkgs/development/python-modules/pypsrp/default.nix b/pkgs/development/python-modules/pypsrp/default.nix index 996e562e1315..244877d01240 100644 --- a/pkgs/development/python-modules/pypsrp/default.nix +++ b/pkgs/development/python-modules/pypsrp/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jborean93"; - repo = pname; + repo = "pypsrp"; tag = "v${version}"; hash = "sha256-Pwfc9e39sYPdcHN1cZtxxGEglEYzPp4yOYLD5/4SSiU="; }; diff --git a/pkgs/development/python-modules/pyqvrpro/default.nix b/pkgs/development/python-modules/pyqvrpro/default.nix index 53392e3cb18d..a9ee08df28d1 100644 --- a/pkgs/development/python-modules/pyqvrpro/default.nix +++ b/pkgs/development/python-modules/pyqvrpro/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oblogic7"; - repo = pname; + repo = "pyqvrpro"; rev = "v${version}"; hash = "sha256-lOd2AqnrkexNqT/usmJts5NW7vJtV8CRsliYgkhgRaU="; }; diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index a410c3345cde..ec16ae14fcd2 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -6,14 +6,14 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyrad"; version = "2.4-unstable-2024-07-24"; pyproject = true; src = fetchFromGitHub { owner = "pyradius"; - repo = pname; + repo = "pyrad"; rev = "f42a57cb0e80de42949810057d36df7c4a6b5146"; hash = "sha256-5SPVeBL1oMZ/XXgKch2Hbk6BRU24HlVl4oXZ2agF1h8="; }; diff --git a/pkgs/development/python-modules/pyrituals/default.nix b/pkgs/development/python-modules/pyrituals/default.nix index c8514f59ae78..06bb22893dbc 100644 --- a/pkgs/development/python-modules/pyrituals/default.nix +++ b/pkgs/development/python-modules/pyrituals/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "milanmeu"; - repo = pname; + repo = "pyrituals"; rev = version; sha256 = "0ynjz7khp67bwxjp580w3zijxr9yn44nmnbvkxjxq9scyb2mjf6g"; }; diff --git a/pkgs/development/python-modules/pyrmvtransport/default.nix b/pkgs/development/python-modules/pyrmvtransport/default.nix index 89eea0f2ecbb..1da4794cd2cb 100644 --- a/pkgs/development/python-modules/pyrmvtransport/default.nix +++ b/pkgs/development/python-modules/pyrmvtransport/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cgtobi"; - repo = pname; + repo = "pyrmvtransport"; rev = "v${version}"; hash = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40="; }; diff --git a/pkgs/development/python-modules/pysaj/default.nix b/pkgs/development/python-modules/pysaj/default.nix index 499cb552b36e..24a28d49a414 100644 --- a/pkgs/development/python-modules/pysaj/default.nix +++ b/pkgs/development/python-modules/pysaj/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fredericvl"; - repo = pname; + repo = "pysaj"; rev = "v${version}"; hash = "sha256-7mN6GPRbXfEUfCrCrCs71SSt4x2Ch2y3a5rfXnuwVA0="; }; diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 3fe9d328f195..919b5201df54 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyscf"; - repo = pname; + repo = "pyscf"; tag = "v${version}"; hash = "sha256-UTeZXlNuSWDOcBRVbUUWJ3mQnZZQr17aTw6rRA5DRNI="; }; diff --git a/pkgs/development/python-modules/pyschemes/default.nix b/pkgs/development/python-modules/pyschemes/default.nix index 5c7bc1afb960..034b110b1d14 100644 --- a/pkgs/development/python-modules/pyschemes/default.nix +++ b/pkgs/development/python-modules/pyschemes/default.nix @@ -6,14 +6,14 @@ fetchpatch, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyschemes"; version = "unstable-2017-11-08"; format = "setuptools"; src = fetchFromGitHub { owner = "spy16"; - repo = pname; + repo = "pyschemes"; rev = "ca6483d13159ba65ba6fc2f77b90421c40f2bbf2"; hash = "sha256-PssucudvlE8mztwVme70+h+2hRW/ri9oV9IZayiZhdU="; }; diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index 3710af7db272..86f102627ad5 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KimiNewt"; - repo = pname; + repo = "pyshark"; tag = "v${version}"; hash = "sha256-kzJDzUK6zknUyXPdKc4zMvWim4C5NQCSJSS45HI6hKM="; }; diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 176e04eed522..361252eaee7c 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GeospatialPython"; - repo = pname; + repo = "pyshp"; rev = version; hash = "sha256-yfxhgk8a1rdpGVkE1sjJqT6tiFLimhu2m2SjGxLI6wo="; }; diff --git a/pkgs/development/python-modules/pysmappee/default.nix b/pkgs/development/python-modules/pysmappee/default.nix index dbf3d11da54b..42fe3a71a5a5 100644 --- a/pkgs/development/python-modules/pysmappee/default.nix +++ b/pkgs/development/python-modules/pysmappee/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "smappee"; - repo = pname; + repo = "pysmappee"; rev = version; hash = "sha256-Ffi55FZsZUKDcS4qV46NpRK3VP6axzrL2BO+hYW7J9E="; }; diff --git a/pkgs/development/python-modules/pysmartapp/default.nix b/pkgs/development/python-modules/pysmartapp/default.nix index 295624bafc76..3214c7965e38 100644 --- a/pkgs/development/python-modules/pysmartapp/default.nix +++ b/pkgs/development/python-modules/pysmartapp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "andrewsayre"; - repo = pname; + repo = "pysmartapp"; rev = version; hash = "sha256-RiRGOO5l5hcHllyDDGLtQHr51JOTZhAa/wK8BfMqmAY="; }; diff --git a/pkgs/development/python-modules/pysmt/default.nix b/pkgs/development/python-modules/pysmt/default.nix index 7197bb1b6bb5..6edf59907d73 100644 --- a/pkgs/development/python-modules/pysmt/default.nix +++ b/pkgs/development/python-modules/pysmt/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pysmt"; - repo = pname; + repo = "pysmt"; rev = "v${version}"; hash = "sha256-HmEdCJOF04h0z5UPpfYa07b78EEBj5KyVAk6aNRFPEo="; }; diff --git a/pkgs/development/python-modules/pysnooz/default.nix b/pkgs/development/python-modules/pysnooz/default.nix index 4117952337fe..8a45805015f8 100644 --- a/pkgs/development/python-modules/pysnooz/default.nix +++ b/pkgs/development/python-modules/pysnooz/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AustinBrunkhorst"; - repo = pname; + repo = "pysnooz"; tag = "v${version}"; hash = "sha256-jOXmaJprU35sdNRrBBx/YUyiDyyaE1qodWksXkTSEe0="; }; diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index 80897afcf851..aed4cb05398d 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rbw"; - repo = pname; + repo = "pysnow"; rev = version; hash = "sha256-nKOPCkS2b3ObmBnk/7FTv4o4vwUX+tOtZI5OQQ4HSTY="; }; diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index a95787c5444a..234710d7bcf7 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # pypi package is missing test fixtures src = fetchFromGitHub { owner = "amelchio"; - repo = pname; + repo = "pysonos"; rev = "v${version}"; hash = "sha256-gBOknYHL5nQWFVhCbLN0Ah+1fovcNY4P2myryZnUadk="; }; diff --git a/pkgs/development/python-modules/pyspcwebgw/default.nix b/pkgs/development/python-modules/pyspcwebgw/default.nix index c8dc5e12d2e1..ff3731bc8686 100644 --- a/pkgs/development/python-modules/pyspcwebgw/default.nix +++ b/pkgs/development/python-modules/pyspcwebgw/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mbrrg"; - repo = pname; + repo = "pyspcwebgw"; tag = "v${version}"; hash = "sha256-gdIrbr25GXaX26B1f7u0NKbqqnAC2tmMFZspzW6I4HI="; }; diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix index cdedf35b93a5..bde01221be42 100644 --- a/pkgs/development/python-modules/pyspf/default.nix +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sdgathman"; - repo = pname; + repo = "pyspf"; rev = "pyspf-${version}"; sha256 = "0bmimlmwrq9glnjc4i6pwch30n3y5wyqmkjfyayxqxkfrixqwydi"; }; diff --git a/pkgs/development/python-modules/pyspinel/default.nix b/pkgs/development/python-modules/pyspinel/default.nix index bc052bf3dc89..1c6de8c5b3c3 100644 --- a/pkgs/development/python-modules/pyspinel/default.nix +++ b/pkgs/development/python-modules/pyspinel/default.nix @@ -6,7 +6,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyspinel"; version = "unstable-2021-08-19"; format = "setuptools"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openthread"; - repo = pname; + repo = "pyspinel"; rev = "50d104e29eacd92d229f0b7179ec1067f5851c17"; sha256 = "0s2r00zb909cq3dd28i91qbl0nz8cga3g98z84gq5jqkjpiy8269"; }; diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index 22cd63ce9fb6..a0a32a77c0b6 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jborean93"; - repo = pname; + repo = "pyspnego"; tag = "v${version}"; hash = "sha256-5aGHCw0d1aFcHLPRMkya0hlHV30aTKshbcOjfPMOFko="; }; diff --git a/pkgs/development/python-modules/pysubs2/default.nix b/pkgs/development/python-modules/pysubs2/default.nix index 03f7077afd42..158f35f74f28 100644 --- a/pkgs/development/python-modules/pysubs2/default.nix +++ b/pkgs/development/python-modules/pysubs2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tkarabela"; - repo = pname; + repo = "pysubs2"; rev = version; hash = "sha256-fKSb7MfBHGft8Tp6excjfkVXKnHRER11X0QxbR1zD4I="; }; diff --git a/pkgs/development/python-modules/pysvg-py3/default.nix b/pkgs/development/python-modules/pysvg-py3/default.nix index 77d430e67052..5e007defff32 100644 --- a/pkgs/development/python-modules/pysvg-py3/default.nix +++ b/pkgs/development/python-modules/pysvg-py3/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alorence"; - repo = pname; + repo = "pysvg-py3"; rev = version; sha256 = "1slync0knpcjgl4xpym8w4249iy6vmrwbarpnbjzn9xca8g1h2f0"; }; diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index ce8e5c499c16..e64cbe2a1775 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "supermihi"; - repo = pname; + repo = "pytaglib"; tag = "v${version}"; hash = "sha256-K9K30NFBcmxlYDQQ4YUhGzaPNVmLt0/L0JDrCtyKwLA="; }; diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix index 213ccd4825e2..8c3cef709321 100644 --- a/pkgs/development/python-modules/pytautulli/default.nix +++ b/pkgs/development/python-modules/pytautulli/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; + repo = "pytautulli"; tag = version; hash = "sha256-5wE8FjLFu1oQkVqnWsbp253dsQ1/QGWC6hHSIFwLajY="; }; diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix index 0110008ae3dd..0d7ac5bb2d45 100644 --- a/pkgs/development/python-modules/pyte/default.nix +++ b/pkgs/development/python-modules/pyte/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "selectel"; - repo = pname; + repo = "pyte"; rev = version; hash = "sha256-u24ltX/LEteiZ2a/ioKqxV2AZgrFmKOHXmySmw21sLE="; }; diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 502bb3dd2465..eedc98c91b76 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "madmaze"; - repo = pname; + repo = "pytesseract"; tag = "v${version}"; hash = "sha256-gQMeck6ojlIwyiOCBBhzHHrjQfBMelVksVGd+fyxWZk="; }; diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix index b49313a63f79..068882b2f99d 100644 --- a/pkgs/development/python-modules/pytest-cid/default.nix +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ntninja"; - repo = pname; + repo = "pytest-cid"; tag = "v${version}"; hash = "sha256-dcL/i5+scmdXh7lfE8+32w9PdHWf+mkunJL1vpJ5+Co="; }; diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix index 006a352318e0..7527668cb321 100644 --- a/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "omarkohl"; - repo = pname; + repo = "pytest-datafiles"; tag = version; hash = "sha256-YFD8M5TG6VtLRX04R3u0jtYDDlaK32D4ArWxS6x2b/E="; }; diff --git a/pkgs/development/python-modules/pytest-error-for-skips/default.nix b/pkgs/development/python-modules/pytest-error-for-skips/default.nix index 594c16c4a87f..aec6a3a073ff 100644 --- a/pkgs/development/python-modules/pytest-error-for-skips/default.nix +++ b/pkgs/development/python-modules/pytest-error-for-skips/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jankatins"; - repo = pname; + repo = "pytest-error-for-skips"; rev = version; sha256 = "04i4jd3bg4lgn2jfh0a0dzg3ml9b2bjv2ndia6b64w96r3r4p3qr"; }; diff --git a/pkgs/development/python-modules/pytest-golden/default.nix b/pkgs/development/python-modules/pytest-golden/default.nix index 87855a7a1df7..f87ba271afe0 100644 --- a/pkgs/development/python-modules/pytest-golden/default.nix +++ b/pkgs/development/python-modules/pytest-golden/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oprypin"; - repo = pname; + repo = "pytest-golden"; tag = "v${version}"; hash = "sha256-l5fXWDK6gWJc3dkYFTokI9tWvawMRnF0td/lSwqkYXE="; }; diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index 2fc387b35184..e770be044dfe 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stephrdev"; - repo = pname; + repo = "pytest-isort"; tag = version; hash = "sha256-fMt2tYc+Ngb57T/VJYxI2UN25qvIrgIsEoImVIitDK4="; }; diff --git a/pkgs/development/python-modules/pytest-logdog/default.nix b/pkgs/development/python-modules/pytest-logdog/default.nix index b047d86acc12..f16032c17b6a 100644 --- a/pkgs/development/python-modules/pytest-logdog/default.nix +++ b/pkgs/development/python-modules/pytest-logdog/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ods"; - repo = pname; + repo = "pytest-logdog"; rev = version; hash = "sha256-Tmoq+KAGzn0MMj29rukDfAc4LSIwC8DoMTuBAppV32I="; }; diff --git a/pkgs/development/python-modules/pytest-mockservers/default.nix b/pkgs/development/python-modules/pytest-mockservers/default.nix index 3ab4e4e63cbf..4f521fc236bf 100644 --- a/pkgs/development/python-modules/pytest-mockservers/default.nix +++ b/pkgs/development/python-modules/pytest-mockservers/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Gr1N"; - repo = pname; + repo = "pytest-mockservers"; rev = version; hash = "sha256-Mb3wSbambC1h+lFI+fafwZzm78IvADNAsF/Uw60DFHc="; }; diff --git a/pkgs/development/python-modules/pytest-parallel/default.nix b/pkgs/development/python-modules/pytest-parallel/default.nix index 5aee33dd53d1..bb37a365c5cc 100644 --- a/pkgs/development/python-modules/pytest-parallel/default.nix +++ b/pkgs/development/python-modules/pytest-parallel/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "kevlened"; - repo = pname; + repo = "pytest-parallel"; tag = version; hash = "sha256-ddpoWBTf7Zor569p6uOMjHSTx3Qa551f4mSwyTLDdBU="; }; diff --git a/pkgs/development/python-modules/pytest-param-files/default.nix b/pkgs/development/python-modules/pytest-param-files/default.nix index 793747e18248..3bb78f197750 100644 --- a/pkgs/development/python-modules/pytest-param-files/default.nix +++ b/pkgs/development/python-modules/pytest-param-files/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chrisjsewell"; - repo = pname; + repo = "pytest-param-files"; tag = "v${version}"; hash = "sha256-hgEEfKf9Kmah5WDNHoFWQJKLOs9Z5BDHiebXCdDc1zE="; }; diff --git a/pkgs/development/python-modules/pytest-raises/default.nix b/pkgs/development/python-modules/pytest-raises/default.nix index a2d818f07004..538147315842 100644 --- a/pkgs/development/python-modules/pytest-raises/default.nix +++ b/pkgs/development/python-modules/pytest-raises/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Lemmons"; - repo = pname; + repo = "pytest-raises"; tag = version; hash = "sha256-wmtWPWwe1sFbWSYxs5ZXDUZM1qvjRGMudWdjQeskaz0="; }; diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index b2ecfb4edb50..7c12c073f153 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; src = fetchFromGitHub { - repo = pname; + repo = "pytest-randomly"; owner = "pytest-dev"; rev = version; hash = "sha256-bxbW22Nf/0hfJYSiz3xdrNCzrb7vZwuVvSIrWl0Bkv4="; diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix index 66389e622e64..557a9e9995a7 100644 --- a/pkgs/development/python-modules/pytest-resource-path/default.nix +++ b/pkgs/development/python-modules/pytest-resource-path/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "yukihiko-shinoda"; - repo = pname; + repo = "pytest-resource-path"; rev = "v${version}"; sha256 = "1siv3pk4fsabz254fdzr7c0pxy124habnbw4ym66pfk883fr96g2"; }; diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix index e8cfd7dc9b62..b4fe9844778a 100644 --- a/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "joseph-roitman"; - repo = pname; + repo = "pytest-snapshot"; tag = "v${version}"; hash = "sha256-0PZu9wL29iEppLxxbl4D0E4WfOHe61KUUld003cRBRU="; }; diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 170e64f13f0c..a5b804545f96 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tarpas"; - repo = pname; + repo = "pytest-testmon"; tag = "v${version}"; hash = "sha256-LSp3GkvyZ8wX6qelGy4PdCliGIzXo2nJNrYqxdSo/wM="; }; diff --git a/pkgs/development/python-modules/pytest-tornasync/default.nix b/pkgs/development/python-modules/pytest-tornasync/default.nix index 43464e3ce149..94176949f056 100644 --- a/pkgs/development/python-modules/pytest-tornasync/default.nix +++ b/pkgs/development/python-modules/pytest-tornasync/default.nix @@ -7,7 +7,7 @@ tornado, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pytest-tornasync"; version = "0.6.0.post2"; format = "setuptools"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "eukaryote"; - repo = pname; + repo = "pytest-tornasync"; # upstream does not keep git tags in sync with pypy releases # https://github.com/eukaryote/pytest-tornasync/issues/9 rev = "c5f013f1f727f1ca1fcf8cc748bba7f4a2d79e56"; diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix index 31caf8fc5e09..5499c41d5f87 100644 --- a/pkgs/development/python-modules/pytest-trio/default.nix +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-trio"; - repo = pname; + repo = "pytest-trio"; rev = "v${version}"; sha256 = "sha256-gUH35Yk/pBD2EdCEt8D0XQKWU8BwmX5xtAW10qRhoYk="; }; diff --git a/pkgs/development/python-modules/pytest-vcr/default.nix b/pkgs/development/python-modules/pytest-vcr/default.nix index 2e77d3af8261..c2336df5c5fe 100644 --- a/pkgs/development/python-modules/pytest-vcr/default.nix +++ b/pkgs/development/python-modules/pytest-vcr/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ktosiek"; - repo = pname; + repo = "pytest-vcr"; rev = version; sha256 = "1i6fin91mklvbi8jzfiswvwf1m91f43smpj36a17xrzk4gisfs6i"; }; diff --git a/pkgs/development/python-modules/python-ctags3/default.nix b/pkgs/development/python-modules/python-ctags3/default.nix index aa82db324c16..6cd18c5b97f0 100644 --- a/pkgs/development/python-modules/python-ctags3/default.nix +++ b/pkgs/development/python-modules/python-ctags3/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "universal-ctags"; - repo = pname; + repo = "python-ctags3"; rev = version; hash = "sha256-XVsZckNVJ1H5q8FzqoVd1UWRw0zOygvRtb7arX9dwGE="; }; diff --git a/pkgs/development/python-modules/python-decouple/default.nix b/pkgs/development/python-modules/python-decouple/default.nix index 47a2629b2bb9..6bbe21fdbd4a 100644 --- a/pkgs/development/python-modules/python-decouple/default.nix +++ b/pkgs/development/python-modules/python-decouple/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "HBNetwork"; - repo = pname; + repo = "python-decouple"; tag = "v${version}"; hash = "sha256-F9Gu7Y/dJhwOJi/ZaoVclF3+4U/N5JdvpXwgGB3SF3Q="; }; diff --git a/pkgs/development/python-modules/python-frontmatter/default.nix b/pkgs/development/python-modules/python-frontmatter/default.nix index d21202daac65..0e6b5bb5c489 100644 --- a/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/pkgs/development/python-modules/python-frontmatter/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "eyeseast"; - repo = pname; + repo = "python-frontmatter"; tag = "v${version}"; sha256 = "sha256-Sr0RbNVk87Zu01U7nkuPUSnl1bm6G72EZDP/eDn099s="; }; diff --git a/pkgs/development/python-modules/python-fullykiosk/default.nix b/pkgs/development/python-modules/python-fullykiosk/default.nix index 14839d135b0c..3f4ed5c4d97b 100644 --- a/pkgs/development/python-modules/python-fullykiosk/default.nix +++ b/pkgs/development/python-modules/python-fullykiosk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cgarwood"; - repo = pname; + repo = "python-fullykiosk"; tag = version; hash = "sha256-+JBgBi05zNgIt2cXlHjFPI6nBFR7SpMCWIQHKtnZeX4="; }; diff --git a/pkgs/development/python-modules/python-gammu/default.nix b/pkgs/development/python-modules/python-gammu/default.nix index ed35a96f7752..2e36ccee20ae 100644 --- a/pkgs/development/python-modules/python-gammu/default.nix +++ b/pkgs/development/python-modules/python-gammu/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gammu"; - repo = pname; + repo = "python-gammu"; rev = version; hash = "sha256-lFQBrKWwdvUScwsBva08izZVeVDn1u+ldzixtL9YTpA="; }; diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index e056b4afc9d2..aa06730ffe4f 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openstack"; - repo = pname; + repo = "python-ironicclient"; tag = version; hash = "sha256-HqsOMvJ8SK8IEZgeClLd0TnQLBweBEru0Bw4WRSDG7s="; }; diff --git a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix index 9856742f48b4..cbca9a65a80d 100644 --- a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix +++ b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-lsp"; - repo = pname; + repo = "python-lsp-jsonrpc"; tag = "v${version}"; hash = "sha256-5WN/31e6WCgXVzevMuQbNjyo/2jjWDF+m48nrLKS+64="; }; diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix index c9fe1b204352..5173b45edabf 100644 --- a/pkgs/development/python-modules/python-ndn/default.nix +++ b/pkgs/development/python-modules/python-ndn/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "named-data"; - repo = pname; + repo = "python-ndn"; tag = "v${version}"; hash = "sha256-8fcBIcZ2l6mkKe9YQe5+5fh7+vK9qxzBO2kLRUONumQ="; }; diff --git a/pkgs/development/python-modules/python-pam/default.nix b/pkgs/development/python-modules/python-pam/default.nix index 8f126bca5a8d..3df5479a72c0 100644 --- a/pkgs/development/python-modules/python-pam/default.nix +++ b/pkgs/development/python-modules/python-pam/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "FirefighterBlu3"; - repo = pname; + repo = "python-pam"; tag = "v${version}"; hash = "sha256-MR9LYXtkbltAmn7yoyyKZn4yMHyh3rj/i/pA8nJy2xU="; }; diff --git a/pkgs/development/python-modules/python-pkcs11/default.nix b/pkgs/development/python-modules/python-pkcs11/default.nix index b4891105ce22..10e37e558501 100644 --- a/pkgs/development/python-modules/python-pkcs11/default.nix +++ b/pkgs/development/python-modules/python-pkcs11/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danni"; - repo = pname; + repo = "python-pkcs11"; rev = "v${version}"; sha256 = "0kncbipfpsb7m7mhv5s5b9wk604h1j08i2j26fn90pklgqll0xhv"; }; diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix index fee2f88d5038..609986ea2810 100644 --- a/pkgs/development/python-modules/python-rabbitair/default.nix +++ b/pkgs/development/python-modules/python-rabbitair/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rabbit-air"; - repo = pname; + repo = "python-rabbitair"; rev = "v${version}"; hash = "sha256-CGr7NvnGRNTiKq5BpB/zmfgyd/2ggTbO0nj+Q+MavTs="; }; diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix index 1811ba176a1e..f64c1e3d4eef 100644 --- a/pkgs/development/python-modules/python-twitter/default.nix +++ b/pkgs/development/python-modules/python-twitter/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bear"; - repo = pname; + repo = "python-twitter"; rev = "v${version}"; sha256 = "08ydmf6dcd416cvw6xq1wxsz6b9s21f2mf9fh3y4qz9swj6n9h8z"; }; diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index a74895545bb0..791dc068084a 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "WoLpH"; - repo = pname; + repo = "python-utils"; tag = "v${version}"; hash = "sha256-lzLzYI5jShfIwQqvfA8UtPjGawXE80ww7jb/gPzpeDo="; }; diff --git a/pkgs/development/python-modules/python3-application/default.nix b/pkgs/development/python-modules/python3-application/default.nix index b61ff595564f..f55a0ade2077 100644 --- a/pkgs/development/python-modules/python3-application/default.nix +++ b/pkgs/development/python-modules/python3-application/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AGProjects"; - repo = pname; + repo = "python3-application"; rev = "release-${version}"; hash = "sha256-L7KN6rKkbjNmkSoy8vdMYpXSBkWN7afNpreJO0twjq8="; }; diff --git a/pkgs/development/python-modules/pythreejs/fix-re.error.patch b/pkgs/development/python-modules/pythreejs/fix-re.error.patch deleted file mode 100644 index 74e75676e7cb..000000000000 --- a/pkgs/development/python-modules/pythreejs/fix-re.error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setupbase.py b/setupbase.py -index 0ce0ac8..7762e23 100644 ---- a/setupbase.py -+++ b/setupbase.py -@@ -659,7 +659,7 @@ def _translate_glob(pat): - translated_parts.append(_translate_glob_part(part)) - os_sep_class = '[%s]' % re.escape(SEPARATORS) - res = _join_translated(translated_parts, os_sep_class) -- return '{res}\\Z(?ms)'.format(res=res) -+ return '(?ms){res}\\Z'.format(res=res) - - - def _join_translated(translated_parts, os_sep_class): diff --git a/pkgs/development/python-modules/pytimeparse2/default.nix b/pkgs/development/python-modules/pytimeparse2/default.nix index d7ffec6a9b7d..4a84005cd991 100644 --- a/pkgs/development/python-modules/pytimeparse2/default.nix +++ b/pkgs/development/python-modules/pytimeparse2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "onegreyonewhite"; - repo = pname; + repo = "pytimeparse2"; tag = version; hash = "sha256-zWRbSohTvbVd3GcRRoxH/UReVGYHC0YmbNgbt8N0X48="; }; diff --git a/pkgs/development/python-modules/pytm/default.nix b/pkgs/development/python-modules/pytm/default.nix index 292283dca1bf..ae3678b3d9ba 100644 --- a/pkgs/development/python-modules/pytm/default.nix +++ b/pkgs/development/python-modules/pytm/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "izar"; - repo = pname; + repo = "pytm"; tag = "v${version}"; sha256 = "sha256-MseV1ucDCzSM36zx04g9v5euDX0t74KqUSB4+brHzt8="; }; diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index 98b20b6ffc46..12d6e311251c 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bobfang1992"; - repo = pname; + repo = "pytomlpp"; rev = "v${version}"; fetchSubmodules = true; hash = "sha256-QJeXvj1M3Vq5ctmx7RhczONsPRXAecv3WhJgKWtNK+M="; diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix index f906b58fe0af..d2caf52c6010 100644 --- a/pkgs/development/python-modules/pytricia/default.nix +++ b/pkgs/development/python-modules/pytricia/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pytricia"; version = "unstable-2019-01-16"; format = "setuptools"; src = fetchFromGitHub { owner = "jsommers"; - repo = pname; + repo = "pytricia"; rev = "4ba88f68c3125f789ca8cd1cfae156e1464bde87"; sha256 = "0qp5774xkm700g35k5c76pck8pdzqlyzbaqgrz76a1yh67s2ri8h"; }; diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix index a3cf57ca2ebb..ecc18e49f029 100644 --- a/pkgs/development/python-modules/pyu2f/default.nix +++ b/pkgs/development/python-modules/pyu2f/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; - repo = pname; + repo = "pyu2f"; tag = version; sha256 = "0mx7bn1p3n0fxyxa82wg3c719hby7vqkxv57fhf7zvhlg2zfnr0v"; }; diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index a2e0af522d83..b4a4027b28cd 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asottile"; - repo = pname; + repo = "pyupgrade"; rev = "v${version}"; hash = "sha256-bijW1uxoaVKLO0Psv3JeAG6rKeTwGa9ZW06VU1qFrrU="; }; diff --git a/pkgs/development/python-modules/pyuptimerobot/default.nix b/pkgs/development/python-modules/pyuptimerobot/default.nix index ad4a805bf90d..39f0cbc0b8b6 100644 --- a/pkgs/development/python-modules/pyuptimerobot/default.nix +++ b/pkgs/development/python-modules/pyuptimerobot/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; + repo = "pyuptimerobot"; tag = version; hash = "sha256-hy/hmXxxEb44X8JUszoA1YF/41y7GkQqC4uS+Pax6WA="; }; diff --git a/pkgs/development/python-modules/pyversasense/default.nix b/pkgs/development/python-modules/pyversasense/default.nix index d6328c4acf81..206c2211d5fc 100644 --- a/pkgs/development/python-modules/pyversasense/default.nix +++ b/pkgs/development/python-modules/pyversasense/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "imstevenxyz"; - repo = pname; + repo = "pyversasense"; rev = "v${version}"; sha256 = "vTaDEwImWDMInwti0Jj+j+RFEtXOOKtiH5wOMD6ZmJk="; }; diff --git a/pkgs/development/python-modules/pyvis/default.nix b/pkgs/development/python-modules/pyvis/default.nix index 79b82c9cb040..b6cbdf091ec8 100644 --- a/pkgs/development/python-modules/pyvis/default.nix +++ b/pkgs/development/python-modules/pyvis/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "WestHealth"; - repo = pname; + repo = "pyvis"; tag = "v${version}"; hash = "sha256-eo9Mk2c0hrBarCrzwmkXha3Qt4Bl1qR7Lhl9EkUx96E="; }; diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index ffc1402bc366..5ebc09edb239 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vmware"; - repo = pname; + repo = "pyvmomi"; tag = "v${version}"; hash = "sha256-wJe45r9fWNkg8oWJZ47bcqoWzOvxpO4soV2SU4N0tb0="; }; diff --git a/pkgs/development/python-modules/pywaterkotte/default.nix b/pkgs/development/python-modules/pywaterkotte/default.nix index 36ab393c2f6d..ad85a2a12541 100644 --- a/pkgs/development/python-modules/pywaterkotte/default.nix +++ b/pkgs/development/python-modules/pywaterkotte/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chboland"; - repo = pname; + repo = "pywaterkotte"; tag = "v${version}"; hash = "sha256-zK0x6LyXPPNPA20Zq+S1B1q7ZWGxQmWf4JxEfjNkPQw="; }; diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix index bec42ef78367..f6a4d91ce48b 100644 --- a/pkgs/development/python-modules/pyweatherflowrest/default.nix +++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "briis"; - repo = pname; + repo = "pyweatherflowrest"; tag = "v${version}"; hash = "sha256-l1V3HgzqnnoY6sWHwfgBtcIR782RwKhekY2qOLrUMNY="; }; diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 213d33de2314..d745f9ab1763 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sbidy"; - repo = pname; + repo = "pywizlight"; rev = "v${version}"; hash = "sha256-JT0Ud17U9etByaDVu9+hcadymze1rfj+mEK6nqksuWc="; }; diff --git a/pkgs/development/python-modules/pyws66i/default.nix b/pkgs/development/python-modules/pyws66i/default.nix index aa196c646a69..bad163763077 100644 --- a/pkgs/development/python-modules/pyws66i/default.nix +++ b/pkgs/development/python-modules/pyws66i/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ssaenger"; - repo = pname; + repo = "pyws66i"; rev = "v${version}"; hash = "sha256-NTL2+xLqSNsz4YdUTwr0nFjhm1NNgB8qDnWSoE2sizY="; }; diff --git a/pkgs/development/python-modules/pyxbe/default.nix b/pkgs/development/python-modules/pyxbe/default.nix index 744b5f02b3ea..b6a86195e2e2 100644 --- a/pkgs/development/python-modules/pyxbe/default.nix +++ b/pkgs/development/python-modules/pyxbe/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mborgerson"; - repo = pname; + repo = "pyxbe"; tag = "v${version}"; hash = "sha256-iLzGGgizUbaEG1xrNq4WDaWrGtcaLwAYgn4NGYiSDBo="; }; diff --git a/pkgs/development/python-modules/pyxdg/default.nix b/pkgs/development/python-modules/pyxdg/default.nix index b7ec762f7d6b..035715c297a1 100644 --- a/pkgs/development/python-modules/pyxdg/default.nix +++ b/pkgs/development/python-modules/pyxdg/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "xdg"; - repo = pname; + repo = "pyxdg"; rev = "rel-${version}"; hash = "sha256-TrFQzfkXabmfpGYwhxD1UVY1F645KycfSPPrMJFAe+0="; }; diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix index 04d5ef2b5b96..fbe09edf07a0 100644 --- a/pkgs/development/python-modules/pyxl3/default.nix +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -6,7 +6,7 @@ isPy27, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyxl3"; version = "1.4"; format = "setuptools"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gvanrossum"; - repo = pname; + repo = "pyxl3"; rev = "e6588c12caee49c43faf6aa260f04d7e971f6aa8"; hash = "sha256-8nKQgwLXPVgPxNRF4CryKJb7+llDsZHis5VctxqpIRo="; }; diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix index b6ae8556f82a..79d3617e49f9 100644 --- a/pkgs/development/python-modules/pyzerproc/default.nix +++ b/pkgs/development/python-modules/pyzerproc/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "emlove"; - repo = pname; + repo = "pyzerproc"; tag = version; hash = "sha256-vS0sk/KjDhWispZvCuGlmVLLfeFymHqxwNzNqNRhg6k="; }; diff --git a/pkgs/development/python-modules/qasync/default.nix b/pkgs/development/python-modules/qasync/default.nix index 6b5cc55dc2e3..e3626eddd7a6 100644 --- a/pkgs/development/python-modules/qasync/default.nix +++ b/pkgs/development/python-modules/qasync/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CabbageDevelopment"; - repo = pname; + repo = "qasync"; tag = "v${version}"; hash = "sha256-oXzwilhJ1PhodQpOZjnV9gFuoDy/zXWva9LhhK3T00g="; }; diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix index db69c1f4f5d7..c383e89b0de0 100644 --- a/pkgs/development/python-modules/qpageview/default.nix +++ b/pkgs/development/python-modules/qpageview/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frescobaldi"; - repo = pname; + repo = "qpageview"; tag = "v${version}"; hash = "sha256-UADC+DH3eG1pqlC9BRsqGQQjJcpfwWWVq4O7aFGLxLA="; }; diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 18c6cb6a2544..8ed729763110 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spyder-ide"; - repo = pname; + repo = "qtawesome"; tag = "v${version}"; hash = "sha256-VjUlP+5QU9ApD09UNvF48b0gepCUpVO6U6zYaKm0KoE="; }; diff --git a/pkgs/development/python-modules/qualysclient/default.nix b/pkgs/development/python-modules/qualysclient/default.nix index 0fa7aad7a920..85e167689cfe 100644 --- a/pkgs/development/python-modules/qualysclient/default.nix +++ b/pkgs/development/python-modules/qualysclient/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "woodtechie1428"; - repo = pname; + repo = "qualysclient"; tag = "v${version}"; hash = "sha256-+SZICysgSC4XeXC9CCl6Yxb47V9c1eMp7KcpH8J7kK0="; }; diff --git a/pkgs/development/python-modules/quantulum3/default.nix b/pkgs/development/python-modules/quantulum3/default.nix index 685145d941ea..85e17eaf53c8 100644 --- a/pkgs/development/python-modules/quantulum3/default.nix +++ b/pkgs/development/python-modules/quantulum3/default.nix @@ -25,7 +25,7 @@ buildPythonPackage { # Pypi source package doesn't contain tests src = fetchFromGitHub { owner = "nielstron"; - repo = pname; + repo = "quantulum3"; rev = "9dafd76d3586aa5ea1b96164d86c73037e827294"; hash = "sha256-fHztPeTbMp1aYsj+STYWzHgwdY0Q9078qXpXxtA8pPs="; }; diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index 0d8ab699377a..52aab0d5004e 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tmbo"; - repo = pname; + repo = "questionary"; tag = version; hash = "sha256-HiQsOkG3oK+hnyeFjebnVASxpZhUPGBGz69JvPO43fM="; }; diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix index e47fd1f14b35..ad83654c3ab3 100644 --- a/pkgs/development/python-modules/radian/default.nix +++ b/pkgs/development/python-modules/radian/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "randy3k"; - repo = pname; + repo = "radian"; tag = "v${version}"; hash = "sha256-gz2VczAgVbvISzvY/v0GvZ/Erv6ipZwPU61r6OJ+3Fo="; }; diff --git a/pkgs/development/python-modules/radiotherm/default.nix b/pkgs/development/python-modules/radiotherm/default.nix index c574b09301b8..cea8791fdb8c 100644 --- a/pkgs/development/python-modules/radiotherm/default.nix +++ b/pkgs/development/python-modules/radiotherm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mhrivnak"; - repo = pname; + repo = "radiotherm"; rev = version; sha256 = "0p37pc7l2malmjfkdlh4q2cfa6dqpsk1rah2j2xil0pj57ai6bks"; }; diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix index 92fcac8b67ad..78ebd833a17e 100644 --- a/pkgs/development/python-modules/rainbowstream/default.nix +++ b/pkgs/development/python-modules/rainbowstream/default.nix @@ -17,14 +17,14 @@ zlib, }: -buildPythonPackage rec { +buildPythonPackage { pname = "rainbowstream"; version = "1.5.5"; format = "setuptools"; src = fetchFromGitHub { owner = "orakaro"; - repo = pname; + repo = "rainbowstream"; # Request for tagging, https://github.com/orakaro/rainbowstream/issues/314 rev = "96141fac10675e0775d703f65a59c4477a48c57e"; sha256 = "0j0qcc428lk9b3l0cr2j418gd6wd5k4160ham2zn2mmdmxn5bldg"; diff --git a/pkgs/development/python-modules/rank-bm25/default.nix b/pkgs/development/python-modules/rank-bm25/default.nix index 7318aa2a7934..214b78eda6b2 100644 --- a/pkgs/development/python-modules/rank-bm25/default.nix +++ b/pkgs/development/python-modules/rank-bm25/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { # Pypi source package doesn't contain tests src = fetchFromGitHub { owner = "dorianbrown"; - repo = pname; + repo = "rank-bm25"; rev = version; hash = "sha256-+BxQBflMm2AvCLAFFj52Jpkqn+KErwYXU1wztintgOg="; }; diff --git a/pkgs/development/python-modules/ratelimit/default.nix b/pkgs/development/python-modules/ratelimit/default.nix index b17d017fbd6a..0e4bdaca35c1 100644 --- a/pkgs/development/python-modules/ratelimit/default.nix +++ b/pkgs/development/python-modules/ratelimit/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tomasbasham"; - repo = pname; + repo = "ratelimit"; rev = "v${version}"; sha256 = "04hy3hhh5xdqcsz0lx8j18zbj88kh5ik4wyi5d3a5sfy2hx70in2"; }; diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix index 2d992abd827a..c61edb251fca 100644 --- a/pkgs/development/python-modules/rchitect/default.nix +++ b/pkgs/development/python-modules/rchitect/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "randy3k"; - repo = pname; + repo = "rchitect"; tag = "v${version}"; hash = "sha256-M7OWDo3mEEOYtjIpzPIpzPMBtv2TZJKJkSfHczZYS8Y="; }; diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index a61f2804d71f..493460381d30 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rtfd"; - repo = pname; + repo = "recommonmark"; rev = version; sha256 = "0kwm4smxbgq0c0ybkxfvlgrfb3gq9amdw94141jyykk9mmz38379"; }; diff --git a/pkgs/development/python-modules/regional/default.nix b/pkgs/development/python-modules/regional/default.nix index ea995ee27a7d..97672368fc39 100644 --- a/pkgs/development/python-modules/regional/default.nix +++ b/pkgs/development/python-modules/regional/default.nix @@ -9,7 +9,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage { pname = "regional"; version = "1.1.2"; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "freeman-lab"; - repo = pname; + repo = "regional"; rev = "e3a29c58982e5cd3d5700131ac96e5e0b84fb981"; # no tags in repo hash = "sha256-u88v9H9RZ9cgtSat73QEnHr3gZGL8DmBZ0XphMuoDw8="; }; diff --git a/pkgs/development/python-modules/releases/default.nix b/pkgs/development/python-modules/releases/default.nix index 2db172bdeb5b..5b576a26fc33 100644 --- a/pkgs/development/python-modules/releases/default.nix +++ b/pkgs/development/python-modules/releases/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bitprophet"; - repo = pname; + repo = "releases"; rev = version; hash = "sha256-IgEKAUk97R3ZvqvexD/ptT8i0uf48K+DKkk4q3pn3G8="; }; diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix index ac9ddd35aabd..424d0f5f3de0 100644 --- a/pkgs/development/python-modules/reolink/default.nix +++ b/pkgs/development/python-modules/reolink/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fwestenberg"; - repo = pname; + repo = "reolink"; tag = "v${version}"; hash = "sha256-DZcTfmzO9rBhhRN2RkgoPwUPE+LPPeZgc8kmhYU9V2I="; }; diff --git a/pkgs/development/python-modules/requests-credssp/default.nix b/pkgs/development/python-modules/requests-credssp/default.nix index 428b4ac18777..1ef06e813c68 100644 --- a/pkgs/development/python-modules/requests-credssp/default.nix +++ b/pkgs/development/python-modules/requests-credssp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jborean93"; - repo = pname; + repo = "requests-credssp"; rev = "v${version}"; hash = "sha256-HHLEmQ+mNjMjpR6J+emrKFM+2PiYq32o7Gnoo0gUrNA="; }; diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index 541604089e25..33a465dd51e5 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyauth"; - repo = pname; + repo = "requests-http-signature"; rev = "v${version}"; hash = "sha256-sW2vYqT/nY27DvEKHdptc3dUpuqKmD7PLMs+Xp+cpeU="; }; diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index 70a5eebacdb5..b2829a6a332d 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "requests"; - repo = pname; + repo = "requests-kerberos"; rev = "v${version}"; hash = "sha256-s1Q3zqKPSuTkiFExr+axai9Eta1xjw/cip8xzfDGR88="; }; diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index f6ac5014be4a..b644cc76cadf 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bmcfee"; - repo = pname; + repo = "resampy"; tag = version; hash = "sha256-LOWpOPAEK+ga7c3bR15QvnHmON6ARS1Qee/7U/VMlTY="; }; diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 1a2db047b7a4..4544ef60d6ce 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "getsentry"; - repo = pname; + repo = "responses"; tag = version; hash = "sha256-eiJwu0sRtr3S4yAnbsIak7g03CNqOTS16rNXoXRQumA="; }; diff --git a/pkgs/development/python-modules/retry-decorator/default.nix b/pkgs/development/python-modules/retry-decorator/default.nix index 4482a7b25fac..975e878ee45a 100644 --- a/pkgs/development/python-modules/retry-decorator/default.nix +++ b/pkgs/development/python-modules/retry-decorator/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pnpnpn"; - repo = pname; + repo = "retry-decorator"; tag = "v${version}"; hash = "sha256-0dZq4YbPcH4ItyMnpF7B20YYLtzwniJClBK9gRndU1M="; }; diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix index 596a2ca07290..01ee32e3bdec 100644 --- a/pkgs/development/python-modules/rfc6555/default.nix +++ b/pkgs/development/python-modules/rfc6555/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sethmlarson"; - repo = pname; + repo = "rfc6555"; rev = "v${version}"; hash = "sha256-Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM="; }; diff --git a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix index 014f651e18c3..1d426b3558fa 100644 --- a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RIPE-NCC"; - repo = pname; + repo = "ripe-atlas-sagan"; rev = "v${version}"; hash = "sha256-xIBIKsQvDmVBa/C8/7Wr3WKeepHaGhoXlgatXSUtWLA="; }; diff --git a/pkgs/development/python-modules/riscof/default.nix b/pkgs/development/python-modules/riscof/default.nix index a47cc8172b69..c62052424d50 100644 --- a/pkgs/development/python-modules/riscof/default.nix +++ b/pkgs/development/python-modules/riscof/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "riscv-software-src"; - repo = pname; + repo = "riscof"; tag = version; hash = "sha256-ToI2xI0fvnDR+hJ++T4ss5X3gc4G6Cj1uJHx0m2X7GY="; }; diff --git a/pkgs/development/python-modules/riscv-isac/default.nix b/pkgs/development/python-modules/riscv-isac/default.nix index 0353b0d59870..dc731438b54a 100644 --- a/pkgs/development/python-modules/riscv-isac/default.nix +++ b/pkgs/development/python-modules/riscv-isac/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "riscv-software-src"; - repo = pname; + repo = "riscv-isac"; tag = version; hash = "sha256-7CWUyYwzynFq/Qk5SzQB+ljsVVI98kPPDT63Emhqihw="; }; diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index acdca91e53aa..f5a7a7183eea 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MarketSquare"; - repo = pname; + repo = "robotframework-requests"; tag = "v${version}"; hash = "sha256-NRhf3delcqUw9vWRPL6pJzpcmRMDou2pHmUHMstF8hw="; }; diff --git a/pkgs/development/python-modules/rpi-bad-power/default.nix b/pkgs/development/python-modules/rpi-bad-power/default.nix index 00e7830fbd7c..73de990287a9 100644 --- a/pkgs/development/python-modules/rpi-bad-power/default.nix +++ b/pkgs/development/python-modules/rpi-bad-power/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "shenxn"; - repo = pname; + repo = "rpi-bad-power"; rev = "v${version}"; hash = "sha256:1yvfz28blq4fdnn614n985vbs5hcw1gm3i9am53k410sfs7ilvkk"; }; diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index 24aa686c807c..77c9848b873d 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "samuelcolvin"; - repo = pname; + repo = "rtoml"; rev = "v${version}"; hash = "sha256-1movtKMQkQ6PEpKpSkK0Oy4AV0ee7XrS0P9m6QwZTaM="; }; diff --git a/pkgs/development/python-modules/ruamel-yaml-clib/fix-incompatible-function-pointers.patch b/pkgs/development/python-modules/ruamel-yaml-clib/fix-incompatible-function-pointers.patch deleted file mode 100644 index 99debf22e5ae..000000000000 --- a/pkgs/development/python-modules/ruamel-yaml-clib/fix-incompatible-function-pointers.patch +++ /dev/null @@ -1,79 +0,0 @@ -Based on https://sourceforge.net/p/ruamel-yaml-clib/code/merge-requests/4/ with additions -for `input_handler` and `output_handler`. - ---- a/_ruamel_yaml.pxd -+++ b/_ruamel_yaml.pxd -@@ -2,15 +2,15 @@ - cdef extern from "_ruamel_yaml.h": - - void malloc(int l) -- void memcpy(char *d, char *s, int l) -+ void memcpy(unsigned char *d, char *s, int l) - int strlen(char *s) - int PyString_CheckExact(object o) - int PyUnicode_CheckExact(object o) - char *PyString_AS_STRING(object o) - int PyString_GET_SIZE(object o) -- object PyString_FromStringAndSize(char *v, int l) -+ object PyString_FromStringAndSize(unsigned char *v, size_t l) - object PyUnicode_FromString(char *u) -- object PyUnicode_DecodeUTF8(char *u, int s, char *e) -+ object PyUnicode_DecodeUTF8(unsigned char *u, size_t s, char *e) - object PyUnicode_AsUTF8String(object o) - int PY_MAJOR_VERSION - -@@ -85,11 +85,11 @@ - YAML_MAPPING_START_EVENT - YAML_MAPPING_END_EVENT - -- ctypedef int yaml_read_handler_t(void *data, char *buffer, -- int size, int *size_read) except 0 -- -- ctypedef int yaml_write_handler_t(void *data, char *buffer, -- int size) except 0 -+ ctypedef int yaml_read_handler_t(void *data, unsigned char *buffer, -+ size_t size, size_t *size_read) except 0 -+ -+ ctypedef int yaml_write_handler_t(void *data, unsigned char *buffer, -+ size_t size) except 0 - - ctypedef struct yaml_mark_t: - int index -@@ -112,7 +112,7 @@ - char *handle - char *suffix - ctypedef struct _yaml_token_scalar_data_t: -- char *value -+ unsigned char *value - int length - yaml_scalar_style_t style - ctypedef struct _yaml_token_version_directive_data_t: -@@ -151,7 +151,7 @@ - ctypedef struct _yaml_event_scalar_data_t: - char *anchor - char *tag -- char *value -+ unsigned char *value - int length - int plain_implicit - int quoted_implicit ---- a/_ruamel_yaml.pyx -+++ b/_ruamel_yaml.pyx -@@ -904,7 +904,7 @@ - raise error - return 1 - --cdef int input_handler(void *data, char *buffer, int size, int *read) except 0: -+cdef int input_handler(void *data, unsigned char *buffer, size_t size, size_t *read) except 0: - cdef CParser parser - parser = data - if parser.stream_cache is None: -@@ -1514,7 +1514,7 @@ - self.ascend_resolver() - return 1 - --cdef int output_handler(void *data, char *buffer, int size) except 0: -+cdef int output_handler(void *data, unsigned char *buffer, size_t size) except 0: - cdef CEmitter emitter - emitter = data - if emitter.dump_unicode == 0: diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix index 06147e09686d..330882d42191 100644 --- a/pkgs/development/python-modules/ruffus/default.nix +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cgat-developers"; - repo = pname; + repo = "ruffus"; rev = "v${version}"; sha256 = "0fnzpchwwqsy5h18fs0n90s51w25n0dx0l74j0ka6lvhjl5sxn4c"; }; diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index 30be2072b595..dd798ec72893 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wuub"; - repo = pname; + repo = "rxv"; rev = "v${version}"; sha256 = "0jldnlzbfg5jm1nbgv91mlvcqkswd9f2n3qj9aqlbmj1cxq19yz8"; }; diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix index 08960b6dbc39..d58461de8a33 100644 --- a/pkgs/development/python-modules/sacremoses/default.nix +++ b/pkgs/development/python-modules/sacremoses/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alvations"; - repo = pname; + repo = "sacremoses"; rev = version; sha256 = "1gzr56w8yx82mn08wax5m0xyg15ym4ri5l80gmagp8r53443j770"; }; diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix index e9ad2980e319..34eed3242f03 100644 --- a/pkgs/development/python-modules/sarge/default.nix +++ b/pkgs/development/python-modules/sarge/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vsajip"; - repo = pname; + repo = "sarge"; rev = version; hash = "sha256-bT1DbcQi+SbeRBsL7ILuQbSnAj3BBB4+FNl+Zek5xU4="; }; diff --git a/pkgs/development/python-modules/schemainspect/default.nix b/pkgs/development/python-modules/schemainspect/default.nix index bca42664cc18..36095d9bf981 100644 --- a/pkgs/development/python-modules/schemainspect/default.nix +++ b/pkgs/development/python-modules/schemainspect/default.nix @@ -14,7 +14,7 @@ postgresql, postgresqlTestHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "schemainspect"; version = "3.1.1663587362"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "djrobstep"; - repo = pname; + repo = "schemainspect"; # no tags on github, version patch number is unix time. rev = "066262d6fb4668f874925305a0b7dbb3ac866882"; hash = "sha256-SYpQQhlvexNc/xEgSIk8L8J+Ta+3OZycGLeZGQ6DWzk="; diff --git a/pkgs/development/python-modules/scikit-learn-extra/default.nix b/pkgs/development/python-modules/scikit-learn-extra/default.nix index 3c37f61c0b53..95cdcce5d10e 100644 --- a/pkgs/development/python-modules/scikit-learn-extra/default.nix +++ b/pkgs/development/python-modules/scikit-learn-extra/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-learn-contrib"; - repo = pname; + repo = "scikit-learn-extra"; tag = "v${version}"; sha256 = "sha256-dHOwo6NIuhcvIehpuJQ621JEg5O3mnXycAhpTZKaxns="; }; diff --git a/pkgs/development/python-modules/scim2-filter-parser/default.nix b/pkgs/development/python-modules/scim2-filter-parser/default.nix index fd3f8418f48f..ab9e307d3641 100644 --- a/pkgs/development/python-modules/scim2-filter-parser/default.nix +++ b/pkgs/development/python-modules/scim2-filter-parser/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "15five"; - repo = pname; + repo = "scim2-filter-parser"; tag = version; hash = "sha256-KmtOtI/5HT0lVwvXQFTlEwMeptoa4cA5hTSgSULxhIc="; }; diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index 36163e8a0c91..7f0b4ab3db53 100644 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -12,7 +12,7 @@ scrapy, }: -buildPythonPackage rec { +buildPythonPackage { pname = "scrapy-fake-useragent"; version = "1.4.4"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { # PyPi tarball is corrupted src = fetchFromGitHub { owner = "alecxe"; - repo = pname; + repo = "scrapy-fake-useragent"; rev = "59c20d38c58c76618164760d546aa5b989a79b8b"; # no tags hash = "sha256-khQMOQrrdHokvNqfaMWqXV7AzwGxTuxaLsZoLkNpZ3k="; }; diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index b90be59b6d66..0b5925222c5b 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rr-"; - repo = pname; + repo = "screeninfo"; tag = version; hash = "sha256-TEy4wff0eRRkX98yK9054d33Tm6G6qWrd9Iv+ITcFmA="; }; diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix index ec1aa7461196..9cc641d286cc 100644 --- a/pkgs/development/python-modules/sdds/default.nix +++ b/pkgs/development/python-modules/sdds/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pylhc"; - repo = pname; + repo = "sdds"; tag = "v${version}"; hash = "sha256-h1gEqzmKCUr8+w3Fv8lv35/0itZwela//AQsD3u0UJA="; }; diff --git a/pkgs/development/python-modules/seatconnect/default.nix b/pkgs/development/python-modules/seatconnect/default.nix index 1b685f8078a8..377293d4532c 100644 --- a/pkgs/development/python-modules/seatconnect/default.nix +++ b/pkgs/development/python-modules/seatconnect/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "farfar"; - repo = pname; + repo = "seatconnect"; tag = version; hash = "sha256-HITVrI0o94a61gy/TYSGFtLBYX4Rw/dK1o2/KsvHLTQ="; }; diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix index bf0a275969d3..005a194afd6d 100644 --- a/pkgs/development/python-modules/segyio/default.nix +++ b/pkgs/development/python-modules/segyio/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "equinor"; - repo = pname; + repo = "segyio"; tag = "v${version}"; hash = "sha256-+N2JvHBxpdbysn4noY/9LZ4npoQ9143iFEzaxoafnms="; }; diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index 73454cec0101..58d85e20122c 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "sensor-state-data"; tag = "v${version}"; hash = "sha256-9GdBKUhueis8pnQP5ZNxvEyRXVGINTueVzLOR4xx5mU="; }; diff --git a/pkgs/development/python-modules/serialio/default.nix b/pkgs/development/python-modules/serialio/default.nix index 3ef9e2798b06..3d2b91e107a1 100644 --- a/pkgs/development/python-modules/serialio/default.nix +++ b/pkgs/development/python-modules/serialio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tiagocoutinho"; - repo = pname; + repo = "serialio"; tag = "v${version}"; hash = "sha256-9TRGT0wpoRRcHqnH1XzlMBh0IcVzdEcOzN7hkeYnoW4="; }; diff --git a/pkgs/development/python-modules/serializable/default.nix b/pkgs/development/python-modules/serializable/default.nix index abc9e1378b10..0dd160f37580 100644 --- a/pkgs/development/python-modules/serializable/default.nix +++ b/pkgs/development/python-modules/serializable/default.nix @@ -7,14 +7,14 @@ typechecks, }: -buildPythonPackage rec { +buildPythonPackage { pname = "serializable"; version = "unstable-2023-07-13"; format = "setuptools"; src = fetchFromGitHub { owner = "iskandr"; - repo = pname; + repo = "serializable"; # See https://github.com/iskandr/serializable/issues/7. As of 2023-07-13, # they do no have version tags. rev = "ed309a6f8f2590b525fc0f93c00549223c8c944f"; diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix index a74fc852bc12..893cf8591544 100644 --- a/pkgs/development/python-modules/servefile/default.nix +++ b/pkgs/development/python-modules/servefile/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sebageek"; - repo = pname; + repo = "servefile"; tag = "v${version}"; hash = "sha256-hIqXwhmvstCslsCO973oK5FF2c8gZJ0wNUI/z8W+OjU="; }; diff --git a/pkgs/development/python-modules/service-identity/default.nix b/pkgs/development/python-modules/service-identity/default.nix index 565655c5678c..55a101d26f90 100644 --- a/pkgs/development/python-modules/service-identity/default.nix +++ b/pkgs/development/python-modules/service-identity/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyca"; - repo = pname; + repo = "service-identity"; tag = version; hash = "sha256-onxCUWqGVeenLqB5lpUpj3jjxTM61ogXCQOGnDnClT4="; }; diff --git a/pkgs/development/python-modules/setuptools-odoo/default.nix b/pkgs/development/python-modules/setuptools-odoo/default.nix index 7d1152294fec..710b70625005 100644 --- a/pkgs/development/python-modules/setuptools-odoo/default.nix +++ b/pkgs/development/python-modules/setuptools-odoo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "acsone"; - repo = pname; + repo = "setuptools-odoo"; tag = version; hash = "sha256-38YlkDH/PuJ1yvQ43OYmdnRd1SGJULv6fC/+fitLDJ8="; }; diff --git a/pkgs/development/python-modules/seventeentrack/default.nix b/pkgs/development/python-modules/seventeentrack/default.nix index d0331594e3fd..a40cc9c78bda 100644 --- a/pkgs/development/python-modules/seventeentrack/default.nix +++ b/pkgs/development/python-modules/seventeentrack/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "McSwindler"; - repo = pname; + repo = "seventeentrack"; rev = version; hash = "sha256-vMdRXcd0es/LjgsVyWItSLFzlSTEa3oaA6lr/NL4i8U="; }; diff --git a/pkgs/development/python-modules/sharkiq/default.nix b/pkgs/development/python-modules/sharkiq/default.nix index 0e338a979482..b2ec96b5fe22 100644 --- a/pkgs/development/python-modules/sharkiq/default.nix +++ b/pkgs/development/python-modules/sharkiq/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JeffResc"; - repo = pname; + repo = "sharkiq"; tag = "v${version}"; hash = "sha256-adSBFH5nGVPo7OBMak6rN5HA5uMKZCqnIVXBnR7REgQ="; }; diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index f457ea4c3146..6858d34ee16e 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sarugaku"; - repo = pname; + repo = "shellingham"; tag = version; hash = "sha256-xeBo3Ok+XPrHN4nQd7M8/11leSV/8z1f7Sj33+HFVtQ="; }; diff --git a/pkgs/development/python-modules/showit/default.nix b/pkgs/development/python-modules/showit/default.nix index b98b48df2cd9..95d8c3d60ae4 100644 --- a/pkgs/development/python-modules/showit/default.nix +++ b/pkgs/development/python-modules/showit/default.nix @@ -7,14 +7,14 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage { pname = "showit"; version = "1.1.4"; format = "setuptools"; src = fetchFromGitHub { owner = "freeman-lab"; - repo = pname; + repo = "showit"; rev = "ef76425797c71fbe3795b4302c49ab5be6b0bacb"; # no tags in repo sha256 = "0xd8isrlwwxlgji90lly1sq4l2a37rqvhsmyhv7bd3aj1dyjmdr6"; }; diff --git a/pkgs/development/python-modules/shutilwhich/default.nix b/pkgs/development/python-modules/shutilwhich/default.nix index bc022fbe0f85..4f9b5dd8d629 100644 --- a/pkgs/development/python-modules/shutilwhich/default.nix +++ b/pkgs/development/python-modules/shutilwhich/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mbr"; - repo = pname; + repo = "shutilwhich"; rev = version; sha256 = "05fwcjn86w8wprck04iv1zccfi39skdf0lhwpb4b9gpvklyc9mj0"; }; diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix index 65c8e9e4692d..3aa1cf1d51e5 100644 --- a/pkgs/development/python-modules/simber/default.nix +++ b/pkgs/development/python-modules/simber/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "deepjyoti30"; - repo = pname; + repo = "simber"; tag = version; hash = "sha256-kHoFZD7nhVxJu9MqePLkL7KTG2saPecY9238c/oeEco="; }; diff --git a/pkgs/development/python-modules/simplehound/default.nix b/pkgs/development/python-modules/simplehound/default.nix index bf2efed90c09..e9462acf1f07 100644 --- a/pkgs/development/python-modules/simplehound/default.nix +++ b/pkgs/development/python-modules/simplehound/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robmarkcole"; - repo = pname; + repo = "simplehound"; rev = "v${version}"; sha256 = "1b5m3xjmk0l6ynf0yvarplsfsslgklalfcib7sikxg3v5hiv9qwh"; }; diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 49b0c3061747..398ccd8dd226 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -15,8 +15,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "simplejson"; + repo = "simplejson"; tag = "v${version}"; hash = "sha256-wE/jqBMXVtmbc/78X4lgfvuj074CrzfLJL1CM6LCfas="; }; diff --git a/pkgs/development/python-modules/single-version/default.nix b/pkgs/development/python-modules/single-version/default.nix index 960efdb9a218..1b738a665a25 100644 --- a/pkgs/development/python-modules/single-version/default.nix +++ b/pkgs/development/python-modules/single-version/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hongquan"; - repo = pname; + repo = "single-version"; tag = "v${version}"; hash = "sha256-dUmJhNCPuq/7WGzFQXLjb8JrQgQn7qyBqzPWaKzD9hc="; }; diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix index 49ccd8740f92..e5c1b5991899 100644 --- a/pkgs/development/python-modules/skrl/default.nix +++ b/pkgs/development/python-modules/skrl/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Toni-SM"; - repo = pname; + repo = "skrl"; tag = version; hash = "sha256-5lkoYAmMIWqK3+E3WxXMWS9zal2DhZkfl30EkrHKpdI="; }; diff --git a/pkgs/development/python-modules/skytemple-eventserver/default.nix b/pkgs/development/python-modules/skytemple-eventserver/default.nix index 275948b3970d..e0c6c50fa7ec 100644 --- a/pkgs/development/python-modules/skytemple-eventserver/default.nix +++ b/pkgs/development/python-modules/skytemple-eventserver/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; + repo = "skytemple-eventserver"; rev = version; hash = "sha256-PWLGPORNprTfG+jgXI1sxyVkRTwSEib4SZhPdOBchwE="; }; diff --git a/pkgs/development/python-modules/skytemple-icons/default.nix b/pkgs/development/python-modules/skytemple-icons/default.nix index 20c6187a2c25..093b1f91e061 100644 --- a/pkgs/development/python-modules/skytemple-icons/default.nix +++ b/pkgs/development/python-modules/skytemple-icons/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; + repo = "skytemple-icons"; rev = version; sha256 = "0wagdvzks9irdl5lj8sfqkkvfwwmdpvjyzx6424shvpp5mk28dcv"; }; diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index 8c7b0e242ce4..21613b56bde0 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spacetx"; - repo = pname; + repo = "slicedimage"; rev = version; sha256 = "1vpg8varvfx0nj6xscdfm7m118hzsfz7qfzn28r9rsfvrhr0dlcw"; }; diff --git a/pkgs/development/python-modules/smbus2/default.nix b/pkgs/development/python-modules/smbus2/default.nix index de050f1f5220..5f7347eb04b3 100644 --- a/pkgs/development/python-modules/smbus2/default.nix +++ b/pkgs/development/python-modules/smbus2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kplindegaard"; - repo = pname; + repo = "smbus2"; tag = version; hash = "sha256-3ZAjviVLO/c27NzrPcWf6RlZYclYkmUmOskTP9TVbNM="; }; diff --git a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix index e52b88742253..34633ec6faaf 100644 --- a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix +++ b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "snakemake"; - repo = pname; + repo = "snakemake-executor-plugin-cluster-generic"; tag = "v${version}"; hash = "sha256-RHMefoJOZb6TjRsFCORLFdHtI5ZpTsV6CHrjHKMat9o="; }; diff --git a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix index ef56cbc43bec..dcda2dab0916 100644 --- a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "snakemake"; - repo = pname; + repo = "snakemake-interface-logger-plugins"; tag = "v${version}"; hash = "sha256-VHbta+R2a/K2L03IRu/Ya7dJzshIAvyK9cNIRbx8QqM="; }; diff --git a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix index 137aa8ae88a8..5be194ba2de6 100644 --- a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "snakemake"; - repo = pname; + repo = "snakemake-interface-report-plugins"; tag = "v${version}"; hash = "sha256-yk2fYlueaobXJgF7ob6jTccEz8r0geq1HFVsa+ZO30Q="; }; diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix index f40ea176ee08..0e6ccd4db39c 100644 --- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "snakemake"; - repo = pname; + repo = "snakemake-interface-storage-plugins"; tag = "v${version}"; hash = "sha256-mGpKmKWWL4ue9Dddjs4fXCaITrC97yHC58Jh2vclXAY="; }; diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix index ff7f167ccc5a..e7cd422e4d8f 100644 --- a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix +++ b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "snakemake"; - repo = pname; + repo = "snakemake-storage-plugin-fs"; tag = "v${version}"; hash = "sha256-bTkT1D2GJGS+zWvK/BUGLGE8ArZQikHHcdQjREJhldg="; }; diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix index 1620865f1869..1b68b506ba3a 100644 --- a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix +++ b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "snakemake"; - repo = pname; + repo = "snakemake-storage-plugin-xrootd"; tag = "v${version}"; hash = "sha256-vfMAgOTmT3uzUZHXeKsd8Ze3+b3nFsVHDhkPG+xvz+k="; }; diff --git a/pkgs/development/python-modules/snorkel/default.nix b/pkgs/development/python-modules/snorkel/default.nix index 836e04d0875d..51c71152bfd8 100644 --- a/pkgs/development/python-modules/snorkel/default.nix +++ b/pkgs/development/python-modules/snorkel/default.nix @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "snorkel-team"; - repo = pname; + repo = "snorkel"; tag = "v${version}"; hash = "sha256-1DgkMHYToiI3266yCND1bXiui80x8AaBttxM83kJImw="; }; diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix index b742c8d6985a..7871fd5a708e 100644 --- a/pkgs/development/python-modules/snuggs/default.nix +++ b/pkgs/development/python-modules/snuggs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; - repo = pname; + repo = "snuggs"; rev = version; sha256 = "1p3lh9s2ylsnrzbs931y2vn7mp2y2xskgqmh767c9l1a33shfgwf"; }; diff --git a/pkgs/development/python-modules/socialscan/default.nix b/pkgs/development/python-modules/socialscan/default.nix index a91e7867c503..381dc8b4752c 100644 --- a/pkgs/development/python-modules/socialscan/default.nix +++ b/pkgs/development/python-modules/socialscan/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iojw"; - repo = pname; + repo = "socialscan"; tag = "v${version}"; hash = "sha256-4JJVhB6x1NGagtfzE03Jae2GOr25hh+4l7gQ23zc7Ck="; }; diff --git a/pkgs/development/python-modules/sockio/default.nix b/pkgs/development/python-modules/sockio/default.nix index a71ca5817974..a243425fe3a2 100644 --- a/pkgs/development/python-modules/sockio/default.nix +++ b/pkgs/development/python-modules/sockio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tiagocoutinho"; - repo = pname; + repo = "sockio"; tag = "v${version}"; hash = "sha256-NSGd7/k1Yr408dipMNBSPRSwQ+wId7VLxgqMM/UmN/Q="; }; diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 1ff4abf9a06d..1d188cd39cde 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -11,7 +11,6 @@ click, prettytable, prompt-toolkit, - ptable, pygments, requests, rich, @@ -50,7 +49,6 @@ buildPythonPackage rec { click prettytable prompt-toolkit - ptable pygments requests rich diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 679351c90657..99eff0c3f0ef 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "solokeys"; - repo = pname; + repo = "solo-python"; rev = version; hash = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU="; }; diff --git a/pkgs/development/python-modules/sparklines/default.nix b/pkgs/development/python-modules/sparklines/default.nix index 664127865129..c04f1908def7 100644 --- a/pkgs/development/python-modules/sparklines/default.nix +++ b/pkgs/development/python-modules/sparklines/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "deeplook"; - repo = pname; + repo = "sparklines"; tag = "v${version}"; sha256 = "sha256-oit1bDqP96wwfTRCV8V0N9P/+pkdW2WYOWT6u3lb4Xs="; }; diff --git a/pkgs/development/python-modules/sphinx-fortran/default.nix b/pkgs/development/python-modules/sphinx-fortran/default.nix index e01342e8e6eb..341b3a5ce5e0 100644 --- a/pkgs/development/python-modules/sphinx-fortran/default.nix +++ b/pkgs/development/python-modules/sphinx-fortran/default.nix @@ -9,14 +9,14 @@ six, }: -buildPythonPackage rec { +buildPythonPackage { pname = "sphinx-fortran"; version = "unstable-2022-03-02"; format = "setuptools"; src = fetchFromGitHub { owner = "VACUMM"; - repo = pname; + repo = "sphinx-fortran"; rev = "394ae990b43ed43fcff8beb048632f5e99794264"; hash = "sha256-IVKu5u9gqs7/9EZrf4ZYd12K6J31u+/B8kk4+8yfohM="; }; diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix index 55c61ac7f7bb..23096443218a 100644 --- a/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chrisjsewell"; - repo = pname; + repo = "sphinx-pytest"; tag = "v${version}"; hash = "sha256-oSBBt+hSMs4mvGqibQHoYHXr2j/bpsGOnIMfwfTfWKQ="; }; diff --git a/pkgs/development/python-modules/sqlalchemy-views/default.nix b/pkgs/development/python-modules/sqlalchemy-views/default.nix index 5f9bdfce9b35..a462e48bfede 100644 --- a/pkgs/development/python-modules/sqlalchemy-views/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-views/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { format = "setuptools"; src = fetchFromGitHub { - repo = pname; + repo = "sqlalchemy-views"; owner = "jklukas"; tag = "v${version}"; hash = "sha256-MJgikWXo3lpMsSYbb5sOSOTbJPOx5gEghW1V9jKvHKU="; diff --git a/pkgs/development/python-modules/sqlbag/default.nix b/pkgs/development/python-modules/sqlbag/default.nix index 1915296ca390..4667a7957df1 100644 --- a/pkgs/development/python-modules/sqlbag/default.nix +++ b/pkgs/development/python-modules/sqlbag/default.nix @@ -17,14 +17,14 @@ postgresql, postgresqlTestHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "sqlbag"; version = "0.1.1617247075"; format = "pyproject"; src = fetchFromGitHub { owner = "djrobstep"; - repo = pname; + repo = "sqlbag"; # no tags on github, version patch number is unix time. rev = "eaaeec4158ffa139fba1ec30d7887f4d836f4120"; hash = "sha256-lipgnkqrzjzqwbhtVcWDQypBNzq6Dct/qoM8y/FNiNs="; diff --git a/pkgs/development/python-modules/sqlite-fts4/default.nix b/pkgs/development/python-modules/sqlite-fts4/default.nix index 0ea1f02bbff3..c84a30ffda52 100644 --- a/pkgs/development/python-modules/sqlite-fts4/default.nix +++ b/pkgs/development/python-modules/sqlite-fts4/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; - repo = pname; + repo = "sqlite-fts4"; tag = version; hash = "sha256-Ibiows3DSnzjIUv7U9tYNVnDaecBBxjXzDqxbIlNhhU="; }; diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix index b30ff3f489a4..0d767885a761 100644 --- a/pkgs/development/python-modules/sqltrie/default.nix +++ b/pkgs/development/python-modules/sqltrie/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; - repo = pname; + repo = "sqltrie"; tag = version; hash = "sha256-D1vYXyh/i0wy7sttW117vsMbUlQJ/mq7rlxLMJWoki0="; }; diff --git a/pkgs/development/python-modules/squarify/default.nix b/pkgs/development/python-modules/squarify/default.nix index 496e922a59d1..de82a86a780c 100644 --- a/pkgs/development/python-modules/squarify/default.nix +++ b/pkgs/development/python-modules/squarify/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "laserson"; - repo = pname; + repo = "squarify"; tag = "v${version}"; hash = "sha256-zSv+6xT9H4WyShRnwjjcNMjY19AFlQ6bw9Mh9p2rL08="; }; diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix index 3ffba90e953b..e70d06d54510 100644 --- a/pkgs/development/python-modules/srvlookup/default.nix +++ b/pkgs/development/python-modules/srvlookup/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gmr"; - repo = pname; + repo = "srvlookup"; tag = version; hash = "sha256-iXbi25HsoNX0hnhwZoFik5ddlJ7i+xml3HGaezj3jgY="; }; diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix index 82c16afc5ec8..2a692d6f23eb 100644 --- a/pkgs/development/python-modules/stanza/default.nix +++ b/pkgs/development/python-modules/stanza/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stanfordnlp"; - repo = pname; + repo = "stanza"; tag = "v${version}"; hash = "sha256-0uqEyiY+gX9P2r2H+qF4t8OUUumjikBZjk4psFf9l30="; }; diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 2967f11b9aa6..f13df2d784dd 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { # No tests in pypi src = fetchFromGitHub { owner = "staticjinja"; - repo = pname; + repo = "staticjinja"; rev = version; hash = "sha256-LfJTQhZtnTOm39EWF1m2MP5rxz/5reE0G1Uk9L7yx0w="; }; diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix index e9f0bd3b8ac5..f63dd9bd64df 100644 --- a/pkgs/development/python-modules/statmake/default.nix +++ b/pkgs/development/python-modules/statmake/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "daltonmaag"; - repo = pname; + repo = "statmake"; tag = "v${version}"; hash = "sha256-3BZ71JVvj7GCojM8ycu160viPj8BLJ1SiW86Df2fzsw="; }; diff --git a/pkgs/development/python-modules/stemming/default.nix b/pkgs/development/python-modules/stemming/default.nix index 98ef1eea9b09..a49c0f394112 100644 --- a/pkgs/development/python-modules/stemming/default.nix +++ b/pkgs/development/python-modules/stemming/default.nix @@ -15,7 +15,7 @@ buildPythonPackage { # Pypi source package doesn't contain tests src = fetchFromGitHub { owner = "nmstoker"; - repo = pname; + repo = "stemming"; rev = "477d0e354e79843f5ec241ba3603bcb5b843c3c4"; hash = "sha256-wnmBCbxnCZ9mN1J7sLcN7OynMcvqgAnhEgpAwW2/xz4="; }; diff --git a/pkgs/development/python-modules/stopit/default.nix b/pkgs/development/python-modules/stopit/default.nix index 4569b1ba88e2..b6aa1dd72957 100644 --- a/pkgs/development/python-modules/stopit/default.nix +++ b/pkgs/development/python-modules/stopit/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # tests are missing from the PyPi tarball src = fetchFromGitHub { owner = "glenfant"; - repo = pname; + repo = "stopit"; rev = version; hash = "sha256-uXJUA70JOGWT2NmS6S7fPrTWAJZ0mZ/hICahIUzjfbw="; }; diff --git a/pkgs/development/python-modules/sumtypes/default.nix b/pkgs/development/python-modules/sumtypes/default.nix index 91ae86b01206..20a45920f805 100644 --- a/pkgs/development/python-modules/sumtypes/default.nix +++ b/pkgs/development/python-modules/sumtypes/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "radix"; - repo = pname; + repo = "sumtypes"; rev = version; hash = "sha256-qwQyFKVnGEqHUqFmUSnHVvedsp2peM6rJZcS90paLOo="; }; diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 5dca021fb764..494f8e042524 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simplistix"; - repo = pname; + repo = "sybil"; tag = version; hash = "sha256-ov8b8NPBbiqB/pcKgdD2D+xNSxUM1uGK8EP+20K7eGQ="; }; diff --git a/pkgs/development/python-modules/syncer/default.nix b/pkgs/development/python-modules/syncer/default.nix index aed4172d9a3f..afda386209c1 100644 --- a/pkgs/development/python-modules/syncer/default.nix +++ b/pkgs/development/python-modules/syncer/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miyakogi"; - repo = pname; + repo = "syncer"; rev = "v${version}"; sha256 = "sha256-3EYWy6LuZ/3i+9d0QaclCqWMMw5O3WzhTY3LUL5iMso="; }; diff --git a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix index 411f43337fe2..7fb7c27a3788 100644 --- a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix +++ b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "easypost"; - repo = pname; + repo = "syslog-rfc5424-formatter"; tag = "v${version}"; hash = "sha256-dvRSOMXRmZf0vEEyX6H7OBSfo/PgyOLKuDS8X6g4qe0="; }; diff --git a/pkgs/development/python-modules/sysrsync/default.nix b/pkgs/development/python-modules/sysrsync/default.nix index cc833dd4ae8b..df7047239735 100644 --- a/pkgs/development/python-modules/sysrsync/default.nix +++ b/pkgs/development/python-modules/sysrsync/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gchamon"; - repo = pname; + repo = "sysrsync"; tag = version; hash = "sha256-2Sz3JrNmIGOnad+qjRzbAgsFEzDtwBT0KLEFyQKZra4="; }; diff --git a/pkgs/development/python-modules/tahoma-api/default.nix b/pkgs/development/python-modules/tahoma-api/default.nix index 13744f25f24d..f9701ab89da0 100644 --- a/pkgs/development/python-modules/tahoma-api/default.nix +++ b/pkgs/development/python-modules/tahoma-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "philklei"; - repo = pname; + repo = "tahoma-api"; rev = "v${version}"; hash = "sha256-YwOKSBlN4lNyS+hfdbQDUq1gc14FBof463ofxtUVLC4="; }; diff --git a/pkgs/development/python-modules/tank-utility/default.nix b/pkgs/development/python-modules/tank-utility/default.nix index 2eb958b33bc6..075b788e852b 100644 --- a/pkgs/development/python-modules/tank-utility/default.nix +++ b/pkgs/development/python-modules/tank-utility/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "krismolendyke"; - repo = pname; + repo = "tank-utility"; tag = version; hash = "sha256-h9y3X+FSzSFt+bd/chz+x0nocHaKZ8DvreMxAYMs8/E="; }; diff --git a/pkgs/development/python-modules/tcolorpy/default.nix b/pkgs/development/python-modules/tcolorpy/default.nix index 9c98865b38aa..39adb610f6da 100644 --- a/pkgs/development/python-modules/tcolorpy/default.nix +++ b/pkgs/development/python-modules/tcolorpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thombashi"; - repo = pname; + repo = "tcolorpy"; tag = "v${version}"; hash = "sha256-0AXpwRQgBisO4360J+Xd4+EWzDtDJ64UpSUmDnSYjKE="; }; diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix index 1b46e61869d1..72d202322eb8 100644 --- a/pkgs/development/python-modules/tensorly/default.nix +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -17,8 +17,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "tensorly"; + repo = "tensorly"; tag = version; hash = "sha256-A6Zlp8fa7XFgf4qpg7SEtNLlYSNtDGLuRUEfzD+crQc="; }; diff --git a/pkgs/development/python-modules/termgraph/default.nix b/pkgs/development/python-modules/termgraph/default.nix index f0b6dcf9310e..b874c66965d7 100644 --- a/pkgs/development/python-modules/termgraph/default.nix +++ b/pkgs/development/python-modules/termgraph/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkaz"; - repo = pname; + repo = "termgraph"; tag = "v${version}"; hash = "sha256-0J9mEpDIdNEYwO+A+HBOaSw+Ct+HsbSPwGQYuYH6NN8="; }; diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix index d690ad1aa5a9..1ab3f9f50837 100644 --- a/pkgs/development/python-modules/termplotlib/default.nix +++ b/pkgs/development/python-modules/termplotlib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nschloe"; - repo = pname; + repo = "termplotlib"; rev = "v${version}"; sha256 = "1qfrv2w7vb2bbjvd5lqfq57c23iqkry0pwmif1ha3asmz330rja1"; }; diff --git a/pkgs/development/python-modules/tesla-wall-connector/default.nix b/pkgs/development/python-modules/tesla-wall-connector/default.nix index cc5907be5b37..c05c23ef63d5 100644 --- a/pkgs/development/python-modules/tesla-wall-connector/default.nix +++ b/pkgs/development/python-modules/tesla-wall-connector/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "einarhauks"; - repo = pname; + repo = "tesla-wall-connector"; rev = version; hash = "sha256-GblKXWV9h37E3bxNsx17hEe0uDm8ahzJUx8wiE+Vc38="; }; diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix index d133362c3fb2..95ed81707792 100644 --- a/pkgs/development/python-modules/test-tube/default.nix +++ b/pkgs/development/python-modules/test-tube/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "williamFalcon"; - repo = pname; + repo = "test-tube"; rev = version; sha256 = "0w60xarmcw06gc4002sy7bjfykdz34gbgniswxkl0lw8a1v0xn2m"; }; diff --git a/pkgs/development/python-modules/testbook/default.nix b/pkgs/development/python-modules/testbook/default.nix index 3e6661ceb687..013291df0f46 100644 --- a/pkgs/development/python-modules/testbook/default.nix +++ b/pkgs/development/python-modules/testbook/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nteract"; - repo = pname; + repo = "testbook"; rev = version; hash = "sha256-qaDgae/5TRpjmjOf7aom7TC5HLHp0PHM/ds47AKtq8U="; }; diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index a261a319b403..11724165b2b2 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "joblib"; - repo = pname; + repo = "threadpoolctl"; tag = version; hash = "sha256-yICErKIHc9XKiWg9C9EH0il9zhbbkGntw6mlYDibr9g="; }; diff --git a/pkgs/development/python-modules/threat9-test-bed/default.nix b/pkgs/development/python-modules/threat9-test-bed/default.nix index e98cdd6fdd2f..ecd5be4d6ff0 100644 --- a/pkgs/development/python-modules/threat9-test-bed/default.nix +++ b/pkgs/development/python-modules/threat9-test-bed/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "threat9"; - repo = pname; + repo = "threat9-test-bed"; rev = "v${version}"; hash = "sha256-0YSjMf2gDdrvkDaT77iwfCkiDDXKHnZyI8d7JmBSuCg="; }; diff --git a/pkgs/development/python-modules/throttler/default.nix b/pkgs/development/python-modules/throttler/default.nix index 1e8983a02103..1c1273c1899d 100644 --- a/pkgs/development/python-modules/throttler/default.nix +++ b/pkgs/development/python-modules/throttler/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "uburuntu"; - repo = pname; + repo = "throttler"; tag = "v${version}"; hash = "sha256-fE35zPjBUn4e1VRkkIUMtYJ/+LbnUxnxyfnU+UEPwr4="; }; diff --git a/pkgs/development/python-modules/tikzplotlib/default.nix b/pkgs/development/python-modules/tikzplotlib/default.nix index e09c735f4c1f..7f7ceb4f9e21 100644 --- a/pkgs/development/python-modules/tikzplotlib/default.nix +++ b/pkgs/development/python-modules/tikzplotlib/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nschloe"; - repo = pname; + repo = "tikzplotlib"; rev = "v${version}"; hash = "sha256-PLExHhEnxkEiXsE0rqvpNWwVZ+YoaDa2BTx8LktdHl0="; }; diff --git a/pkgs/development/python-modules/timeago/default.nix b/pkgs/development/python-modules/timeago/default.nix index a1bd21cf16ae..107b8bee5886 100644 --- a/pkgs/development/python-modules/timeago/default.nix +++ b/pkgs/development/python-modules/timeago/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hustcc"; - repo = pname; + repo = "timeago"; rev = version; sha256 = "sha256-PqORJKAVrjezU/yP2ky3gb1XsM8obDI3GQzi+mok/OM="; }; diff --git a/pkgs/development/python-modules/timeslot/default.nix b/pkgs/development/python-modules/timeslot/default.nix index d1ac79f37995..0b60dd3cc004 100644 --- a/pkgs/development/python-modules/timeslot/default.nix +++ b/pkgs/development/python-modules/timeslot/default.nix @@ -7,14 +7,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "timeslot"; version = "0.1.2"; # pypi distribution doesn't include tests, so build from source instead src = fetchFromGitHub { owner = "ErikBjare"; - repo = pname; + repo = "timeslot"; rev = "af35445e96cbb2f3fb671a75aac6aa93e4e7e7a6"; sha256 = "sha256-GEhg2iMsYMfalT7L9TCd1KHU6oa/wTl5m3mRC0zOH9Q="; }; diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index e7b1dcdf5169..a5791fff165e 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "almarklein"; - repo = pname; + repo = "timetagger"; tag = "v${version}"; hash = "sha256-YzMVjIsi7MGIwt828xE3FYobrh9CUz5FqCIogXjmOcM="; }; diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix index 9c97153d9d22..b3aba4481e07 100644 --- a/pkgs/development/python-modules/tmb/default.nix +++ b/pkgs/development/python-modules/tmb/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alemuro"; - repo = pname; + repo = "tmb"; rev = version; hash = "sha256-XuRhRmeTXAplb14UwISyzaqEIrFeg8/aCdMxUccMUos="; }; diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index 8faffa98b28f..17af9a17cbfe 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "falconry"; - repo = pname; + repo = "token-bucket"; tag = version; hash = "sha256-dazqJRpC8FUHOhgKFzDnIl5CT2L74J2o2Hsm0IQf4Cg="; }; diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix index b3e994e26020..05de0d83426b 100644 --- a/pkgs/development/python-modules/tokenize-rt/default.nix +++ b/pkgs/development/python-modules/tokenize-rt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asottile"; - repo = pname; + repo = "tokenize-rt"; rev = "v${version}"; hash = "sha256-7ykczY73KkqR99tYLL/5bgr9bqU444qHs2ONz+ldVyg="; }; diff --git a/pkgs/development/python-modules/tokentrim/default.nix b/pkgs/development/python-modules/tokentrim/default.nix index 6aa7f9bd3113..f4c7a5017cce 100644 --- a/pkgs/development/python-modules/tokentrim/default.nix +++ b/pkgs/development/python-modules/tokentrim/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KillianLucas"; - repo = pname; + repo = "tokentrim"; tag = "v${version}"; hash = "sha256-zr2SLT3MBuMD98g9fdS0mLuijcssRQ/S3+tCq2Cw1/4="; }; diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index ea17a226873e..8d5498a5fffe 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hukkin"; - repo = pname; + repo = "tomli"; rev = version; hash = "sha256-4MWp9pPiUZZkjvGXzw8/gDele743NBj8uG4jvK2ohUM="; }; diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index 115cbdc2fbdb..1190aad1f313 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "soft-matter"; - repo = pname; + repo = "trackpy"; tag = "v${version}"; hash = "sha256-6i1IfdxgV6bpf//mXATpnsQ0zN26S8rlL0/1ql68sd8="; }; diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix index e00ebe4ce1b7..bcd7ed2dfe20 100644 --- a/pkgs/development/python-modules/traittypes/default.nix +++ b/pkgs/development/python-modules/traittypes/default.nix @@ -11,7 +11,7 @@ traitlets, }: -buildPythonPackage rec { +buildPythonPackage { pname = "traittypes"; version = "0.2.1-unstable-2020-07-17"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter-widgets"; - repo = pname; + repo = "traittypes"; rev = "af2ebeec9e58b73a12d4cf841bd506d6eadb8868"; hash = "sha256-q7kt8b+yDHsWML/wCeND9PrZMVjemhzG7Ih1OtHbnTw="; }; diff --git a/pkgs/development/python-modules/transforms3d/default.nix b/pkgs/development/python-modules/transforms3d/default.nix index 4550649e6392..40bd7b7444a4 100644 --- a/pkgs/development/python-modules/transforms3d/default.nix +++ b/pkgs/development/python-modules/transforms3d/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matthew-brett"; - repo = pname; + repo = "transforms3d"; tag = version; hash = "sha256-9wICu7zNYF54e6xcDpZxqctB4GVu5Knf79Z36016Rpw="; }; diff --git a/pkgs/development/python-modules/translitcodec/default.nix b/pkgs/development/python-modules/translitcodec/default.nix index 2b77a2fceb51..f4e046c49838 100644 --- a/pkgs/development/python-modules/translitcodec/default.nix +++ b/pkgs/development/python-modules/translitcodec/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "claudep"; - repo = pname; + repo = "translitcodec"; rev = "version-${version}"; hash = "sha256-/EKquTchx9i3fZqJ6AMzHYP9yCORvwbuUQ95WJQOQbI="; }; diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix index 694ac20116db..27716b9fd31e 100644 --- a/pkgs/development/python-modules/treeo/default.nix +++ b/pkgs/development/python-modules/treeo/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cgarciae"; - repo = pname; + repo = "treeo"; tag = version; hash = "sha256-0py7sKjq6WqdsZwTq61jqaIbULTfwtpz29TTpt8M2Zw="; }; diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix index 6f0de8163934..3f76b078f17f 100644 --- a/pkgs/development/python-modules/treex/default.nix +++ b/pkgs/development/python-modules/treex/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cgarciae"; - repo = pname; + repo = "treex"; tag = version; hash = "sha256-ObOnbtAT4SlrwOms1jtn7/XKZorGISGY6VuhQlC3DaQ="; }; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index ffe6753f7c21..34b53e868a5d 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.6.9"; + version = "4.6.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mikedh"; repo = "trimesh"; tag = version; - hash = "sha256-VxChu4QOoySCs/PAuVD6T+oFxkxvNGziwnkNdE6xSD0="; + hash = "sha256-tlIsRZLmnRCqVHcLQOh6Jmne3rZGS95QudnvJHMu1qs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix index 0337ddfa3690..af118a7a7dc4 100644 --- a/pkgs/development/python-modules/trino-python-client/default.nix +++ b/pkgs/development/python-modules/trino-python-client/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { format = "setuptools"; src = fetchFromGitHub { - repo = pname; + repo = "trino-python-client"; owner = "trinodb"; tag = version; hash = "sha256-Nr7p7x5cxxuPv2NUh1uMth97OQ+H2KBlu0SHVJ7Zu1M="; diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index 6d2d8a92a695..b363b267f897 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cloudtools"; - repo = pname; + repo = "troposphere"; tag = version; hash = "sha256-IqWgqkxJ4EFNt9z58cuCqSTnlbMNi7bFhA04hgQjG8E="; }; diff --git a/pkgs/development/python-modules/ttach/default.nix b/pkgs/development/python-modules/ttach/default.nix index d8430b7922a3..74510a31f128 100644 --- a/pkgs/development/python-modules/ttach/default.nix +++ b/pkgs/development/python-modules/ttach/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "qubvel"; - repo = pname; + repo = "ttach"; tag = "v${version}"; hash = "sha256-R6QO+9hv0eI7dZW5iJf096+LU1q+vnmOpveurgZemPc="; }; diff --git a/pkgs/development/python-modules/ttkbootstrap/default.nix b/pkgs/development/python-modules/ttkbootstrap/default.nix index 11316094e9ee..d85b9da366bb 100644 --- a/pkgs/development/python-modules/ttkbootstrap/default.nix +++ b/pkgs/development/python-modules/ttkbootstrap/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "israel-dryer"; - repo = pname; + repo = "ttkbootstrap"; tag = "v${version}"; hash = "sha256-Pkp45lB1Xeu9ZoLjKS8aSW2By/k3ID1qwMig/jdYHh4="; }; diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 75300b1c514a..3da347dc5340 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dmulyalin"; - repo = pname; + repo = "ttp"; tag = version; hash = "sha256-IWqPFspERBVkjsTYTAkOTOrugq4fD65Q140G3SCEV0w="; }; diff --git a/pkgs/development/python-modules/tuyaha/default.nix b/pkgs/development/python-modules/tuyaha/default.nix index eb56f96547d6..bd760c94d932 100644 --- a/pkgs/development/python-modules/tuyaha/default.nix +++ b/pkgs/development/python-modules/tuyaha/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PaulAnnekov"; - repo = pname; + repo = "tuyaha"; rev = version; hash = "sha256-PTIw/2NRHHiqV6E5oj2pMeGq1uApevKfT2n5zV8AQmM="; }; diff --git a/pkgs/development/python-modules/typechecks/default.nix b/pkgs/development/python-modules/typechecks/default.nix index 4d7da1759f31..d6d3d5a74a3e 100644 --- a/pkgs/development/python-modules/typechecks/default.nix +++ b/pkgs/development/python-modules/typechecks/default.nix @@ -4,14 +4,14 @@ lib, }: -buildPythonPackage rec { +buildPythonPackage { pname = "typechecks"; version = "unstable-2023-07-13"; format = "setuptools"; src = fetchFromGitHub { owner = "openvax"; - repo = pname; + repo = "typechecks"; # See https://github.com/openvax/typechecks/issues/2. As of 2023-07-13, # they do no have version tags. rev = "5340b4e8a2f419b3a7aa816a5b19e2e0a6ce0679"; diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix index 41a4b5147fa9..cbb68b8e0330 100644 --- a/pkgs/development/python-modules/typesystem/default.nix +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; - repo = pname; + repo = "typesystem"; rev = version; hash = "sha256-fjnheHWjIDbJY1iXCRKCpqTCwtUWK9YXbynRCZquQ7c="; }; diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index aff3471aa932..0caba72c818d 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Quansight-Labs"; - repo = pname; + repo = "uarray"; tag = version; hash = "sha256-eCrmmP+9TI+T8Km8MOz0EqseneFwPizlnZloK5yNLcM="; }; diff --git a/pkgs/development/python-modules/uasiren/default.nix b/pkgs/development/python-modules/uasiren/default.nix index a30bc00e8ba3..7b26d889cedc 100644 --- a/pkgs/development/python-modules/uasiren/default.nix +++ b/pkgs/development/python-modules/uasiren/default.nix @@ -24,7 +24,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "PaulAnnekov"; - repo = pname; + repo = "uasiren"; rev = "v${version}"; hash = "sha256-NHrnG5Vhz+JZgcTJyfIgGz0Ye+3dFVv2zLCCqw2++oM="; }; diff --git a/pkgs/development/python-modules/ukkonen/default.nix b/pkgs/development/python-modules/ukkonen/default.nix index 136303b02b72..2a094b6c645a 100644 --- a/pkgs/development/python-modules/ukkonen/default.nix +++ b/pkgs/development/python-modules/ukkonen/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asottile"; - repo = pname; + repo = "ukkonen"; rev = "v${version}"; sha256 = "jG6VP/P5sadrdrmneH36/ExSld9blyMAAG963QS9+p0="; }; diff --git a/pkgs/development/python-modules/unicrypto/default.nix b/pkgs/development/python-modules/unicrypto/default.nix index 39d7c6b532f4..b5d907ea3798 100644 --- a/pkgs/development/python-modules/unicrypto/default.nix +++ b/pkgs/development/python-modules/unicrypto/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "skelsec"; - repo = pname; + repo = "unicrypto"; tag = version; hash = "sha256-mZEnYVM5r4utiGwM7bp2SwaDjYsH8AR/Qm5UdPNke0w="; }; diff --git a/pkgs/development/python-modules/unifiled/default.nix b/pkgs/development/python-modules/unifiled/default.nix index 0c2ec7dd9645..b4aff6965c18 100644 --- a/pkgs/development/python-modules/unifiled/default.nix +++ b/pkgs/development/python-modules/unifiled/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "florisvdk"; - repo = pname; + repo = "unifiled"; rev = "v${version}"; sha256 = "1nmqxxhwa0isxdb889nhbp7w4axj1mcrwd3pr9d8nhpw4yj9h3vq"; }; diff --git a/pkgs/development/python-modules/upnpy/default.nix b/pkgs/development/python-modules/upnpy/default.nix index b6677afbd2b2..7bddf9803e64 100644 --- a/pkgs/development/python-modules/upnpy/default.nix +++ b/pkgs/development/python-modules/upnpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "5kyc0d3r"; - repo = pname; + repo = "upnpy"; rev = "v${version}"; sha256 = "17rqcmmwsl0m4722b1cr74f80kqwq7cgxsy7lq9c88zf6srcgjsf"; }; diff --git a/pkgs/development/python-modules/usb-devices/default.nix b/pkgs/development/python-modules/usb-devices/default.nix index 9b3ab579de1a..fdd4f5b60121 100644 --- a/pkgs/development/python-modules/usb-devices/default.nix +++ b/pkgs/development/python-modules/usb-devices/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "usb-devices"; tag = "v${version}"; hash = "sha256-Nfdl5oRIdOfAo5PFAJJpadRyu2zeEkmYzxDQxbvpt6c="; }; diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix index afaab0bce2a5..3adfecf98698 100644 --- a/pkgs/development/python-modules/uvcclient/default.nix +++ b/pkgs/development/python-modules/uvcclient/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kk7ds"; - repo = pname; + repo = "uvcclient"; tag = "v${version}"; hash = "sha256-V7xIvZ9vIXHPpkEeJZ6QedWk+4ZVNwCzj5ffLyixFz4="; }; diff --git a/pkgs/development/python-modules/vaa/default.nix b/pkgs/development/python-modules/vaa/default.nix index 2c5f79f51e30..614ab6a53ed2 100644 --- a/pkgs/development/python-modules/vaa/default.nix +++ b/pkgs/development/python-modules/vaa/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "life4"; - repo = pname; + repo = "vaa"; tag = "v.${version}"; hash = "sha256-24GTTJSZ55ejyHoWP1/S3DLTKvOolAJr9UhWoOm84CU="; }; diff --git a/pkgs/development/python-modules/viewstate/default.nix b/pkgs/development/python-modules/viewstate/default.nix index d48059332148..9200466e07a3 100644 --- a/pkgs/development/python-modules/viewstate/default.nix +++ b/pkgs/development/python-modules/viewstate/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "yuvadm"; - repo = pname; + repo = "viewstate"; tag = "v${version}"; sha256 = "sha256-cXT5niE3rNdqmNqnITWy9c9/MF0gZ6LU2i1uzfOzkUI="; }; diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index 8b159e9c532a..4cab270b846d 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "edwardgeorge"; - repo = pname; + repo = "virtualenv-clone"; rev = version; hash = "sha256-qrN74IwLRqiVPxU8gVhdiM34yBmiS/5ot07uroYPDVw="; }; diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index c17eb4c11ccf..67f1b7cacdac 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -235,7 +235,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vllm-project"; - repo = pname; + repo = "vllm"; tag = "v${version}"; hash = "sha256-LiEBkVwJTT4WoCTk9pI0ykTjmv1pDMzksmFwVktoxMY="; }; diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix index c58e2af9c836..1af45db9e138 100644 --- a/pkgs/development/python-modules/vulcan-api/default.nix +++ b/pkgs/development/python-modules/vulcan-api/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kapi2289"; - repo = pname; + repo = "vulcan-api"; tag = "v${version}"; hash = "sha256-oWtyqFacWkKhv4QvbZCuq3KHlM/o7SfENg90O/ygXUw="; }; diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix index f68979cf2fea..3a661b9ed3e3 100644 --- a/pkgs/development/python-modules/vxi11/default.nix +++ b/pkgs/development/python-modules/vxi11/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # no tests in PyPI tarball src = fetchFromGitHub { owner = "python-ivi"; - repo = pname; + repo = "python-vxi11"; rev = "v${version}"; sha256 = "1xv7chp7rm0vrvbz6q57fpwhlgjz461h08q9zgmkcl2l0w96hmsn"; }; diff --git a/pkgs/development/python-modules/wagtail-factories/default.nix b/pkgs/development/python-modules/wagtail-factories/default.nix index c464466d65ae..3079e81c815d 100644 --- a/pkgs/development/python-modules/wagtail-factories/default.nix +++ b/pkgs/development/python-modules/wagtail-factories/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { format = "setuptools"; src = fetchFromGitHub { - repo = pname; + repo = "wagtail-factories"; owner = "wagtail"; tag = version; sha256 = "sha256-jo8VwrmxHBJnORmuR6eTLrf/eupNL2vhXcw81EzfTxM="; diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index 0725368b171b..b0352114cf66 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bcwaldon"; - repo = pname; + repo = "warlock"; tag = version; hash = "sha256-HOCLzFYmOL/tCXT+NO/tCZuVXVowNEPP3g33ZYg4+6Q="; }; diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix index 266138ddd71a..7ec4a8f21af1 100644 --- a/pkgs/development/python-modules/waterfurnace/default.nix +++ b/pkgs/development/python-modules/waterfurnace/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sdague"; - repo = pname; + repo = "waterfurnace"; tag = "v${version}"; sha256 = "1ba247fw1fvi7zy31zj2wbjq7fajrbxhp139cl9jj67rfvxfv8xf"; }; diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index 6dce8529d7c2..005390911dc3 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "novnc"; - repo = pname; + repo = "websockify"; tag = "v${version}"; hash = "sha256-b57L4o071zEt/gX9ZVzEpcnp0RCeo3peZrby2mccJgQ="; }; diff --git a/pkgs/development/python-modules/webthing-ws/default.nix b/pkgs/development/python-modules/webthing-ws/default.nix index cdf6f7a7edb7..8fda705031d5 100644 --- a/pkgs/development/python-modules/webthing-ws/default.nix +++ b/pkgs/development/python-modules/webthing-ws/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-ecosystem"; - repo = pname; + repo = "webthing-ws"; tag = version; hash = "sha256-j7nc4yJczDs28RVFDHeQ2ZIG9mIW2m25AAeErVKi4E4="; }; diff --git a/pkgs/development/python-modules/whatthepatch/default.nix b/pkgs/development/python-modules/whatthepatch/default.nix index 1776fa488cf0..090a366c97fc 100644 --- a/pkgs/development/python-modules/whatthepatch/default.nix +++ b/pkgs/development/python-modules/whatthepatch/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cscorley"; - repo = pname; + repo = "whatthepatch"; tag = version; hash = "sha256-0pkkwVo9yaFEZyitfpKMC8EVr8HgPLUkrGWmyYOdZNE="; }; diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix index dcd2235a941e..d4de5f0333f5 100644 --- a/pkgs/development/python-modules/whodap/default.nix +++ b/pkgs/development/python-modules/whodap/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pogzyb"; - repo = pname; + repo = "whodap"; tag = "v${version}"; hash = "sha256-kw7bmkpDNb/PK/Q2tSbG+ju0G+6tdSy3RaNDaNOVYnE="; }; diff --git a/pkgs/development/python-modules/wifi/default.nix b/pkgs/development/python-modules/wifi/default.nix index b99d4782f47b..9dddfad9d2ef 100644 --- a/pkgs/development/python-modules/wifi/default.nix +++ b/pkgs/development/python-modules/wifi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rockymeza"; - repo = pname; + repo = "wifi"; rev = "v${version}"; hash = "sha256-scg/DvApvyQZtzDgkHFJzf9gCRfJgBvZ64CG/c2Cx8E="; }; diff --git a/pkgs/development/python-modules/xmind/default.nix b/pkgs/development/python-modules/xmind/default.nix index 3b5565955bdd..aea0f4bd08c1 100644 --- a/pkgs/development/python-modules/xmind/default.nix +++ b/pkgs/development/python-modules/xmind/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zhuifengshen"; - repo = pname; + repo = "xmind"; rev = "v${version}"; sha256 = "xC1WpHz2eHb5+xShM/QUQAIYnJNyK1EKWbTXJKhDwbQ="; }; diff --git a/pkgs/development/python-modules/xpath-expressions/default.nix b/pkgs/development/python-modules/xpath-expressions/default.nix index 56d514db4055..a2eabdc401c0 100644 --- a/pkgs/development/python-modules/xpath-expressions/default.nix +++ b/pkgs/development/python-modules/xpath-expressions/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "orf"; - repo = pname; + repo = "xpath-expressions"; rev = "v${version}"; hash = "sha256-UAzDXrz1Tr9/OOjKAg/5Std9Qlrnizei8/3XL3hMSFA="; }; diff --git a/pkgs/development/python-modules/xpybutil/default.nix b/pkgs/development/python-modules/xpybutil/default.nix index 631cf33a77c2..a23cd81e7c79 100644 --- a/pkgs/development/python-modules/xpybutil/default.nix +++ b/pkgs/development/python-modules/xpybutil/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # Pypi only offers a wheel src = fetchFromGitHub { owner = "BurntSushi"; - repo = pname; + repo = "xpybutil"; rev = version; sha256 = "17gbqq955fcl29aayn8l0x14azc60cxgkvdxblz9q8x3l50w0xpg"; }; diff --git a/pkgs/development/python-modules/yaswfp/default.nix b/pkgs/development/python-modules/yaswfp/default.nix index 45be71807178..55cc548c34ba 100644 --- a/pkgs/development/python-modules/yaswfp/default.nix +++ b/pkgs/development/python-modules/yaswfp/default.nix @@ -5,14 +5,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "yaswfp"; version = "unstable-20210331"; format = "setuptools"; src = fetchFromGitHub { owner = "facundobatista"; - repo = pname; + repo = "yaswfp"; rev = "2a2cc6ca4c0b4d52bd2e658fb5f80fdc0db4924c"; sha256 = "1dxdz89hlycy1rnn269fwl1f0qxgxqarkc0ivs2m77f8xba2qgj9"; }; diff --git a/pkgs/development/python-modules/zadnegoale/default.nix b/pkgs/development/python-modules/zadnegoale/default.nix index 2235d7c56931..f704ee59221b 100644 --- a/pkgs/development/python-modules/zadnegoale/default.nix +++ b/pkgs/development/python-modules/zadnegoale/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bieniu"; - repo = pname; + repo = "zadnegoale"; tag = version; hash = "sha256-ij8xou8LXC4/BUTApIV6xSgb7ethwLyrHNJvBgxSBYM="; }; diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 0d5d9894e943..02f0e6f803b6 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zigpy"; - repo = pname; + repo = "zigpy-deconz"; tag = version; hash = "sha256-el29EqCK9p3AII9LsMw+ikplHfDKNUIhaU3HJI0gfu8="; }; diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 22aa4294a376..d78132440c01 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zigpy"; - repo = pname; + repo = "zigpy-znp"; tag = "v${version}"; hash = "sha256-vYB04vEFqpqrjJMS73mtYXakp7lEIJjB+tT0SF9hpWM="; }; diff --git a/pkgs/development/python-modules/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix index 29d3998e52ac..d48384caa093 100644 --- a/pkgs/development/python-modules/zwave-me-ws/default.nix +++ b/pkgs/development/python-modules/zwave-me-ws/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Z-Wave-Me"; - repo = pname; + repo = "zwave-me-ws"; tag = "v${version}"; hash = "sha256-bTchtgr+UbHCpcXMaQA3bTrhasJ79TguvAqLNlpD/2c="; }; diff --git a/pkgs/os-specific/linux/it87/default.nix b/pkgs/os-specific/linux/it87/default.nix index 030233fcc40d..a0f42ef1a909 100644 --- a/pkgs/os-specific/linux/it87/default.nix +++ b/pkgs/os-specific/linux/it87/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Patched module for IT87xx superio chip sensors support"; - homepage = "https://github.com/hannesha/it87"; + homepage = "https://github.com/frankcrawford/it87"; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" diff --git a/pkgs/tools/archivers/quickbms/0002-disable-openssl.patch b/pkgs/tools/archivers/quickbms/0002-disable-openssl.patch deleted file mode 100644 index 3d77f45e3f86..000000000000 --- a/pkgs/tools/archivers/quickbms/0002-disable-openssl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Makefile 2023-05-25 18:16:56.000296653 +0900 -+++ src/Makefile 2023-05-25 18:17:00.772272861 +0900 -@@ -23,7 +23,6 @@ - EXTRA_TARGETS = libs/amiga/amiga.s libs/powzix/*.cpp - CFLAGS += -msse2 - endif --USE_OPENSSL = 1 - endif - - # -liconv and -fPIC are necessary on Android diff --git a/pkgs/tools/misc/tremor-rs/ls.nix b/pkgs/tools/misc/tremor-rs/ls.nix index 88f0db427d56..d53b9a85eec1 100644 --- a/pkgs/tools/misc/tremor-rs/ls.nix +++ b/pkgs/tools/misc/tremor-rs/ls.nix @@ -3,22 +3,23 @@ rustPlatform, fetchFromGitHub, }: - rustPlatform.buildRustPackage rec { pname = "tremor-language-server"; - version = "0.12.4"; + version = "0.13.0-rc.11"; src = fetchFromGitHub { owner = "tremor-rs"; repo = "tremor-language-server"; rev = "v${version}"; - sha256 = "sha256-odYhpb3FkbIF1dc2DSpz3Lg+r39lhDKml9KGmbqJAtA="; + sha256 = "sha256-gooHNSBEcqyTMOSBG7T01kSdCWKK98dbE8+nuwvQkS0="; }; - nativeBuildInputs = [ rustPlatform.bindgenHook ]; + nativeBuildInputs = [ + rustPlatform.bindgenHook + ]; useFetchCargoVendor = true; - cargoHash = "sha256-Hl0TY/xZaDybYjrGiRftZhFx8dns+ONuNcxzl8lBUMM="; + cargoHash = "sha256-tMs5DRuWuMXIpj5YU4bR4mAlzv7nWycmzDOqMuihj7M="; meta = with lib; { description = "Tremor Language Server (Trill)"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 9818b0c9a254..35866d4331fc 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -186,6 +186,20 @@ lib.makeExtensible ( self_attribute_name = "nix_2_28"; }; + nixComponents_2_29 = nixDependencies.callPackage ./modular/packages.nix rec { + version = "2.29.0"; + inherit (self.nix_2_24.meta) maintainers teams; + otherSplices = generateSplicesForNixComponents "nixComponents_2_29"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = version; + hash = "sha256-fkbE3RCIUPFjS9A6SoEJbgMW3Rs98cs0ZZV/eTtJjaU="; + }; + }; + + nix_2_29 = addTests "nix_2_29" self.nixComponents_2_29.nix-everything; + nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec { version = "2.30pre20250521_${lib.substring 0 8 src.rev}"; inherit (self.nix_2_24.meta) maintainers teams; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dea3111f91e8..f5acb80a328e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1853,11 +1853,12 @@ mapAliases { tcludp = tclPackages.tcludp; # Added 2024-10-02 tclvfs = tclPackages.tclvfs; # Added 2024-10-02 tclx = tclPackages.tclx; # Added 2024-10-02 + tcp-cutter = throw "tcp-cutter has been removed because it fails to compile and the source url is dead"; # Added 2025-05-25 tdesktop = telegram-desktop; # Added 2023-04-07 tdom = tclPackages.tdom; # Added 2024-10-02 teamspeak_client = teamspeak3; # Added 2024-11-07 teamspeak5_client = teamspeak6-client; # Added 2025-01-29 - teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23 + teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # Added 2024-08-23 telepathy-gabble = throw "'telepathy-gabble' has been removed as it was unmaintained, unused, broken and used outdated libraries"; # Added 2025-04-20 telepathy-logger = throw "'telepathy-logger' has been removed as it was unmaintained, unused and broken"; # Added 2025-04-20 teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26 diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b94e26f4121e..ad046a06b247 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -367,6 +367,7 @@ mapAliases ({ keras-applications = throw "keras-applications has been removed because it's abandoned since 2022"; # added 2025-01-12 keras-preprocessing = throw "keras-preprocessing has been removed because it's abandoned since 2024"; # added 2025-01-12 keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01 + kivy-garden-modernmenu = throw "kivy-garden-modernmenu has been removed as it's abandoned since 2019"; # added 2505-05-25 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 langchain-standard-tests = langchain-tests; # added 2025-01-22 @@ -423,6 +424,7 @@ mapAliases ({ mox3 = throw "mox3 was removed because it is unmaintained"; # added 2024-08-30 mrkd = throw "mrkd has been promoted to a top-level attribute name: `pkgs.mrkd`"; # added 2023-08-01 multi_key_dict = multi-key-dict; # added 2023-11-05 + mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25 mutmut = throw "mutmut has been promoted to a top-level attribute name: `pkgs.mutmut`"; # added 2022-10-02 n3fit = throw "n3fit has been removed since it relies on a dependency that was removed"; # added 2024-08-24 nbmerge = throw "nbmerge has moved to pkgs.nbmerge"; # added 2024-07-05 @@ -510,6 +512,7 @@ mapAliases ({ proton-vpn-network-manager-wireguard = throw "proton-vpn-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16 proton-vpn-session = throw "proton-vpn-session functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 proxy_tools = proxy-tools; # added 2023-11-05 + ptable = throw "ptable has been removed, as it is unmaintained and broken"; # added 2025-05-25 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pushbullet = pushbullet-py; # Added 2022-10-15 push-receiver = throw "push-receiver has been removed since it is unmaintained for 3 years"; # added 2025-05-17 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7517bfd26122..b464469fa31f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7511,8 +7511,6 @@ self: super: with self; { kivy-garden = callPackage ../development/python-modules/kivy-garden { }; - kivy-garden-modernmenu = callPackage ../development/python-modules/kivy-garden-modernmenu { }; - kiwiki-client = callPackage ../development/python-modules/kiwiki-client { }; kiwisolver = callPackage ../development/python-modules/kiwisolver { }; @@ -9320,8 +9318,6 @@ self: super: with self; { musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { }; - mutag = callPackage ../development/python-modules/mutag { }; - mutagen = callPackage ../development/python-modules/mutagen { }; mutatormath = callPackage ../development/python-modules/mutatormath { }; @@ -11694,8 +11690,6 @@ self: super: with self; { psygnal = callPackage ../development/python-modules/psygnal { }; - ptable = callPackage ../development/python-modules/ptable { }; - ptest = callPackage ../development/python-modules/ptest { }; ptpython = callPackage ../development/python-modules/ptpython { };